This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Add support for processing lex source files with flex v 2.6.3
- From: Nick Clifton <nickc at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 18 Jan 2017 13:39:14 -0000
- Subject: [binutils-gdb] Add support for processing lex source files with flex v 2.6.3
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=2cedb9ebf8254a23d1fbd4f76a85e5f08dc3aaf5
commit 2cedb9ebf8254a23d1fbd4f76a85e5f08dc3aaf5
Author: Bernhard Rosenkranzer <bero@lindev.ch>
Date: Wed Jan 18 13:38:27 2017 +0000
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:
---
binutils/ChangeLog | 6 ++++++
binutils/arlex.l | 6 +-----
binutils/deflex.l | 6 +-----
gas/ChangeLog | 6 ++++++
gas/config/bfin-lex.l | 11 ++---------
gas/itbl-lex.l | 10 ++--------
6 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 4c89edc..5fdec0f 100644
--- 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 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 b85c217..8c55629 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/gas/ChangeLog b/gas/ChangeLog
index b189e36..9569b4b 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-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 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