X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Fdeflex.l;h=0419f5f83b9e12ccbc40d7f05c7a4edc27abb006;hb=128e85e3ab36b8e30f6612fb50de3cbb4ede6824;hp=5ff4c797b944dfc118cba5194c06476a9e6938ce;hpb=aef6203bd6d412d65f539a41f1abd07b14d7a05d;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/deflex.l b/binutils/deflex.l
index 5ff4c797b9..0419f5f83b 100644
--- a/binutils/deflex.l
+++ b/binutils/deflex.l
@@ -1,23 +1,25 @@
+%option noinput nounput
+
 %{/* deflex.l - Lexer for .def files */
 
-/*  Copyright 1995, 1997, 1998, 1999, 2002, 2003, 2004, 2005
-    Free Software Foundation, Inc.
+/* Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
-    This file is part of GNU Binutils.
+   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 2 of the License, or
-    (at your option) any later version.
+   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.
+   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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,
+   MA 02110-1301, USA.  */
 
 
 /* Contributed by Steve Chamberlain: sac@cygnus.com  */
@@ -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;
 		}
@@ -83,7 +83,9 @@ int linenumber;
 ";".* 		{ }
 " "		{ }
 "\t"		{ }
+"\r"		{ }
 "\n"	 	{ linenumber ++ ;}
+"=="		{ return EQUAL;}
 "=" 		{ return '=';}
 "." 		{ return '.';}
 "@"	 	{ return '@';}