2004-10-07 Kei Sakamoto <sakamoto.kei@renesas.com>
[deliverable/binutils-gdb.git] / ld / ldgram.y
index 28fe57378731c5ae894466d5d7fd17ce39a4878d..bdfdcd5ddd65d7dd3ab934de53d7422ed5234e79 100644 (file)
@@ -1,6 +1,6 @@
-/* A YACC grammer to parse a superset of the AT&T linker scripting languaue.
-   Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
+/* A YACC grammar to parse a superset of the AT&T linker scripting language.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003 Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support (steve@cygnus.com).
 
 This file is part of GNU ld.
@@ -29,15 +29,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "bfd.h"
 #include "sysdep.h"
 #include "bfdlink.h"
-#include "ld.h"    
+#include "ld.h"
 #include "ldexp.h"
 #include "ldver.h"
 #include "ldlang.h"
-#include "ldemul.h"
 #include "ldfile.h"
+#include "ldemul.h"
 #include "ldmisc.h"
 #include "ldmain.h"
 #include "mri.h"
+#include "ldctor.h"
 #include "ldlex.h"
 
 #ifndef YYDEBUG
@@ -48,14 +49,14 @@ static enum section_type sectype;
 
 lang_memory_region_type *region;
 
-struct wildcard_spec current_file;
-boolean ldgram_want_filename = true;
-boolean had_script = false;
-boolean force_make_executable = false;
+bfd_boolean ldgram_want_filename = TRUE;
+FILE *saved_script_handle = NULL;
+bfd_boolean force_make_executable = FALSE;
 
-boolean ldgram_in_script = false;
-boolean ldgram_had_equals = false;
-boolean ldgram_had_keep = false;
+bfd_boolean ldgram_in_script = FALSE;
+bfd_boolean ldgram_had_equals = FALSE;
+bfd_boolean ldgram_had_keep = FALSE;
+char *ldgram_vers_current_lang = NULL;
 
 #define ERROR_NAME_MAX 20
 static char *error_names[ERROR_NAME_MAX];
@@ -65,15 +66,23 @@ static int error_index;
 %}
 %union {
   bfd_vma integer;
+  struct big_int
+    {
+      bfd_vma integer;
+      char *str;
+    } bigint;
+  fill_type *fill;
   char *name;
   const char *cname;
   struct wildcard_spec wildcard;
+  struct wildcard_list *wildcard_list;
+  struct name_list *name_list;
   int token;
   union etree_union *etree;
   struct phdr_info
     {
-      boolean filehdr;
-      boolean phdrs;
+      bfd_boolean filehdr;
+      bfd_boolean phdrs;
       union etree_union *at;
       union etree_union *flags;
     } phdr;
@@ -85,12 +94,15 @@ static int error_index;
 }
 
 %type <etree> exp opt_exp_with_type mustbe_exp opt_at phdr_type phdr_val
-%type <etree> opt_exp_without_type
-%type <integer> fill_opt
+%type <etree> opt_exp_without_type opt_subalign
+%type <fill> fill_opt fill_exp
+%type <name_list> exclude_name_list
+%type <wildcard_list> file_NAME_list
 %type <name> memspec_opt casesymlist
+%type <name> memspec_at_opt
 %type <cname> wildcard_name
 %type <wildcard> wildcard_spec
-%token <integer> INT  
+%token <bigint> INT
 %token <name> NAME LNAME
 %type <integer> length
 %type <phdr> phdr_qualifiers
@@ -98,7 +110,7 @@ static int error_index;
 %type <section_phdr> phdr_opt
 %type <integer> opt_nocrossrefs
 
-%right <token> PLUSEQ MINUSEQ MULTEQ DIVEQ  '=' LSHIFTEQ RSHIFTEQ   ANDEQ OREQ 
+%right <token> PLUSEQ MINUSEQ MULTEQ DIVEQ  '=' LSHIFTEQ RSHIFTEQ   ANDEQ OREQ
 %right <token> '?' ':'
 %left <token> OROR
 %left <token>  ANDAND
@@ -113,12 +125,14 @@ static int error_index;
 %left  <token> '*' '/' '%'
 
 %right UNARY
-%token END 
+%token END
 %left <token> '('
 %token <token> ALIGN_K BLOCK BIND QUAD SQUAD LONG SHORT BYTE
-%token SECTIONS PHDRS SORT
+%token SECTIONS PHDRS DATA_SEGMENT_ALIGN DATA_SEGMENT_RELRO_END DATA_SEGMENT_END
+%token SORT_BY_NAME SORT_BY_ALIGNMENT
 %token '{' '}'
 %token SIZEOF_HEADERS OUTPUT_FORMAT FORCE_COMMON_ALLOCATION OUTPUT_ARCH
+%token INHIBIT_COMMON_ALLOCATION
 %token SIZEOF_HEADERS
 %token INCLUDE
 %token MEMORY DEFSYMEND
@@ -129,22 +143,23 @@ static int error_index;
 %token STARTUP HLL SYSLIB FLOAT NOFLOAT NOCROSSREFS
 %token ORIGIN FILL
 %token LENGTH CREATE_OBJECT_SYMBOLS INPUT GROUP OUTPUT CONSTRUCTORS
-%token ALIGNMOD AT PROVIDE
-%type <token> assign_op atype
+%token ALIGNMOD AT SUBALIGN PROVIDE
+%type <token> assign_op atype attributes_opt sect_constraint
 %type <name>  filename
-%token CHIP LIST SECT ABSOLUTE  LOAD NEWLINE ENDWORD ORDER NAMEWORD
+%token CHIP LIST SECT ABSOLUTE  LOAD NEWLINE ENDWORD ORDER NAMEWORD ASSERT_K
 %token FORMAT PUBLIC DEFSYMEND BASE ALIAS TRUNCATE REL
 %token INPUT_SCRIPT INPUT_MRI_SCRIPT INPUT_DEFSYM CASE EXTERN START
 %token <name> VERS_TAG VERS_IDENTIFIER
 %token GLOBAL LOCAL VERSIONK INPUT_VERSION_SCRIPT
-%token KEEP
+%token KEEP ONLY_IF_RO ONLY_IF_RW
+%token EXCLUDE_FILE
 %type <versyms> vers_defns
 %type <versnode> vers_tag
 %type <deflist> verdep
 
 %%
 
-file:  
+file:
                INPUT_SCRIPT script_file
        |       INPUT_MRI_SCRIPT mri_script_file
        |       INPUT_VERSION_SCRIPT version_script_file
@@ -162,8 +177,9 @@ defsym_expr:
                  ldlex_popstate();
                  lang_add_assignment(exp_assop($3,$2,$4));
                }
+       ;
 
-/* SYNTAX WITHIN AN MRI SCRIPT FILE */  
+/* SYNTAX WITHIN AN MRI SCRIPT FILE */
 mri_script_file:
                {
                  ldlex_mri_script ();
@@ -183,7 +199,7 @@ mri_script_lines:
        ;
 
 mri_script_command:
-               CHIP  exp 
+               CHIP  exp
        |       CHIP  exp ',' exp
        |       NAME    {
                        einfo(_("%P%F: unrecognised keyword in MRI style script '%s'\n"),$1);
@@ -192,12 +208,12 @@ mri_script_command:
                        config.map_filename = "-";
                        }
         |       ORDER ordernamelist
-       |       ENDWORD 
+       |       ENDWORD
         |       PUBLIC NAME '=' exp
                        { mri_public($2, $4); }
         |       PUBLIC NAME ',' exp
                        { mri_public($2, $4); }
-        |       PUBLIC NAME  exp 
+        |       PUBLIC NAME  exp
                        { mri_public($2, $3); }
        |       FORMAT NAME
                        { mri_format($2); }
@@ -217,22 +233,24 @@ mri_script_command:
                        { mri_alignmod($2,$4); }
        |       ABSOLUTE mri_abs_name_list
        |       LOAD     mri_load_name_list
-       |       NAMEWORD NAME 
-                       { mri_name($2); }   
+       |       NAMEWORD NAME
+                       { mri_name($2); }
        |       ALIAS NAME ',' NAME
                        { mri_alias($2,$4,0);}
        |       ALIAS NAME ',' INT
-                       { mri_alias($2,0,(int) $4);}
+                       { mri_alias ($2, 0, (int) $4.integer); }
        |       BASE     exp
                        { mri_base($2); }
-        |       TRUNCATE INT
-               {  mri_truncate((unsigned int) $2); }
+       |       TRUNCATE INT
+               { mri_truncate ((unsigned int) $2.integer); }
        |       CASE casesymlist
        |       EXTERN extern_name_list
        |       INCLUDE filename
-               { ldfile_open_command_file ($2); } mri_script_lines END
+               { ldlex_script (); ldfile_open_command_file($2); }
+               mri_script_lines END
+               { ldlex_popstate (); }
        |       START NAME
-               { lang_add_entry ($2, false); }
+               { lang_add_entry ($2, FALSE); }
         |
        ;
 
@@ -302,7 +320,7 @@ ifile_p1:
        |       TARGET_K '(' NAME ')'
                { lang_add_target($3); }
        |       SEARCH_DIR '(' filename ')'
-               { ldfile_add_library_path ($3, false); }
+               { ldfile_add_library_path ($3, FALSE); }
        |       OUTPUT '(' filename ')'
                { lang_add_output($3, 1); }
         |      OUTPUT_FORMAT '(' NAME ')'
@@ -311,9 +329,11 @@ ifile_p1:
        |       OUTPUT_FORMAT '(' NAME ',' NAME ',' NAME ')'
                  { lang_add_output_format ($3, $5, $7, 1); }
         |      OUTPUT_ARCH '(' NAME ')'
-                 { ldfile_set_output_arch($3); }
+                 { ldfile_set_output_arch ($3, bfd_arch_unknown); }
        |       FORCE_COMMON_ALLOCATION
-               { command_line.force_common_definition = true ; }
+               { command_line.force_common_definition = TRUE ; }
+       |       INHIBIT_COMMON_ALLOCATION
+               { command_line.inhibit_common_definition = TRUE ; }
        |       INPUT '(' input_list ')'
        |       GROUP
                  { lang_enter_group (); }
@@ -321,8 +341,10 @@ ifile_p1:
                  { lang_leave_group (); }
        |       MAP '(' filename ')'
                { lang_add_map($3); }
-       |       INCLUDE filename 
-               { ldfile_open_command_file($2); } ifile_list END
+       |       INCLUDE filename
+               { ldlex_script (); ldfile_open_command_file($2); }
+               ifile_list END
+               { ldlex_popstate (); }
        |       NOCROSSREFS '(' nocrossref_list ')'
                {
                  lang_add_nocrossref ($3);
@@ -363,8 +385,11 @@ sec_or_group_p1:
 
 statement_anywhere:
                ENTRY '(' NAME ')'
-               { lang_add_entry ($3, false); }
+               { lang_add_entry ($3, FALSE); }
        |       assignment end
+       |       ASSERT_K  {ldlex_expression ();} '(' exp ',' NAME ')'
+               { ldlex_popstate ();
+                 lang_add_assignment (exp_assert ($4, $6)); }
        ;
 
 /* The '*' and '?' cases are there because the lexer returns them as
@@ -388,87 +413,152 @@ wildcard_spec:
                wildcard_name
                        {
                          $$.name = $1;
-                         $$.sorted = false;
+                         $$.sorted = none;
+                         $$.exclude_name_list = NULL;
+                       }
+       |       EXCLUDE_FILE '(' exclude_name_list ')' wildcard_name
+                       {
+                         $$.name = $5;
+                         $$.sorted = none;
+                         $$.exclude_name_list = $3;
+                       }
+       |       SORT_BY_NAME '(' wildcard_name ')'
+                       {
+                         $$.name = $3;
+                         $$.sorted = by_name;
+                         $$.exclude_name_list = NULL;
                        }
-       |       SORT '(' wildcard_name ')'
+       |       SORT_BY_ALIGNMENT '(' wildcard_name ')'
                        {
                          $$.name = $3;
-                         $$.sorted = true;
+                         $$.sorted = by_alignment;
+                         $$.exclude_name_list = NULL;
+                       }
+       |       SORT_BY_NAME '(' SORT_BY_ALIGNMENT '(' wildcard_name ')' ')'
+                       {
+                         $$.name = $5;
+                         $$.sorted = by_name_alignment;
+                         $$.exclude_name_list = NULL;
+                       }
+       |       SORT_BY_NAME '(' SORT_BY_NAME '(' wildcard_name ')' ')'
+                       {
+                         $$.name = $5;
+                         $$.sorted = by_name;
+                         $$.exclude_name_list = NULL;
+                       }
+       |       SORT_BY_ALIGNMENT '(' SORT_BY_NAME '(' wildcard_name ')' ')'
+                       {
+                         $$.name = $5;
+                         $$.sorted = by_alignment_name;
+                         $$.exclude_name_list = NULL;
+                       }
+       |       SORT_BY_ALIGNMENT '(' SORT_BY_ALIGNMENT '(' wildcard_name ')' ')'
+                       {
+                         $$.name = $5;
+                         $$.sorted = by_alignment;
+                         $$.exclude_name_list = NULL;
+                       }
+       |       SORT_BY_NAME '(' EXCLUDE_FILE '(' exclude_name_list ')' wildcard_name ')'
+                       {
+                         $$.name = $7;
+                         $$.sorted = by_name;
+                         $$.exclude_name_list = $5;
+                       }
+       ;
+
+exclude_name_list:
+               exclude_name_list wildcard_name
+                       {
+                         struct name_list *tmp;
+                         tmp = (struct name_list *) xmalloc (sizeof *tmp);
+                         tmp->name = $2;
+                         tmp->next = $1;
+                         $$ = tmp;
+                       }
+       |
+               wildcard_name
+                       {
+                         struct name_list *tmp;
+                         tmp = (struct name_list *) xmalloc (sizeof *tmp);
+                         tmp->name = $1;
+                         tmp->next = NULL;
+                         $$ = tmp;
                        }
        ;
 
 file_NAME_list:
-               wildcard_spec
+               file_NAME_list opt_comma wildcard_spec
                        {
-                         lang_add_wild ($1.name, $1.sorted,
-                                        current_file.name,
-                                        current_file.sorted,
-                                        ldgram_had_keep);
+                         struct wildcard_list *tmp;
+                         tmp = (struct wildcard_list *) xmalloc (sizeof *tmp);
+                         tmp->next = $1;
+                         tmp->spec = $3;
+                         $$ = tmp;
                        }
-       |       file_NAME_list opt_comma wildcard_spec
+       |
+               wildcard_spec
                        {
-                         lang_add_wild ($3.name, $3.sorted,
-                                        current_file.name,
-                                        current_file.sorted,
-                                        ldgram_had_keep);
+                         struct wildcard_list *tmp;
+                         tmp = (struct wildcard_list *) xmalloc (sizeof *tmp);
+                         tmp->next = NULL;
+                         tmp->spec = $1;
+                         $$ = tmp;
                        }
        ;
 
 input_section_spec_no_keep:
                NAME
                        {
-                         lang_add_wild (NULL, false, $1, false,
-                                        ldgram_had_keep);
+                         struct wildcard_spec tmp;
+                         tmp.name = $1;
+                         tmp.exclude_name_list = NULL;
+                         tmp.sorted = none;
+                         lang_add_wild (&tmp, NULL, ldgram_had_keep);
                        }
-        |      '['
+        |      '[' file_NAME_list ']'
                        {
-                         current_file.name = NULL;
-                         current_file.sorted = false;
+                         lang_add_wild (NULL, $2, ldgram_had_keep);
                        }
-               file_NAME_list ']'
-       |       wildcard_spec
+       |       wildcard_spec '(' file_NAME_list ')'
                        {
-                         current_file = $1;
-                         /* '*' matches any file name.  */
-                         if (strcmp (current_file.name, "*") == 0)
-                           current_file.name = NULL;
+                         lang_add_wild (&$1, $3, ldgram_had_keep);
                        }
-               '(' file_NAME_list ')'
        ;
 
 input_section_spec:
                input_section_spec_no_keep
        |       KEEP '('
-                       { ldgram_had_keep = true; }
+                       { ldgram_had_keep = TRUE; }
                input_section_spec_no_keep ')'
-                       { ldgram_had_keep = false; }
+                       { ldgram_had_keep = FALSE; }
        ;
 
 statement:
                assignment end
        |       CREATE_OBJECT_SYMBOLS
                {
-               lang_add_attribute(lang_object_symbols_statement_enum); 
+               lang_add_attribute(lang_object_symbols_statement_enum);
                }
         |      ';'
         |      CONSTRUCTORS
                {
-               
-                 lang_add_attribute(lang_constructors_statement_enum); 
+
+                 lang_add_attribute(lang_constructors_statement_enum);
+               }
+       | SORT_BY_NAME '(' CONSTRUCTORS ')'
+               {
+                 constructors_sorted = TRUE;
+                 lang_add_attribute (lang_constructors_statement_enum);
                }
        | input_section_spec
         | length '(' mustbe_exp ')'
                        {
-                       lang_add_data((int) $1,$3);
+                         lang_add_data ((int) $1, $3);
                        }
-  
-       | FILL '(' mustbe_exp ')'
+
+       | FILL '(' fill_exp ')'
                        {
-                         lang_add_fill
-                           (exp_get_value_int($3,
-                                              0,
-                                              "fill value",
-                                              lang_first_phase_enum));
+                         lang_add_fill ($3);
                        }
        ;
 
@@ -476,7 +566,7 @@ statement_list:
                statement_list statement
        |       statement
        ;
-  
+
 statement_list_opt:
                /* empty */
        |       statement_list
@@ -495,18 +585,21 @@ length:
                        { $$ = $1; }
        ;
 
-fill_opt:
-          '=' mustbe_exp
+fill_exp:
+       mustbe_exp
                {
-                 $$ =   exp_get_value_int($2,
-                                          0,
-                                          "fill value",
-                                          lang_first_phase_enum);
+                 $$ = exp_get_fill ($1,
+                                    0,
+                                    "fill value",
+                                    lang_first_phase_enum);
                }
-       |       { $$ = 0; }
        ;
 
-               
+fill_opt:
+         '=' fill_exp
+               { $$ = $2; }
+       |       { $$ = (fill_type *) 0; }
+       ;
 
 assign_op:
                PLUSEQ
@@ -567,12 +660,14 @@ memory_spec_list:
        ;
 
 
-memory_spec:           NAME
-                       { region = lang_memory_region_lookup($1); }
+memory_spec:   NAME
+               { region = lang_memory_region_lookup ($1, TRUE); }
                attributes_opt ':'
                origin_spec opt_comma length_spec
+               {}
+       ;
 
-       ; origin_spec:
+origin_spec:
        ORIGIN '=' mustbe_exp
                { region->current =
                 region->origin =
@@ -587,15 +682,24 @@ length_spec:
                                               "length",
                                               lang_first_phase_enum);
                }
