Fix lex source files so that they will be accepted by flex v2.6.3

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

gas	* arlex.l: Support processing with flex 2.6.3.
	* deflex.l: Likewise.
	* syslex.l: Likewise.

ld	* ldlex.l: Support processing with flex 2.6.3.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index d4755bd6fbadedc2628b7e8b37adfd4c65de7eb3..3c4c220c063bbab419ab3bfc28c99516bad63104 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2017-01-18  Bernhard Rosenkranzer  <bero@lindev.ch>
+
+       PR 21059
+       * arlex.l: Support processing with flex 2.6.3.
+       * deflex.l: Likewise.
+       * syslex.l: Likewise.
+
 2017-01-12  Nick Clifton  <nickc@redhat.com>
 
        PR binutils/20876

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 de09b6157efcf2f1a40015a5c10c9cccd0188e3c..24e974ca18c6ee2de52fcb6c3e76510a52c195ce 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/binutils/syslex.l b/binutils/syslex.l
index 86cb17de918e01b89c693dff1459808e1029f701..7fcc714fc0884473d0e40af26b96ee4eca964af4 100644 (file)
--- a/binutils/syslex.l
+++ b/binutils/syslex.l
@@ -1,4 +1,4 @@
-%option noinput nounput
+%option noinput nounput noyywrap
 
 %{
 /* Copyright (C) 2001-2017 Free Software Foundation, Inc.
@@ -36,10 +36,6 @@
 #define YY_NO_UNPUT
 #endif
 
-#ifndef yywrap
-static int yywrap (void) { return 1; }
-#endif
-
 extern int yylex (void);
 %}
 %%

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4069f545475f37dfbdd7229f4770a56b3f4aef76..8f3cf3eb4fbcca5332433cae3aa9f7c44b9c4439 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-12  Igor Tsimbalist  <igor.v.tsimbalist@intel.com>
 
        * config/tc-i386.c (cpu_arch): Add .avx512_vpopcntdq.

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

diff --git a/ld/ChangeLog b/ld/ChangeLog
index d08b8e09afe09801c6be15e23bf8fe3b8adab5b7..479d6780a3544a67c827af91efec888e5d76771f 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-18  Bernhard Rosenkranzer  <bero@lindev.ch>
+
+       PR 21059
+       * ldlex.l: Support processing with flex 2.6.3.
+
 2017-01-13  H.J. Lu  <hongjiu.lu@intel.com>
 
        Backport from master

diff --git a/ld/ldlex.l b/ld/ldlex.l
index bddaaf812cc95c178d8817ed388255f45e4c1004..fa9b92442617c8eae4eaeb0ab34e570ff9b3c484 100644 (file)
--- a/ld/ldlex.l
+++ b/ld/ldlex.l
@@ -1,4 +1,4 @@
-%option nounput
+%option nounput noyywrap
 
 %{
 
@@ -86,10 +86,6 @@ static void lex_warn_invalid (char *where, char *what);
 */
 #define RTOKEN(x)  {  yylval.token = x; return x; }
 
-/* Some versions of flex want this.  */
-#ifndef yywrap
-int yywrap (void) { return 1; }
-#endif
 %}
 
 %a 4000