Revert "ld --defsym"

This reverts commit fb6c220ebdae893d7d955827363010342fa1afa5.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 79304e1210315b7ac1c5a424d73511b8ba9c2962..f546c792eccdb4443b0c7a4f1b0497ba42336b6f 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -999,12 +999,6 @@
 
        * configure.tgt: Add *-*-genode* as a target for AArch64 and x86.
 
-2021-02-01  Alan Modra  <amodra@gmail.com>
-
-       * ldgram.y (defsym_expr): Use assignment rule.
-       * ldlex.h (ldlex_defsym): Delete.
-       * ldlex.l (DEFSYMEXP, ldlex_defsym): Delete.
-
 2021-02-01  Alan Modra  <amodra@gmail.com>
 
        * ldgram.y (section): Call ldlex_backup.  Remove empty action.

diff --git a/ld/ldgram.y b/ld/ldgram.y
index dd911f461693292042f798a86fd5b3d8b1feee19..6508393db63a1a6c37c27c9fce6608009904e8ac 100644 (file)
--- a/ld/ldgram.y
+++ b/ld/ldgram.y
@@ -176,9 +176,12 @@ filename:  NAME;
 
 
 defsym_expr:
-               { ldlex_expression(); }
-               assignment
-               { ldlex_popstate(); }
+               { ldlex_defsym(); }
+               NAME '=' exp
+               {
+                 ldlex_popstate();
+                 lang_add_assignment (exp_defsym ($2, $4));
+               }
        ;
 
 /* SYNTAX WITHIN AN MRI SCRIPT FILE */

diff --git a/ld/ldlex.h b/ld/ldlex.h
index 9e8bf5fb835343e2809b5578b4f21dc9a242d7b5..ddf00b2fa18b7819e2dcd9205873d8824f4dff5f 100644 (file)
--- a/ld/ldlex.h
+++ b/ld/ldlex.h
@@ -189,6 +189,7 @@ extern void ldlex_inputlist (void);
 extern void ldlex_mri_script (void);
 extern void ldlex_version_script (void);
 extern void ldlex_version_file (void);
+extern void ldlex_defsym (void);
 extern void ldlex_expression (void);
 extern void ldlex_both (void);
 extern void ldlex_popstate (void);

diff --git a/ld/ldlex.l b/ld/ldlex.l
index c1b15263587dae424e33c3e0dc709746be332a90..7652e8d2a29a432faaa4c6ffe2a5872c24a2c28a 100644 (file)
--- a/ld/ldlex.l
+++ b/ld/ldlex.l
@@ -79,6 +79,7 @@ static void lex_warn_invalid (char *where, char *what);
        SCRIPT          definitely in a script
        INPUTLIST       definitely in a script, a filename-list
        BOTH            either EXPRESSION or SCRIPT
+       DEFSYMEXP       in an argument to -defsym
        MRI             in an MRI script
        VERS_START      starting a Sun style mapfile
        VERS_SCRIPT     a Sun style mapfile
@@ -106,6 +107,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
 %s INPUTLIST
 %s EXPRESSION
 %s BOTH
+%s DEFSYMEXP
 %s MRI
 %s VERS_START
 %s VERS_SCRIPT
@@ -131,6 +133,12 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
 <BOTH,SCRIPT,EXPRESSION,VERS_START,VERS_NODE,VERS_SCRIPT,INPUTLIST>"/*"        { comment (); }
 
 
+<DEFSYMEXP>"-"                 { RTOKEN('-');}
+<DEFSYMEXP>"+"                 { RTOKEN('+');}
+<DEFSYMEXP>{SYMBOLNAMECHAR1}{SYMBOLNAMECHAR}* { yylval.name = xstrdup (yytext);
+                                               return NAME; }
+<DEFSYMEXP>"="                 { RTOKEN('='); }
+
 <MRI,EXPRESSION>"$"([0-9A-Fa-f])+ {
                                yylval.integer = bfd_scan_vma (yytext + 1, 0, 16);
                                yylval.bigint.str = NULL;
@@ -162,7 +170,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
                                   yylval.bigint.str = NULL;
                                   return INT;
                                 }
-<SCRIPT,MRI,BOTH,EXPRESSION>((("$"|0[xX])([0-9A-Fa-f])+)|(([0-9])+))(M|K|m|k)? {
+<SCRIPT,DEFSYMEXP,MRI,BOTH,EXPRESSION>((("$"|0[xX])([0-9A-Fa-f])+)|(([0-9])+))(M|K|m|k)? {
                                  char *s = yytext;
                                  int ibase = 0;
 
@@ -472,7 +480,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
 }
 
 <SCRIPT,MRI,VERS_START,VERS_SCRIPT,VERS_NODE>. lex_warn_invalid (" in script", yytext);
-<EXPRESSION,BOTH>.     lex_warn_invalid (" in expression", yytext);
+<EXPRESSION,DEFSYMEXP,BOTH>.   lex_warn_invalid (" in expression", yytext);
 
 %%
 \f
@@ -601,6 +609,13 @@ ldlex_version_file (void)
   BEGIN (VERS_SCRIPT);
 }
 
+void
+ldlex_defsym (void)
+{
+  *(state_stack_p)++ = yy_start;
+  BEGIN (DEFSYMEXP);
+}
+
 void
 ldlex_expression (void)
 {