-       
+       ;
 
 attributes_opt:
-                 '(' NAME ')'
-                       {
-                       lang_set_flags(region, $2);
-                       }
-       |
-  
+               /* empty */
+                 { /* dummy action to avoid bison 1.25 error message */ }
+       |       '(' attributes_list ')'
+       ;
+
+attributes_list:
+               attributes_string
+       |       attributes_list attributes_string
+       ;
+
+attributes_string:
+               NAME
+                 { lang_set_flags (region, $1, 0); }
+       |       '!' NAME
+                 { lang_set_flags (region, $2, 1); }
        ;
 
 startup:
@@ -627,11 +731,11 @@ low_level_library:
 
 floating_point_support:
                FLOAT
-                       { lang_float(true); }
+                       { lang_float(TRUE); }
        |       NOFLOAT
-                       { lang_float(false); }
+                       { lang_float(FALSE); }
        ;
-               
+
 nocrossref_list:
                /* empty */
                {
@@ -717,7 +821,7 @@ exp :
        |       DEFINED '(' NAME ')'
                        { $$ = exp_nameop(DEFINED, $3); }
        |       INT
-                       { $$ = exp_intop($1); }
+                       { $$ = exp_bigintop ($1.integer, $1.str); }
         |      SIZEOF_HEADERS
                        { $$ = exp_nameop(SIZEOF_HEADERS,0); }
 
@@ -731,6 +835,14 @@ exp        :
                        { $$ = exp_unop(ABSOLUTE, $3); }
        |       ALIGN_K '(' exp ')'
                        { $$ = exp_unop(ALIGN_K,$3); }
+       |       ALIGN_K '(' exp ',' exp ')'
+                       { $$ = exp_binop(ALIGN_K,$3,$5); }
+       |       DATA_SEGMENT_ALIGN '(' exp ',' exp ')'
+                       { $$ = exp_binop (DATA_SEGMENT_ALIGN, $3, $5); }
+       |       DATA_SEGMENT_RELRO_END '(' exp ',' exp ')'
+                       { $$ = exp_binop (DATA_SEGMENT_RELRO_END, $5, $3); }
+       |       DATA_SEGMENT_END '(' exp ')'
+                       { $$ = exp_unop(DATA_SEGMENT_END, $3); }
        |       BLOCK '(' exp ')'
                        { $$ = exp_unop(ALIGN_K,$3); }
        |       NAME
@@ -739,46 +851,68 @@ exp       :
                        { $$ = exp_binop (MAX_K, $3, $5 ); }
        |       MIN_K '(' exp ',' exp ')'
                        { $$ = exp_binop (MIN_K, $3, $5 ); }
+       |       ASSERT_K '(' exp ',' NAME ')'
+                       { $$ = exp_assert ($3, $5); }
        ;
 
 
+memspec_at_opt:
+                AT '>' NAME { $$ = $3; }
+        |       { $$ = 0; }
+        ;
+
 opt_at:
                AT '(' exp ')' { $$ = $3; }
        |       { $$ = 0; }
        ;
 
+opt_subalign:
+               SUBALIGN '(' exp ')' { $$ = $3; }
+       |       { $$ = 0; }
+       ;
+
+sect_constraint:
+               ONLY_IF_RO { $$ = ONLY_IF_RO; }
+       |       ONLY_IF_RW { $$ = ONLY_IF_RW; }
+       |       { $$ = 0; }
+       ;
+
 section:       NAME            { ldlex_expression(); }
-               opt_exp_with_type 
-               opt_at          { ldlex_popstate (); ldlex_script (); }
+               opt_exp_with_type
+               opt_at
+               opt_subalign    { ldlex_popstate (); ldlex_script (); }
+               sect_constraint
                '{'
                        {
                          lang_enter_output_section_statement($1, $3,
                                                              sectype,
-                                                             0, 0, 0, $4);
+                                                             0, $5, $4, $7);
                        }
