diff options
| author | Bernhard Rosenkranzer <bero@lindev.ch> | 2017-01-18 13:38:27 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2017-01-18 13:38:27 +0000 |
| commit | 2cedb9ebf8254a23d1fbd4f76a85e5f08dc3aaf5 (patch) | |
| tree | 63cf2c4fc3f2470bedfcb9b671b497f45a8e7416 | |
| parent | 1ec4b9f28bab4400c882a0f3e966eb12b73cee1a (diff) | |
| download | binutils-gdb-2cedb9ebf8254a23d1fbd4f76a85e5f08dc3aaf5.tar.gz | |
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.
| -rw-r--r-- | binutils/ChangeLog | 6 | ||||
| -rw-r--r-- | binutils/arlex.l | 6 | ||||
| -rw-r--r-- | binutils/deflex.l | 6 | ||||
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/config/bfin-lex.l | 11 | ||||
| -rw-r--r-- | gas/itbl-lex.l | 10 |
6 files changed, 18 insertions, 27 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 4c89edcae43..5fdec0f9992 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 b5b12d1d881..43350df292d 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 b85c21719f4..8c55629d548 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 b189e36e59c..9569b4b9fa4 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 03a4ce875b7..f270a4b75cf 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 d9e243c8ab0..4a7c51214c4 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 |