[binutils-gdb] PR28198, Support # as linker script comment marker
Alan Modra
amodra@sourceware.org
Wed Aug 11 10:17:44 GMT 2021
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cc9faa98adc96788e6a560c685bbd8e69c856cb7
commit cc9faa98adc96788e6a560c685bbd8e69c856cb7
Author: Alan Modra <amodra@gmail.com>
Date: Wed Aug 11 18:16:35 2021 +0930
PR28198, Support # as linker script comment marker
PR 28198
* ldlex.l: Combine rules for handling newline, whitespace and
comments. Extend # comment handling to all states.
Diff:
---
ld/ldlex.l | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/ld/ldlex.l b/ld/ldlex.l
index 25b4bcaae01..f588bd3adc5 100644
--- a/ld/ldlex.l
+++ b/ld/ldlex.l
@@ -420,8 +420,13 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
yylval.name[len] = 0;
return NAME;
}
-<BOTH,SCRIPT,EXPRESSION>"\n" { lineno++;}
-<MRI,BOTH,SCRIPT,EXPRESSION>[ \t\r]+ { }
+
+<BOTH,SCRIPT,EXPRESSION,VERS_START,VERS_NODE,VERS_SCRIPT,INPUTLIST>"\n" {
+ lineno++; }
+<MRI,BOTH,SCRIPT,EXPRESSION,VERS_START,VERS_NODE,VERS_SCRIPT,INPUTLIST>[ \t\r]+ {
+ /* Eat up whitespace */ }
+<BOTH,SCRIPT,EXPRESSION,VERS_START,VERS_NODE,VERS_SCRIPT>#.* {
+ /* Eat up comments */ }
<VERS_NODE,VERS_SCRIPT>[:,;] { return *yytext; }
@@ -450,12 +455,6 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
return *yytext;
}
-<VERS_START,VERS_NODE,VERS_SCRIPT,INPUTLIST>[\n] { lineno++; }
-
-<VERS_START,VERS_NODE,VERS_SCRIPT>#.* { /* Eat up comments */ }
-
-<VERS_START,VERS_NODE,VERS_SCRIPT,INPUTLIST>[ \t\r]+ { /* Eat up whitespace */ }
-
<<EOF>> {
include_stack_ptr--;
if (include_stack_ptr == 0)
More information about the Binutils-cvs
mailing list