aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2015-04-28 20:32:06 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2015-04-28 21:55:28 +0200
commita13eab064f93565e9af407a8a9e84f8558acd27e (patch)
tree8db840ba681477ccee31d5a7abc142bf2dc5832c /ld
parentcea6e4f13a8df0eddbcdf643a4fc4727cbf770a7 (diff)
downloadfsf-binutils-gdb-a13eab064f93565e9af407a8a9e84f8558acd27e.zip
fsf-binutils-gdb-a13eab064f93565e9af407a8a9e84f8558acd27e.tar.gz
fsf-binutils-gdb-a13eab064f93565e9af407a8a9e84f8558acd27e.tar.bz2
Eat newlines inside INPUT statements in linker scripts
ld/ PR ld/18344 * ldlex.l (INPUTLIST): Increment lineno on newline.
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/ldlex.l2
2 files changed, 6 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index de594c0..3448bba 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-28 Andreas Schwab <schwab@linux-m68k.org>
+
+ PR ld/18344
+ * ldlex.l (INPUTLIST): Increment lineno on newline.
+
2015-04-24 Alan Modra <amodra@gmail.com>
* emultempl/ppc64elf.em (gld${EMULATION_NAME}_after_allocation):
diff --git a/ld/ldlex.l b/ld/ldlex.l
index a19c5d6..d9ef830 100644
--- a/ld/ldlex.l
+++ b/ld/ldlex.l
@@ -450,7 +450,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
return *yytext;
}
-<VERS_START,VERS_NODE,VERS_SCRIPT>[\n] { lineno++; }
+<VERS_START,VERS_NODE,VERS_SCRIPT,INPUTLIST>[\n] { lineno++; }
<VERS_START,VERS_NODE,VERS_SCRIPT>#.* { /* Eat up comments */ }