-               statement_list_opt      
+               statement_list_opt
                '}' { ldlex_popstate (); ldlex_expression (); }
-               memspec_opt phdr_opt fill_opt
+               memspec_opt memspec_at_opt phdr_opt fill_opt
                {
                  ldlex_popstate ();
-                 lang_leave_output_section_statement ($13, $11, $12);
+                 lang_leave_output_section_statement ($16, $13, $15, $14);
                }
                opt_comma
+               {}
        |       OVERLAY
                        { ldlex_expression (); }
-               opt_exp_without_type opt_nocrossrefs opt_at
+               opt_exp_without_type opt_nocrossrefs opt_at opt_subalign
                        { ldlex_popstate (); ldlex_script (); }
-               '{' 
+               '{'
                        {
-                         lang_enter_overlay ($3, $5, (int) $4);
+                         lang_enter_overlay ($3, $6);
                        }
                overlay_section
                '}'
                        { ldlex_popstate (); ldlex_expression (); }
-               memspec_opt phdr_opt fill_opt
+               memspec_opt memspec_at_opt phdr_opt fill_opt
                        {
                          ldlex_popstate ();
-                         lang_leave_overlay ($14, $12, $13);
+                         lang_leave_overlay ($5, (int) $4,
+                                             $16, $13, $15, $14);
                        }
                opt_comma
        |       /* The GROUP case is just enough to support the gcc
@@ -835,7 +969,7 @@ opt_nocrossrefs:
 memspec_opt:
                '>' NAME
                { $$ = $2; }
-       |       { $$ = "*default*"; }
+       |       { $$ = DEFAULT_MEMORY_REGION; }
        ;
 
 phdr_opt:
@@ -850,7 +984,7 @@ phdr_opt:
                  n = ((struct lang_output_section_phdr_list *)
                       xmalloc (sizeof *n));
                  n->name = $3;
-                 n->used = false;
+                 n->used = FALSE;
                  n->next = $1;
                  $$ = n;
                }
@@ -907,7 +1041,7 @@ phdr_type:
                        {
                          "PT_NULL", "PT_LOAD", "PT_DYNAMIC",
                          "PT_INTERP", "PT_NOTE", "PT_SHLIB",
-                         "PT_PHDR"
+                         "PT_PHDR", "PT_TLS"
                        };
 
                      s = $1->name.name;
@@ -919,6 +1053,20 @@ phdr_type:
                            $$ = exp_intop (i);
                            break;
                          }
+                     if (i == sizeof phdr_types / sizeof phdr_types[0])
+                       {
+                         if (strcmp (s, "PT_GNU_EH_FRAME") == 0)
+                           $$ = exp_intop (0x6474e550);
+                         else if (strcmp (s, "PT_GNU_STACK") == 0)
+                           $$ = exp_intop (0x6474e551);
+                         else
+                           {
+                             einfo (_("\
+%X%P:%S: unknown phdr type `%s' (try integer literal)\n"),
+                                    s);
+                             $$ = exp_intop (0);
+                           }
+                       }
                    }
                }
        ;
@@ -932,9 +1080,9 @@ phdr_qualifiers:
                {
                  $$ = $3;
                  if (strcmp ($1, "FILEHDR") == 0 && $2 == NULL)
-                   $$.filehdr = true;
+                   $$.filehdr = TRUE;
                  else if (strcmp ($1, "PHDRS") == 0 && $2 == NULL)
-                   $$.phdrs = true;
+                   $$.phdrs = TRUE;
                  else if (strcmp ($1, "FLAGS") == 0 && $2 != NULL)
                    $$.flags = $2;
                  else
@@ -990,7 +1138,11 @@ vers_nodes:
        ;
 
 vers_node:
-               VERS_TAG '{' vers_tag '}' ';'
+               '{' vers_tag '}' ';'
+               {
+                 lang_register_vers_node (NULL, $2, NULL);
+               }
+       |       VERS_TAG '{' vers_tag '}' ';'
                {
                  lang_register_vers_node ($1, $3, NULL);
                }
@@ -1037,19 +1189,44 @@ vers_tag:
 vers_defns:
                VERS_IDENTIFIER
                {
-                 $$ = lang_new_vers_regex (NULL, $1);
+                 $$ = lang_new_vers_pattern (NULL, $1, ldgram_vers_current_lang);
                }
        |       vers_defns ';' VERS_IDENTIFIER
                {
-                 $$ = lang_new_vers_regex ($1, $3);
+                 $$ = lang_new_vers_pattern ($1, $3, ldgram_vers_current_lang);
                }
+       |       vers_defns ';' EXTERN NAME '{'
+                       {
+                         $<name>$ = ldgram_vers_current_lang;
+                         ldgram_vers_current_lang = $4;
+                       }
+               vers_defns opt_semicolon '}'
+                       {
+                         $$ = $7;
+                         ldgram_vers_current_lang = $<name>6;
+                       }
+       |       EXTERN NAME '{'
+                       {
+                         $<name>$ = ldgram_vers_current_lang;
+                         ldgram_vers_current_lang = $2;
+                       }
+               vers_defns opt_semicolon '}'
+                       {
+                         $$ = $5;
+                         ldgram_vers_current_lang = $<name>4;
+                       }
+       ;
+
+opt_semicolon:
+               /* empty */
+       |       ';'
        ;
 
 %%
 void
-yyerror(arg) 
+yyerror(arg)
      const char *arg;
-{ 
+{
   if (ldfile_assumed_script)
     einfo (_("%P:%s: file format not recognized; treating as linker script\n"),
           ldfile_input_filename);
This page took 0.121037 seconds and 4 git commands to generate.