Add support for ARM-PE.

[binutils.git] / ld / ldgram.y

diff --git a/ld/ldgram.y b/ld/ldgram.y
index 419c54e5f800fe96784d66073c9036e6f36ec6e3..7d139719b6e176074137caf1649d97ee96a6ff99 100644 (file)
--- a/ld/ldgram.y
+++ b/ld/ldgram.y
@@ -1,61 +1,49 @@
-%{
-/*
- * $Id$ 
- *
- *
-*/
+/* A YACC grammer to parse a superset of the AT&T linker scripting languaue.
+   Copyright (C) 1991, 1993 Free Software Foundation, Inc.
+   Written by Steve Chamberlain of Cygnus Support ([email protected]).
+
+This file is part of GNU ld.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.

 
 

-/* 
-   This is a YACC grammer intended to parse a superset of the AT&T
-   linker scripting languaue.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.

 
 

+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */

 
 

-   Written by Steve Chamberlain [email protected]
-*/
+%{
+/*

 
 

+ */

 
 

+#define DONTDECLARE_MALLOC

 
 

-#include "sysdep.h"

 #include "bfd.h"
 #include "bfd.h"

+#include "sysdep.h"
+#include "bfdlink.h"

 #include "ld.h"    
 #include "ldexp.h"
 #include "ld.h"    
 #include "ldexp.h"

-#include "ldversion.h"
+#include "ldver.h"

 #include "ldlang.h"
 #include "ldlang.h"

-#include "ld-emul.h"
+#include "ldemul.h"

 #include "ldfile.h"
 #include "ldmisc.h"
 #include "ldfile.h"
 #include "ldmisc.h"

-#define YYDEBUG 1
-
-boolean option_v;
-extern unsigned int lineno;
-extern boolean trace_files;
-extern boolean write_map;
-
-boolean hex_mode;
-
-strip_symbols_type strip_symbols=STRIP_NONE;
-discard_locals_type discard_locals=DISCARD_NONE;
+#include "ldmain.h"
+#include "mri.h"
+#include "ldlex.h"

 
 

+static int typebits;

 
 lang_memory_region_type *region;
 
 
 
 lang_memory_region_type *region;
 
 

-lang_memory_region_type *lang_memory_region_lookup();
-lang_output_section_statement_type *lang_output_section_statement_lookup();
-
-#ifdef __STDC__
-
-void lang_add_data(int type, union etree_union *exp);
-void lang_enter_output_section_statement(char *output_section_statement_name, etree_type *address_exp, bfd_vma block_value);
-
-#else
-
-void lang_add_data();
-void lang_enter_output_section_statement();
-
-#endif /* __STDC__ */
-
-extern args_type command_line;

 char *current_file;
 boolean ldgram_want_filename = true;
 boolean had_script = false;
 char *current_file;
 boolean ldgram_want_filename = true;
 boolean had_script = false;


@@ -63,35 +51,25 @@ boolean force_make_executable = false;
 
 boolean ldgram_in_script = false;
 boolean ldgram_had_equals = false;
 
 boolean ldgram_in_script = false;
 boolean ldgram_had_equals = false;

-/* LOCALS */
-
-

 
 
 
 

+#define ERROR_NAME_MAX 20
+static char *error_names[ERROR_NAME_MAX];
+static int error_index;
+#define PUSH_ERROR(x) if (error_index < ERROR_NAME_MAX) error_names[error_index] = x; error_index++;
+#define POP_ERROR()   error_index--;

 %}
 %union {
   bfd_vma integer;
 %}
 %union {
   bfd_vma integer;

-  int voidval;

   char *name;
   int token;
   union etree_union *etree;
   char *name;
   int token;
   union etree_union *etree;

-  asection *section;
-  struct lang_output_section_statement_struct *output_section_statement;
-  union  lang_statement_union **statement_ptr;
-  int lineno;
-  struct {
-    FILE *file;
-    char *name;
-    unsigned int lineno;
-  } state;
-
-  

 }
 
 }
 

-%type <etree> exp  opt_exp  exp_head
-%type <integer> fill_opt opt_block
+%type <etree> exp  opt_exp_with_type  mustbe_exp opt_at
+%type <integer> fill_opt

 %type <name> memspec_opt
 %type <name> memspec_opt

