* mpw-eppcmac.c: Update to reflect changes to aix.em.

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

diff --git a/ld/ldgram.y b/ld/ldgram.y
index 0640afee315a879555805ab8e4d9dc3ec84d103b..7e6f1e8e0b1dbda640602f57b6b95995b04b9cec 100644 (file)
--- a/ld/ldgram.y
+++ b/ld/ldgram.y
@@ -16,7 +16,7 @@ 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.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 %{
 /*
@@ -39,7 +39,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "mri.h"
 #include "ldlex.h"
 
+#ifndef YYDEBUG
 #define YYDEBUG 1
+#endif
 
 static int typebits;
 
@@ -70,9 +72,9 @@ static int error_index;
 
 %type <etree> exp  opt_exp_with_type  mustbe_exp opt_at
 %type <integer> fill_opt
-%type <name> memspec_opt
+%type <name> memspec_opt casesymlist
 %token <integer> INT  
-%token <name> NAME
+%token <name> NAME LNAME
 %type  <integer> length
 
 %right <token> PLUSEQ MINUSEQ MULTEQ DIVEQ  '=' LSHIFTEQ RSHIFTEQ   ANDEQ OREQ 
@@ -100,17 +102,17 @@ static int error_index;
 %token INCLUDE
 %token MEMORY DEFSYMEND
 %token NOLOAD DSECT COPY INFO OVERLAY
-%token NAME DEFINED TARGET_K SEARCH_DIR MAP ENTRY
+%token NAME LNAME 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 OUTPUT CONSTRUCTORS
-%token ALIGNMOD AT
+%token LENGTH CREATE_OBJECT_SYMBOLS INPUT GROUP OUTPUT CONSTRUCTORS
+%token ALIGNMOD AT PROVIDE
 %type <token> assign_op 
 %type <name>  filename
 %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
+%token INPUT_SCRIPT INPUT_MRI_SCRIPT INPUT_DEFSYM CASE EXTERN START
 
 %%
 
@@ -155,20 +157,19 @@ mri_script_command:
                        einfo("%P%F: unrecognised keyword in MRI style script '%s'\n",$1);
                        }
        |       LIST    {
-                       write_map = true;
                        config.map_filename = "-";
                        }
         |       ORDER ordernamelist
        |       ENDWORD 
-        |       PUBLIC NAME '=' exp 
+        |       PUBLIC NAME '=' exp
                        { mri_public($2, $4); }
-        |       PUBLIC NAME ',' exp 
+        |       PUBLIC NAME ',' exp
                        { mri_public($2, $4); }
         |       PUBLIC NAME  exp 
                        { mri_public($2, $3); }
        |       FORMAT NAME
                        { mri_format($2); }
-       |       SECT NAME ',' exp 
+       |       SECT NAME ',' exp
                        { mri_output_section($2, $4);}
        |       SECT NAME  exp
                        { mri_output_section($2, $3);}
@@ -190,6 +191,12 @@ mri_script_command:
                        { mri_base($2); }
         |       TRUNCATE INT
                {  mri_truncate((unsigned int) $2); }
+       |       CASE casesymlist
+       |       EXTERN extern_name_list
+       |       INCLUDE filename
+               { ldfile_open_command_file ($2); } mri_script_lines END
+       |       START NAME
+               { lang_add_entry ($2, 0); }
         |
        ;
 
@@ -212,6 +219,19 @@ mri_abs_name_list:
                        { mri_only_load($3); }
        ;
 
+casesymlist:
+         /* empty */ { $$ = NULL; }
+       | NAME
+       | casesymlist ',' NAME
+       ;
+
+extern_name_list:
+         NAME
+                       { ldlang_add_undef ($1); }
+       | extern_name_list ',' NAME
+                       { ldlang_add_undef ($3); }
+       ;
+
 script_file:
        {
         ldlex_both();
@@ -242,16 +262,23 @@ ifile_p1:
        |       TARGET_K '(' NAME ')'
                { lang_add_target($3); }
        |       SEARCH_DIR '(' filename ')'
-               { ldfile_add_library_path($3); }
+               { ldfile_add_library_path ($3, false); }
        |       OUTPUT '(' filename ')'
                { lang_add_output($3, 1); }
         |      OUTPUT_FORMAT '(' NAME ')'
-                 { lang_add_output_format($3, 1); }
+                 { lang_add_output_format ($3, (char *) NULL,
+                                           (char *) NULL, 1); }
+       |       OUTPUT_FORMAT '(' NAME ',' NAME ',' NAME ')'
+                 { lang_add_output_format ($3, $5, $7, 1); }
         |      OUTPUT_ARCH '(' NAME ')'
                  { 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); }
        |       INCLUDE filename 
@@ -268,6 +295,15 @@ input_list:
        |       input_list NAME
                { lang_add_input_file($2,lang_input_file_is_search_file_enum,
                                 (char *)NULL); }
+       |       LNAME
+               { lang_add_input_file($1,lang_input_file_is_l_enum,
+                                (char *)NULL); }
+       |       input_list ',' LNAME
+               { lang_add_input_file($3,lang_input_file_is_l_enum,
+                                (char *)NULL); }
+       |       input_list LNAME
+               { lang_add_input_file($2,lang_input_file_is_l_enum,
+                                (char *)NULL); }
        ;
 
 sections:
@@ -282,7 +318,7 @@ sec_or_group_p1:
 
 statement_anywhere:
                ENTRY '(' NAME ')'
-               { lang_add_entry($3); }
+               { lang_add_entry ($3, 0); }
        |       assignment end
        ;
 
@@ -405,14 +441,20 @@ end:      ';' | ','
 assignment:
                NAME '=' mustbe_exp
                {
-                 lang_add_assignment(exp_assop($2,$1,$3));
+                 lang_add_assignment (exp_assop ($2, $1, $3));
                }
        |       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));
                }
-               
        ;
 
 
@@ -567,6 +609,8 @@ exp :
                        { $$ = exp_unop(ABSOLUTE, $3); }
        |       ALIGN_K '(' exp ')'
                        { $$ = exp_unop(ALIGN_K,$3); }
+       |       BLOCK '(' exp ')'
+                       { $$ = exp_unop(ALIGN_K,$3); }
        |       NAME
                        { $$ = exp_nameop(NAME,$1); }
        ;
@@ -621,8 +665,11 @@ 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]);
+     einfo ("%P%F:%S: %s in %s\n", arg, error_names[error_index-1]);
   else
-     einfo("%P%F: %S %s\n", arg);
+     einfo ("%P%F:%S: %s\n", arg);
 }