diff options
| author |   Alan Modra <amodra@gmail.com> | 2021-08-11 10:13:27 +0930 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2021-08-13 23:53:54 +0200 |
| commit | 2f851f4ff6f71d25a450900ba11f209d523b98c6 (patch) | |
| tree | 492e601700fac4227f0d2a95fe6cfd65f424965f | |
| parent | Revert "Re: ld script expression parsing" (diff) | |
| download | binutils-gdb-2f851f4ff6f71d25a450900ba11f209d523b98c6.tar.gz binutils-gdb-2f851f4ff6f71d25a450900ba11f209d523b98c6.tar.bz2 binutils-gdb-2f851f4ff6f71d25a450900ba11f209d523b98c6.zip | |
Revert "ld --defsym"
This reverts commit fb6c220ebdae893d7d955827363010342fa1afa5.
(cherry picked from commit 60a7dc5647ea58bad07eec86894d76cd4abcac70)
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/ldgram.y | 9 | ||||
| -rw-r--r-- | ld/ldlex.h | 1 | ||||
| -rw-r--r-- | ld/ldlex.l | 19 |
4 files changed, 24 insertions, 11 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 79304e12103..f546c792ecc 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1001,12 +1001,6 @@ 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. * ldlex.h (ldlex_backup): Declare. * ldlex.l (<EXPRESSION>NAME): Don't use NOCFILENAMECHAR set of diff --git a/ld/ldgram.y b/ld/ldgram.y index dd911f46169..6508393db63 100644 --- 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 3baed822a22..3617c15404e 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h @@ -192,6 +192,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 c1b15263587..7652e8d2a29 100644 --- 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); %% @@ -602,6 +610,13 @@ ldlex_version_file (void) } void +ldlex_defsym (void) +{ + *(state_stack_p)++ = yy_start; + BEGIN (DEFSYMEXP); +} + +void ldlex_expression (void) { *(state_stack_p)++ = yy_start; |