-%token <integer> INT CHAR 
+%token <integer> INT  

 %token <name> NAME
 %type  <integer> length
 
 %token <name> NAME
 %type  <integer> length
 


@@ -105,211 +83,145 @@ boolean ldgram_had_equals = false;
 %left <token>  EQ NE
 %left  <token> '<' '>' LE GE
 %left  <token> LSHIFT RSHIFT
 %left <token>  EQ NE
 %left  <token> '<' '>' LE GE
 %left  <token> LSHIFT RSHIFT

+

 %left  <token> '+' '-'
 %left  <token> '*' '/' '%'
 %left  <token> '+' '-'
 %left  <token> '*' '/' '%'

+

 %right UNARY
 %right UNARY

+%token END 

 %left <token> '('
 %left <token> '('

-%token <token> ALIGN_K BLOCK LONG SHORT BYTE
-%token SECTIONS  
+%token <token> ALIGN_K BLOCK QUAD LONG SHORT BYTE
+%token SECTIONS

 %token '{' '}'
 %token '{' '}'

-%token ALIGNMENT SIZEOF_HEADERS OUTPUT_FORMAT FORCE_COMMON_ALLOCATION OUTPUT_ARCH
-%token NEXT SIZEOF ADDR  SCRIPT ENDSCRIPT SIZEOF_HEADERS
-%token MEMORY 
-%token DSECT NOLOAD COPY INFO OVERLAY 
-%token NAME DEFINED TARGET_K SEARCH_DIR MAP ENTRY 
-%token OPTION_e OPTION_c OPTION_noinhibit_exec OPTION_s OPTION_S OPTION_sort_common
-%token OPTION_format  OPTION_F OPTION_u
-
-%token OPTION_d OPTION_dc OPTION_dp OPTION_x OPTION_X OPTION_defsym
-%token OPTION_v OPTION_M OPTION_t STARTUP HLL SYSLIB FLOAT NOFLOAT 
-%token OPTION_n OPTION_r OPTION_o OPTION_b  OPTION_A OPTION_R
-%token <name> OPTION_l OPTION_L  OPTION_T OPTION_Aarch OPTION_Tfile  OPTION_Texp
-%token OPTION_Ur 
-%token ORIGIN FILL OPTION_g
-%token LENGTH  BIND SUBSECTION_ALIGN   CREATE_OBJECT_SYMBOLS INPUT OUTPUT
-%type <token> assign_op SIZEOF NEXT ADDR 
-%type <etree> assignment
+%token SIZEOF_HEADERS OUTPUT_FORMAT FORCE_COMMON_ALLOCATION OUTPUT_ARCH
+%token SIZEOF_HEADERS
+%token INCLUDE
+%token MEMORY DEFSYMEND
+%token NOLOAD DSECT COPY INFO OVERLAY
+%token NAME DEFINED TARGET_K SEARCH_DIR MAP ENTRY
+%token <integer> SIZEOF NEXT ADDR
+%token STARTUP HLL SYSLIB FLOAT NOFLOAT
+%token ORIGIN FILL
+%token LENGTH CREATE_OBJECT_SYMBOLS INPUT GROUP OUTPUT CONSTRUCTORS
+%token ALIGNMOD AT PROVIDE
+%type <token> assign_op 

 %type <name>  filename
 %type <name>  filename

-
-%{
-ld_config_type config;
-%}
+%token CHIP LIST SECT ABSOLUTE  LOAD NEWLINE ENDWORD ORDER NAMEWORD
+%token FORMAT PUBLIC DEFSYMEND BASE ALIAS TRUNCATE REL
+%token INPUT_SCRIPT INPUT_MRI_SCRIPT INPUT_DEFSYM

 
 %%
 
 
 %%
 

+file:  
+               INPUT_SCRIPT script_file
+       |       INPUT_MRI_SCRIPT mri_script_file
+       |       INPUT_DEFSYM defsym_expr
+       ;

 
 
 
 

-file:  command_line  { lang_final(); };
-
-
-filename:
-  NAME;
+filename:  NAME;

 
 

-command_line:
-               command_line command_line_option
-       |
-       ;

 
 

