Support arbitrary length fill patterns.

[deliverable/binutils-gdb.git] / ld / ldgram.y

diff --git a/ld/ldgram.y b/ld/ldgram.y
index 806ea1c5f5c35e45938538515f17e9e717d9f2ce..2df9756aa619eb3e03292d7a69c6a4cbf0aa6c72 100644 (file)
--- a/ld/ldgram.y
+++ b/ld/ldgram.y
@@ -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, 98, 99, 2000
-   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 Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support (steve@cygnus.com).
 
 This file is part of GNU ld.
@@ -33,8 +33,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #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"
@@ -49,9 +49,8 @@ static enum section_type sectype;
 
 lang_memory_region_type *region;
 
-struct wildcard_spec current_file;
 boolean ldgram_want_filename = true;
-boolean had_script = false;
+FILE *  saved_script_handle = NULL;
 boolean force_make_executable = false;
 
 boolean ldgram_in_script = false;
@@ -70,6 +69,7 @@ static int error_index;
   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;
@@ -91,6 +91,7 @@ static int error_index;
 %type <etree> opt_exp_without_type
 %type <integer> fill_opt
 %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
@@ -121,9 +122,10 @@ static int error_index;
 %token END 
 %left <token> '('
 %token <token> ALIGN_K BLOCK BIND QUAD SQUAD LONG SHORT BYTE
-%token SECTIONS PHDRS SORT
+%token SECTIONS PHDRS SORT DATA_SEGMENT_ALIGN DATA_SEGMENT_END
 %token '{' '}'
 %token SIZEOF_HEADERS OUTPUT_FORMAT FORCE_COMMON_ALLOCATION OUTPUT_ARCH
+%token INHIBIT_COMMON_ALLOCATION
 %token SIZEOF_HEADERS
 %token INCLUDE
 %token MEMORY DEFSYMEND
@@ -236,7 +238,9 @@ mri_script_command:
        |       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); }
         |
@@ -320,6 +324,8 @@ ifile_p1:
                  { ldfile_set_output_arch($3); }
        |       FORCE_COMMON_ALLOCATION
                { command_line.force_common_definition = true ; }
+       |       INHIBIT_COMMON_ALLOCATION
+               { command_line.inhibit_common_definition = true ; }
        |       INPUT '(' input_list ')'
        |       GROUP
                  { lang_enter_group (); }
@@ -328,7 +334,9 @@ ifile_p1:
        |       MAP '(' filename ')'
                { lang_add_map($3); }
        |       INCLUDE filename 
-               { ldfile_open_command_file($2); } ifile_list END
+               { ldlex_script (); ldfile_open_command_file($2); }
+               ifile_list END
+               { ldlex_popstate (); }
        |       NOCROSSREFS '(' nocrossref_list ')'
                {
                  lang_add_nocrossref ($3);
@@ -417,8 +425,6 @@ wildcard_spec:
                        }
        ;
 
-
-
 exclude_name_list:
                exclude_name_list wildcard_name
                        {
@@ -440,42 +446,42 @@ exclude_name_list:
        ;
 
 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, $1.exclude_name_list);
+                         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, $3.exclude_name_list);
+                         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, NULL);
+                         struct wildcard_spec tmp;
+                         tmp.name = $1;
+                         tmp.exclude_name_list = NULL;
+                         tmp.sorted = false;
+                         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:
@@ -619,7 +625,9 @@ memory_spec:                NAME
                attributes_opt ':'
                origin_spec opt_comma length_spec
 
-       ; origin_spec:
+       ;
+
+origin_spec:
        ORIGIN '=' mustbe_exp
                { region->current =
                 region->origin =
@@ -787,6 +795,10 @@ exp        :
                        { $$ = exp_unop(ABSOLUTE, $3); }
        |       ALIGN_K '(' exp ')'
                        { $$ = exp_unop(ALIGN_K,$3); }
+       |       DATA_SEGMENT_ALIGN '(' exp ',' exp ')'
+                       { $$ = exp_binop (DATA_SEGMENT_ALIGN, $3, $5); }
+       |       DATA_SEGMENT_END '(' exp ')'
+                       { $$ = exp_unop(DATA_SEGMENT_END, $3); }
        |       BLOCK '(' exp ')'
                        { $$ = exp_unop(ALIGN_K,$3); }
        |       NAME
@@ -1053,7 +1065,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);
                }
@@ -1100,11 +1116,11 @@ vers_tag:
 vers_defns:
                VERS_IDENTIFIER
                {
-                 $$ = lang_new_vers_regex (NULL, $1, ldgram_vers_current_lang);
+                 $$ = lang_new_vers_pattern (NULL, $1, ldgram_vers_current_lang);
                }
        |       vers_defns ';' VERS_IDENTIFIER
                {
-                 $$ = lang_new_vers_regex ($1, $3, ldgram_vers_current_lang);
+                 $$ = lang_new_vers_pattern ($1, $3, ldgram_vers_current_lang);
                }
        |       EXTERN NAME '{'
                        {
@@ -1113,6 +1129,7 @@ vers_defns:
                        }
                vers_defns '}'
                        {
+                         $$ = $5;
                          ldgram_vers_current_lang = $<name>4;
                        }
        ;