X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=binutils%2Fdeflex.l;h=9d7ca1b5043fa28a89a745a8dab92efd2d636ffd;hb=831bd6aa3b2d5e36c94b89756f58bb99f35026ca;hp=a5e344883b9b979dbc6f4f7cc4440e928228ed76;hpb=4b95cf5c0c75d6efc1b2f96af72317aecca079f1;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/deflex.l b/binutils/deflex.l
index a5e344883b..9d7ca1b504 100644
--- a/binutils/deflex.l
+++ b/binutils/deflex.l
@@ -1,19 +1,21 @@
+%option noinput nounput noyywrap
+
 %{/* deflex.l - Lexer for .def files */
 
-/* Copyright (C) 1995-2014 Free Software Foundation, Inc.
-   
+/* Copyright (C) 1995-2019 Free Software Foundation, Inc.
+
    This file is part of GNU Binutils.
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
@@ -27,8 +29,6 @@
 #include "defparse.h"
 #include "dlltool.h"
 
-#define YY_NO_UNPUT
-
 int linenumber;
 
 %}
@@ -60,10 +60,10 @@ int linenumber;
 "TERMINSTANCE"	{ return TERMINSTANCE;}
 "TERMGLOBAL"	{ return TERMGLOBAL;}
 
-[0-9][x0-9A-Fa-f]* { yylval.number = strtol (yytext,0,0); 
+[0-9][x0-9A-Fa-f]* { yylval.number = strtol (yytext,0,0);
 		return NUMBER; }
 
-(@)?[A-Za-z$:\-\_?][A-Za-z0-9/$:\<\>\-\_@?]* { 	
+(@)?[A-Za-z$:\-\_?][A-Za-z0-9/$:\<\>\-\_@?+]* {
 		yylval.id =  xstrdup (yytext);
 		return ID;
 		}
@@ -91,7 +91,3 @@ int linenumber;
 "@"	 	{ return '@';}
 ","		{ return ',';}
 %%
-#ifndef yywrap
-/* Needed for lex, though not flex. */
-int yywrap(void) { return 1; }
-#endif