-command_line_option:
-               '{'
-                       { ldgram_in_script = true; }
-               ifile_list 
-                       { ldgram_in_script = false; }
-               '}'
-       |       OPTION_v
-                       {       
-                       ldversion();
-                       option_v = true;
-                       }
-       |       OPTION_t {
-                       trace_files = true;
-                       }
-       |       OPTION_M {
-                       write_map = true;
-                       }
-       |       OPTION_n {
-                       config.magic_demand_paged = false;
-                       config.make_executable = false;
-                       }
-        |       OPTION_s {
-                       strip_symbols = STRIP_ALL;
-                       }
-       |       OPTION_S {
-                       strip_symbols = STRIP_DEBUGGER;
-                       }
-        |       OPTION_u NAME {
-                       ldlang_add_undef($2);
-               }
-           
-       |       OPTION_r {
-                       config.relocateable_output = true;
-                       config.build_constructors = false;
-                       config.magic_demand_paged = false;
-                       }
-        |       OPTION_Ur {
-                       config.relocateable_output = true;
-                       config.build_constructors = true;
-                       config.magic_demand_paged = false;
-                     }             
-       |       OPTION_o filename
-                       {
-                       lang_add_output($2); 
-                       }
-       |       OPTION_e NAME
-                       { lang_add_entry($2); 
-                       }
-       |       OPTION_X {
-                       discard_locals = DISCARD_L;
-               }
-       |       OPTION_x {
-                       discard_locals = DISCARD_ALL;
+defsym_expr:
+               { ldlex_defsym(); }
+               NAME '=' exp
+               {
+                 ldlex_popstate();
+                 lang_add_assignment(exp_assop($3,$2,$4));

                }
 
                }
 

-       |       OPTION_noinhibit_exec
-                       {
-                       force_make_executable = true;
-                       }
-        |      OPTION_sort_common {
-       config.sort_common = true;
-      }
-       |      OPTION_d {
-                         command_line.force_common_definition = true;
-                       }
-       |      OPTION_dc
-                        {
-                         command_line.force_common_definition = true;
-                       }
-       |       OPTION_g
-                       {
-                       /* Ignored */
-                       }
-       |       OPTION_dp
-                        {
-                         command_line.force_common_definition = true;
-                       }
-       |       OPTION_format NAME
-                  {
-                         lang_add_target($2);
-                          }
-       |       OPTION_Texp 
-               { 
-                       hex_mode  =true; 
-               } 
-               INT
-               { 
-                       lang_section_start($1,exp_intop($3));
-                       hex_mode = false; 
+/* SYNTAX WITHIN AN MRI SCRIPT FILE */  
+mri_script_file:
+               {       ldlex_mri_script();
+                       PUSH_ERROR("MRI style script");

                }
                }

-       
-       |       OPTION_Aarch 
-               { 
-                       ldfile_add_arch($1); 
+            mri_script_lines
+               {       ldlex_popstate(); 
+                       POP_ERROR();

                }
                }

-       |        OPTION_b NAME
-                       {
-                       lang_add_target($2);
-                       }
-       |       OPTION_L
-                       {
-                       ldfile_add_library_path($1);
-                       }
-       |       OPTION_F
-               {
-               /* Ignore */
-               }
-        |      NAME
-               { lang_add_input_file($1,lang_input_file_is_file_enum,
-                                (char *)NULL); }
-       |       OPTION_c filename script_file
-                       { ldfile_open_command_file($2); }
-       |       OPTION_Tfile 
-                       { ldfile_open_command_file($1); } script_file
+       ;

 
 

-       |       OPTION_T filename 
-                       { ldfile_open_command_file($2); } script_file
+mri_script_lines:
+               mri_script_lines mri_script_command NEWLINE
+          |
+       ;

 
 

-       |       OPTION_l
-                       {
-                         lang_add_input_file($1,
-                                        lang_input_file_is_l_enum,
-                                        (char *)NULL);
+mri_script_command:
+               CHIP  exp 
+       |       CHIP  exp ',' exp
+       |       NAME    {
+                       einfo("%P%F: unrecognised keyword in MRI style script '%s'\n",$1);

                        }
                        }

-       |       OPTION_R filename
-                       {
-                       lang_add_input_file($2,
-                               lang_input_file_is_symbols_only_enum,
-                               (char *)NULL);
-                       }
-       |       OPTION_defsym 
-                       {
+       |       LIST    {
+                       config.map_filename = "-";

                        }
                        }

