This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb/binutils-2_28-branch] Fix lex source files so that they will be accepted by flex v2.6.3
- From: Nick Clifton <nickc at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 18 Jan 2017 14:16:05 -0000
- Subject: [binutils-gdb/binutils-2_28-branch] Fix lex source files so that they will be accepted by flex v2.6.3
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=edb8325af76b5fc8b9397dad091433c51e77d08e
commit edb8325af76b5fc8b9397dad091433c51e77d08e
Author: Bernhard Rosenkranzer <bero@lindev.ch>
Date: Wed Jan 18 14:14:54 2017 +0000
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:
---
binutils/ChangeLog | 7 +++++++
binutils/arlex.l | 6 +-----
binutils/deflex.l | 6 +-----
binutils/syslex.l | 6 +-----
gas/ChangeLog | 6 ++++++
gas/config/bfin-lex.l | 11 ++---------
gas/itbl-lex.l | 10 ++--------
ld/ChangeLog | 5 +++++
ld/ldlex.l | 6 +-----
9 files changed, 26 insertions(+), 37 deletions(-)
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index d4755bd..3c4c220 100644
--- 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 b5b12d1..43350df 100644
--- 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 de09b61..24e974c 100644
--- 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 86cb17d..7fcc714 100644
--- 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 4069f54..8f3cf3e 100644
--- 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 03a4ce8..f270a4b 100644
--- 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 d9e243c..4a7c512 100644
--- 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 d08b8e0..479d678 100644
--- 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 bddaaf8..fa9b924 100644
--- 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