Eat newlines inside INPUT statements in linker scripts

ld/
	PR ld/18344
	* ldlex.l (INPUTLIST): Increment lineno on newline.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index de594c05a5fc323a70d78749483dc7a433ed6928..3448bbadcfc802b60136a14f2d258371794917da 100644 (file)
--- 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 a19c5d6efe5db20b3a22a64f6121546a3bae9553..d9ef8301d5db996a811bb5cfb172ed51195e1bc9 100644 (file)
--- 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 */ }