-               NAME     '='
-               exp_head 
-                       {
-                       lang_add_assignment(exp_assop($4,$3,$5));
-                       }       
-       | '-' NAME
-                { info("%P%F Unrecognised option -%s\n", $2);  }
-
+        |       ORDER ordernamelist
+       |       ENDWORD 
+        |       PUBLIC NAME '=' exp 
+                       { mri_public($2, $4); }
+        |       PUBLIC NAME ',' exp 
+                       { mri_public($2, $4); }
+        |       PUBLIC NAME  exp 
+                       { mri_public($2, $3); }
+       |       FORMAT NAME
+                       { mri_format($2); }
+       |       SECT NAME ',' exp 
+                       { mri_output_section($2, $4);}
+       |       SECT NAME  exp
+                       { mri_output_section($2, $3);}
+       |       SECT NAME '=' exp
+                       { mri_output_section($2, $4);}
+       |       ALIGN_K NAME '=' exp
+                       { mri_align($2,$4); }
+       |       ALIGNMOD NAME '=' exp
+                       { mri_alignmod($2,$4); }
+       |       ABSOLUTE mri_abs_name_list
+       |       LOAD     mri_load_name_list
+       |       NAMEWORD NAME 
+                       { mri_name($2); }   
+       |       ALIAS NAME ',' NAME
+                       { mri_alias($2,$4,0);}
+       |       ALIAS NAME ',' INT
+                       { mri_alias($2,0,(int) $4);}
+       |       BASE     exp
+                       { mri_base($2); }
+        |       TRUNCATE INT
+               {  mri_truncate((unsigned int) $2); }
+        |

        ;
 
        ;
 

+ordernamelist:
+             ordernamelist ',' NAME         { mri_order($3); }
+       |     ordernamelist  NAME         { mri_order($2); }
+       |
+       ;

 
 

-  
-
-
-
+mri_load_name_list:
+               NAME
+                       { mri_load($1); }
+       |       mri_load_name_list ',' NAME { mri_load($3); }
+       ;

 
 

+mri_abs_name_list:
+               NAME
+                       { mri_only_load($1); }
+       |       mri_abs_name_list ','  NAME
+                       { mri_only_load($3); }
+       ;

 
 script_file:
 
 script_file:

-       { ldgram_in_script = true; }
-       ifile_list '}'
-        { ldgram_in_script = false; }
-
+       {
+        ldlex_both();
+       }
+       ifile_list
+       {
+       ldlex_popstate();
+       }

         ;
 
 
 ifile_list:
         ;
 
 
 ifile_list:

-       ifile_list ifile_p1 
+       ifile_list ifile_p1

         |
        ;
 
         |
        ;
 


@@ -323,37 +235,44 @@ ifile_p1:
        |       low_level_library
        |       floating_point_support
        |       statement_anywhere
        |       low_level_library
        |       floating_point_support
        |       statement_anywhere

+        |       ';'

        |       TARGET_K '(' NAME ')'
                { lang_add_target($3); }
        |       SEARCH_DIR '(' filename ')'
        |       TARGET_K '(' NAME ')'
                { lang_add_target($3); }
        |       SEARCH_DIR '(' filename ')'

-               { ldfile_add_library_path($3); }
+               { ldfile_add_library_path ($3, false); }

        |       OUTPUT '(' filename ')'
        |       OUTPUT '(' filename ')'

-               { lang_add_output($3); }
-        |       OUTPUT_FORMAT '(' NAME ')'
-                 { lang_add_output_format($3); }
-        |       OUTPUT_ARCH '(' NAME ')'
+               { lang_add_output($3, 1); }
+        |      OUTPUT_FORMAT '(' NAME ')'
+                 { lang_add_output_format($3, 1); }
+        |      OUTPUT_ARCH '(' NAME ')'

                  { ldfile_set_output_arch($3); }
        |       FORCE_COMMON_ALLOCATION
                { command_line.force_common_definition = true ; }
        |       INPUT '(' input_list ')'
                  { ldfile_set_output_arch($3); }
        |       FORCE_COMMON_ALLOCATION
                { command_line.force_common_definition = true ; }
        |       INPUT '(' input_list ')'

+       |       GROUP
+                 { lang_enter_group (); }
+                   '(' input_list ')'
+                 { lang_leave_group (); }

        |       MAP '(' filename ')'
                { lang_add_map($3); }
        |       MAP '(' filename ')'
                { lang_add_map($3); }

