Add support for processing lex source files with flex v 2.6.3

	PR 21059
binutils* arlex.l: Support processing with flex 2.6.3.
	* deflex.l: Likewise.

gas	* config/bfin-lex.l: Support processing with flex 2.6.3.
	* itbl-lex.l: Likewise.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 4c89edcae4302c90808f5d8435290c7ae9d8af0f..5fdec0f9992b67f25f20515c3ca2cb11382fe9ad 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-18  Bernhard Rosenkranzer  <bero@lindev.ch>
+
+       PR 21059
+       * arlex.l: Support processing with flex 2.6.3.
+       * deflex.l: Likewise.
+
 2017-01-17  Dmitry Timoshkov  <dmitry@baikal.ru>
 
        * resbin.c: Optional dialog control data immediately follows

diff --git a/binutils/arlex.l b/binutils/arlex.l
index b5b12d1d88195ad09610896c0ff8c07dfd18400e..43350df292d1729b01bd10f23374acdf4bef7781 100644 (file)
--- a/binutils/arlex.l
+++ b/binutils/arlex.l
@@ -1,4 +1,4 @@
-%option noinput nounput
+%option noinput nounput noyywrap
 
 %{
 /* arlex.l - Strange script language lexer */
@@ -88,7 +88,3 @@ int linenumber;
 "\n"            { linenumber ++; return NEWLINE; }
 
 %%
-#ifndef yywrap
-/* Needed for lex, though not flex. */
-int yywrap(void) { return 1; }
-#endif

diff --git a/binutils/deflex.l b/binutils/deflex.l
index b85c21719f4d5373efe8ca2ff054bd975feeffe1..8c55629d548c92d6bda5211a0d1b5f33e7a28f60 100644 (file)
--- a/binutils/deflex.l
+++ b/binutils/deflex.l
@@ -1,4 +1,4 @@
-%option noinput nounput
+%option noinput nounput noyywrap
 
 %{/* deflex.l - Lexer for .def files */
 
@@ -91,7 +91,3 @@ int linenumber;
 "@"            { return '@';}
 ","            { return ',';}
 %%
-#ifndef yywrap
-/* Needed for lex, though not flex. */
-int yywrap(void) { return 1; }
-#endif

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b189e36e59c27ebe7aeb65f8a146e04d8c884ae9..9569b4b9fa473325a61541ef371c00036ad1f74f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-18  Bernhard Rosenkranzer  <bero@lindev.ch>
+
+       PR 21059
+       * config/bfin-lex.l: Support processing with flex 2.6.3.
+       * itbl-lex.l: Likewise.
+
 2017-01-18  Nathan Sidwell  <nathan@acm.org>
 
        * as.h (gas_assert): Use abort.

diff --git a/gas/config/bfin-lex.l b/gas/config/bfin-lex.l
index 03a4ce875b786197be7a29b96441a5ba74f41073..f270a4b75cfe309dad77847dd7c3498332d758f0 100644 (file)
--- a/gas/config/bfin-lex.l
+++ b/gas/config/bfin-lex.l
@@ -1,3 +1,5 @@
+%option noyywrap
+
 /* bfin-lex.l  ADI Blackfin lexer
    Copyright (C) 2005-2017 Free Software Foundation, Inc.
 
@@ -545,12 +547,3 @@ set_start_state (void)
 {
   BEGIN KEYWORD;
 }
-
-
-#ifndef yywrap
-int
-yywrap ()
-{
-  return 1;
-}
-#endif

diff --git a/gas/itbl-lex.l b/gas/itbl-lex.l
index d9e243c8ab053a2279a47eed59f3a2b281a0c2bd..4a7c51214c4fc5edeaf8a3f8b8512adeb77f7f9c 100644 (file)
--- a/gas/itbl-lex.l
+++ b/gas/itbl-lex.l
@@ -1,3 +1,5 @@
+%option noyywrap
+
 /* itbl-lex.l
    Copyright (C) 1997-2017 Free Software Foundation, Inc.
 
@@ -102,11 +104,3 @@ HEX        [0-9A-Fa-f]
     return yytext[0];
   }
 %%
-
-#ifndef yywrap
-int
-yywrap ()
-  {
-    return 1;
-  }
-#endif