Set the machine number as well as the architecture when converting from a

[deliverable/binutils-gdb.git] / binutils / deflex.l

diff --git a/binutils/deflex.l b/binutils/deflex.l
index e7fa3626394fb5a29988518474f170e7e9fcd51b..106cc7bf155ff4a73e17ad6a4e6d50ec8a5b90fc 100644 (file)
--- a/binutils/deflex.l
+++ b/binutils/deflex.l
@@ -1,6 +1,6 @@
 %{/* deflex.l - Lexer for .def files */
 
-/*   Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
+/*   Copyright 1995, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Binutils.
 
@@ -50,11 +50,18 @@ int linenumber;
 "WRITE"                { return WRITE;}
 "EXECUTE"      { return EXECUTE;}
 "SHARED"       { return SHARED;}
+"NONSHARED"    { return NONSHARED;}
+"SINGLE"       { return SINGLE;}
+"MULTIPLE"     { return MULTIPLE;}
+"INITINSTANCE" { return INITINSTANCE;}
+"INITGLOBAL"   { return INITGLOBAL;}
+"TERMINSTANCE" { return TERMINSTANCE;}
+"TERMGLOBAL"   { return TERMGLOBAL;}
 
 [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;
                }
@@ -82,5 +89,5 @@ int linenumber;
 %%
 #ifndef yywrap
 /* Needed for lex, though not flex. */
-int yywrap() { return 1; }
+int yywrap(void) { return 1; }
 #endif