+       |       INCLUDE filename 
+               { ldfile_open_command_file($2); } ifile_list END

        ;
 
 input_list:
                NAME
        ;
 
 input_list:
                NAME

-               { lang_add_input_file($1,lang_input_file_is_file_enum,
+               { lang_add_input_file($1,lang_input_file_is_search_file_enum,

                                 (char *)NULL); }
        |       input_list ',' NAME
                                 (char *)NULL); }
        |       input_list ',' NAME

-               { lang_add_input_file($3,lang_input_file_is_file_enum,
+               { lang_add_input_file($3,lang_input_file_is_search_file_enum,

                                 (char *)NULL); }
                                 (char *)NULL); }

-       |       input_list   NAME
-               { lang_add_input_file($2, lang_input_file_is_file_enum,
+       |       input_list NAME
+               { lang_add_input_file($2,lang_input_file_is_search_file_enum,

                                 (char *)NULL); }
        ;
 
 sections:
                                 (char *)NULL); }
        ;
 
 sections:

-               SECTIONS '{'sec_or_group_p1  '}' 
+               SECTIONS '{' sec_or_group_p1 '}'

        ;
 
 sec_or_group_p1:
        ;
 
 sec_or_group_p1:


@@ -364,14 +283,14 @@ sec_or_group_p1:
 
 statement_anywhere:
                ENTRY '(' NAME ')'
 
 statement_anywhere:
                ENTRY '(' NAME ')'

-               { lang_add_entry($3); }
+               { lang_add_entry ($3, 0); }

        |       assignment end
        ;
 
 file_NAME_list:
                NAME
                        { lang_add_wild($1, current_file); }
        |       assignment end
        ;
 
 file_NAME_list:
                NAME
                        { lang_add_wild($1, current_file); }

-       |       file_NAME_list opt_comma NAME 
+       |       file_NAME_list opt_comma NAME

                        { lang_add_wild($3, current_file); }
        ;
 
                        { lang_add_wild($3, current_file); }
        ;
 


@@ -380,65 +299,82 @@ input_section_spec:
                {
                lang_add_wild((char *)NULL, $1);
                }
                {
                lang_add_wild((char *)NULL, $1);
                }

-        |      '[' 
+        |      '['

                        {
                        current_file = (char *)NULL;
                        }
                        {
                        current_file = (char *)NULL;
                        }

-                       file_NAME_list  
-               ']' 
+                       file_NAME_list
+               ']'

        |       NAME
                        {
        |       NAME
                        {

-                       current_file  =$1;
-                       } 
+                       current_file =$1;
+                       }

                '(' file_NAME_list ')'
                '(' file_NAME_list ')'

-       |       '*' 
-                       {       
+       |       '*'
+                       {

                        current_file = (char *)NULL;
                        current_file = (char *)NULL;

-                       } 
+                       }

                '(' file_NAME_list ')'
        ;
 
 statement:
                '(' file_NAME_list ')'
        ;
 
 statement:

-               statement assignment end
-       |       statement CREATE_OBJECT_SYMBOLS
+               assignment end
+       |       CREATE_OBJECT_SYMBOLS

                {
                {

-                 lang_add_attribute(lang_object_symbols_statement_enum); }
-
-       |       statement input_section_spec
-        |       statement length '(' exp_head ')'
+               lang_add_attribute(lang_object_symbols_statement_enum); 
+               }
+        |      ';'
+        |      CONSTRUCTORS
+               {
+               
+                 lang_add_attribute(lang_constructors_statement_enum); 
+               }
+       | input_section_spec
+        | length '(' exp ')'

                        {
                        {

-                       lang_add_data($2,$4);
+                       lang_add_data((int) $1,$3);

                        }
   
                        }
   

-       |       statement FILL '(' exp_head ')'
+       | FILL '(' exp ')'

                        {
                          lang_add_fill
                        {
                          lang_add_fill

-                           (exp_get_value_int($4,
+                           (exp_get_value_int($3,

                                               0,
                                               "fill value",
                                               lang_first_phase_enum));
                        }
                                               0,
                                               "fill value",
                                               lang_first_phase_enum));
                        }

-       |
+       ;
+
+statement_list:
+               statement_list statement
+       |       statement
+       ;
+  
+statement_list_opt:
+               /* empty */
+       |       statement_list

        ;
 
 length:
        ;
 
 length:

-               LONG  
+               QUAD
+                       { $$ = $1; }
+       |       LONG

                        { $$ = $1; }
                        { $$ = $1; }

-       |       SHORT 
+       |       SHORT

                        { $$ = $1; }
                        { $$ = $1; }

-       |       BYTE 
+       |       BYTE

                        { $$ = $1; }
        ;
 
 fill_opt:
                        { $$ = $1; }
        ;
 
 fill_opt:

-          '=' exp_head
+          '=' mustbe_exp

                {
                  $$ =   exp_get_value_int($2,
                                           0,
                                           "fill value",
                {
                  $$ =   exp_get_value_int($2,
                                           0,
                                           "fill value",

-                                          lang_first_phase_enum); 
+                                          lang_first_phase_enum);

                }
                }

-       |       {  $$ = 0; }
+       |       { $$ = 0; }

        ;
 
                
        ;
 
                


@@ -446,7 +382,7 @@ fill_opt:
 assign_op:
                PLUSEQ
                        { $$ = '+'; }
 assign_op:
                PLUSEQ
                        { $$ = '+'; }

-       |       MINUSEQ 
+       |       MINUSEQ

                        { $$ = '-'; }
        |       MULTEQ
                        { $$ = '*'; }
                        { $$ = '-'; }
        |       MULTEQ
                        { $$ = '*'; }


@@ -468,16 +404,22 @@ end:      ';' | ','
 
 
 assignment:
 
 
 assignment:

-       
-               NAME '=' exp_head 
+               NAME '=' mustbe_exp

                {
                {

-                 lang_add_assignment(exp_assop($2,$1,$3));
+                 lang_add_assignment (exp_assop ($2, $1, $3));

                }
                }

-       |       NAME assign_op exp_head 
+       |       NAME assign_op mustbe_exp

                {
                {

-                 lang_add_assignment(exp_assop('=',$1,exp_binop($2,exp_nameop(NAME,$1),$3)));
+                 lang_add_assignment (exp_assop ('=', $1,
+                                                 exp_binop ($2,
+                                                            exp_nameop (NAME,
+                                                                        $1),
+                                                            $3)));
+               }
+       |       PROVIDE '(' NAME '=' mustbe_exp ')'
+               {
+                 lang_add_assignment (exp_provide ($3, $5));

                }
                }

-               

        ;
 
 
        ;
 
 


@@ -490,31 +432,26 @@ memory:
        ;
 
 memory_spec_list:
        ;
 
 memory_spec_list:

-               memory_spec_list memory_spec 
+               memory_spec_list memory_spec

        |       memory_spec_list ',' memory_spec
        |
        ;
 
 
        |       memory_spec_list ',' memory_spec
        |
        ;
 
 

-memory_spec:
-               NAME 
+memory_spec:           NAME

                        { region = lang_memory_region_lookup($1); }
                        { region = lang_memory_region_lookup($1); }

-               attributes_opt  ':' origin_spec opt_comma length_spec
+               attributes_opt ':'
+               origin_spec opt_comma length_spec

 
 

-               {
-                
-
-               }
-       ;
-origin_spec:
-       ORIGIN '=' exp
+       ; origin_spec:
+       ORIGIN '=' mustbe_exp

                { region->current =
                 region->origin =
                { region->current =
                 region->origin =

-                exp_get_vma($3, 0L,"origin", lang_first_phase_enum); }
-       ;
-length_spec:
-             LENGTH '=' exp            
-               {  region->length = exp_get_vma($3,
+                exp_get_vma($3, 0L,"origin", lang_first_phase_enum);
+}
+       ; length_spec:
+             LENGTH '=' mustbe_exp
+               { region->length = exp_get_vma($3,

                                               ~((bfd_vma)0),
                                               "length",
                                               lang_first_phase_enum);
                                               ~((bfd_vma)0),
                                               "length",
                                               lang_first_phase_enum);


@@ -536,13 +473,13 @@ startup:
        ;
 
 high_level_library:
        ;
 
 high_level_library:

-               HLL '('  high_level_library_NAME_list ')'
-       |       HLL '('  ')'
+               HLL '(' high_level_library_NAME_list ')'
+       |       HLL '(' ')'

                        { ldemul_hll((char *)NULL); }
        ;
 
 high_level_library_NAME_list:
                        { ldemul_hll((char *)NULL); }
        ;
 
 high_level_library_NAME_list:

-               high_level_library_NAME_list  opt_comma filename
+               high_level_library_NAME_list opt_comma filename

                        { ldemul_hll($3); }
        |       filename
                        { ldemul_hll($1); }
                        { ldemul_hll($3); }
        |       filename
                        { ldemul_hll($1); }


@@ -551,10 +488,9 @@ high_level_library_NAME_list:
 
 low_level_library:
        SYSLIB '(' low_level_library_NAME_list ')'
 
 low_level_library:
        SYSLIB '(' low_level_library_NAME_list ')'

-       ;
-low_level_library_NAME_list:
+       ; low_level_library_NAME_list:

                low_level_library_NAME_list opt_comma filename
                low_level_library_NAME_list opt_comma filename

-                       { ldemul_syslib($3); }                          
+                       { ldemul_syslib($3); }

        |
        ;
 
        |
        ;
 


@@ -562,24 +498,27 @@ floating_point_support:
                FLOAT
                        { lang_float(true); }
        |       NOFLOAT
                FLOAT
                        { lang_float(true); }
        |       NOFLOAT

-                       { lang_float(false); }  
+                       { lang_float(false); }

        ;
                
 
        ;
                
 

-       
+mustbe_exp:             { ldlex_expression(); }
+               exp
+                        { ldlex_popstate(); $$=$2;}
+       ;

 
 exp    :
 
 exp    :

-               '-' exp    %prec UNARY
+               '-' exp %prec UNARY

                        { $$ = exp_unop('-', $2); }
        |       '(' exp ')'
                        { $$ = $2; }
        |       NEXT '(' exp ')' %prec UNARY
                        { $$ = exp_unop('-', $2); }
        |       '(' exp ')'
                        { $$ = $2; }
        |       NEXT '(' exp ')' %prec UNARY

-                       { $$ = exp_unop($1,$3); }
-       |       '!' exp    %prec UNARY
+                       { $$ = exp_unop((int) $1,$3); }
+       |       '!' exp %prec UNARY

                        { $$ = exp_unop('!', $2); }
                        { $$ = exp_unop('!', $2); }

-       |       '+' exp    %prec UNARY
+       |       '+' exp %prec UNARY

                        { $$ = $2; }
                        { $$ = $2; }

-       |       '~' exp    %prec UNARY
+       |       '~' exp %prec UNARY

                        { $$ = exp_unop('~', $2);}
 
        |       exp '*' exp
                        { $$ = exp_unop('~', $2);}
 
        |       exp '*' exp


@@ -591,7 +530,7 @@ exp :
        |       exp '+' exp
                        { $$ = exp_binop('+', $1, $3); }
        |       exp '-' exp
        |       exp '+' exp
                        { $$ = exp_binop('+', $1, $3); }
        |       exp '-' exp

-                       { $$ = exp_binop('-' , $1, $3); }                       
+                       { $$ = exp_binop('-' , $1, $3); }

        |       exp LSHIFT exp
                        { $$ = exp_binop(LSHIFT , $1, $3); }
        |       exp RSHIFT exp
        |       exp LSHIFT exp
                        { $$ = exp_binop(LSHIFT , $1, $3); }
        |       exp RSHIFT exp


@@ -602,7 +541,7 @@ exp :
                        { $$ = exp_binop(NE , $1, $3); }
        |       exp LE exp
                        { $$ = exp_binop(LE , $1, $3); }
                        { $$ = exp_binop(NE , $1, $3); }
        |       exp LE exp
                        { $$ = exp_binop(LE , $1, $3); }

-       |       exp GE exp
+       |       exp GE exp

                        { $$ = exp_binop(GE , $1, $3); }
        |       exp '<' exp
                        { $$ = exp_binop('<' , $1, $3); }
                        { $$ = exp_binop(GE , $1, $3); }
        |       exp '<' exp
                        { $$ = exp_binop('<' , $1, $3); }


@@ -624,62 +563,78 @@ exp       :
                        { $$ = exp_nameop(DEFINED, $3); }
        |       INT
                        { $$ = exp_intop($1); }
                        { $$ = exp_nameop(DEFINED, $3); }
        |       INT
                        { $$ = exp_intop($1); }

-        |      SIZEOF_HEADERS 
+        |      SIZEOF_HEADERS

                        { $$ = exp_nameop(SIZEOF_HEADERS,0); }
 
                        { $$ = exp_nameop(SIZEOF_HEADERS,0); }
 

-       |       SIZEOF  '('  NAME ')'
-                       { $$ = exp_nameop($1,$3); }
+       |       SIZEOF '(' NAME ')'
+                       { $$ = exp_nameop(SIZEOF,$3); }

        |       ADDR '(' NAME ')'
        |       ADDR '(' NAME ')'

-                       { $$ = exp_nameop($1,$3); }
+                       { $$ = exp_nameop(ADDR,$3); }
+       |       ABSOLUTE '(' exp ')'
+                       { $$ = exp_unop(ABSOLUTE, $3); }

        |       ALIGN_K '(' exp ')'
        |       ALIGN_K '(' exp ')'

-                       { $$ = exp_unop($1,$3); }
+                       { $$ = exp_unop(ALIGN_K,$3); }
+       |       BLOCK '(' exp ')'
+                       { $$ = exp_unop(ALIGN_K,$3); }

        |       NAME
                        { $$ = exp_nameop(NAME,$1); }
        ;
 
 
        |       NAME
                        { $$ = exp_nameop(NAME,$1); }
        ;
 
 

+opt_at:
+               AT '(' exp ')' { $$ = $3; }
+       |       { $$ = 0; }
+       ;

 
 

-
-section:       NAME opt_exp opt_block ':' opt_things'{' 
-               {
-               lang_enter_output_section_statement($1,$2,$3);
-               }
-              statement        '}'     fill_opt memspec_opt
+section:       NAME            { ldlex_expression(); }
+               opt_exp_with_type 
+               opt_at          { ldlex_popstate(); }
+               '{'
+                       {
+                       lang_enter_output_section_statement($1,$3,typebits,0,0,0,$4);
+                       }
+               statement_list_opt      
+               '}' {ldlex_expression();} memspec_opt fill_opt

                {
                {

-                 lang_leave_output_section_statement($10, $11);
+                 ldlex_popstate();
+                 lang_leave_output_section_statement($12, $11);

                }
                }

+opt_comma

 
        ;
 
 
        ;
 

-opt_things: 
-       {
-
-       }
+type:
+          NOLOAD  { typebits = SEC_NEVER_LOAD; }
+       |  DSECT   { typebits = 0; }
+       |  COPY    { typebits = 0; }
+       |  INFO    { typebits = 0; }
+       |  OVERLAY { typebits = 0; }
+       | { typebits = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS; }

        ;
 
        ;
 

-exp_head:
-       exp { $$ = $1; }
-       ;

 
 

-opt_exp:
-               exp_head
-                       { $$ = $1; }
-       |               { $$= (etree_type *)NULL; }
+opt_exp_with_type:
+               exp ':'                 { $$ = $1; typebits =0;}
+       |       exp '(' type ')' ':'    { $$ = $1; }
+       |       ':'                     { $$= (etree_type *)NULL; typebits = 0; }
+       |       '(' type ')' ':'        { $$= (etree_type *)NULL;  }

        ;
 
        ;
 

-opt_block:
-               BLOCK '(' exp_head ')'
-               { $$ = exp_get_value_int($3,
-                                        1L,
-                                        "block",
-                                        lang_first_phase_enum); 
-               }
-       |       { $$  = 1; }
-       ;
-  

 memspec_opt:
                '>' NAME
                { $$ = $2; }
        |       { $$ = "*default*"; }
        ;
 memspec_opt:
                '>' NAME
                { $$ = $2; }
        |       { $$ = "*default*"; }
        ;

-
+%%
+void
+yyerror(arg) 
+     const char *arg;
+{ 
+  if (ldfile_assumed_script)
+    einfo ("%P:%s: file format not recognized; treating as linker script\n",
+          ldfile_input_filename);
+  if (error_index > 0 && error_index < ERROR_NAME_MAX)
+     einfo ("%P%F:%S: %s in %s\n", arg, error_names[error_index-1]);
+  else
+     einfo ("%P%F:%S: %s\n", arg);
+}