-y support

[platform/upstream/binutils.git] / ld / ldlex.l

diff --git a/ld/ldlex.l b/ld/ldlex.l
index 2c21a58..3a4158d 100644 (file)
--- a/ld/ldlex.l
+++ b/ld/ldlex.l
@@ -43,6 +43,8 @@ char *buystring();
 unsigned int lineno = 1;
 int old;
 
+static comment();
+
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max_size) yy_input(buf, &result, max_size)
 #undef YY_FATAL_ERROR
@@ -66,14 +68,17 @@ unsigned int include_stack_ptr = 0;
 %a 4000
 %o 5000
 
-CMDFILENAMECHAR   [_a-zA-Z0-9\/\.\\_\+\$\:\[\]\\\,\=\&\!\<\>\-]
-CMDFILENAMECHAR1  [_a-zA-Z0-9\/\.\\_\+\$\:\[\]\\\,\=\&\!\<\>]
-FILENAMECHAR1  [_a-zA-Z\/\.\\]
+CMDFILENAMECHAR   [_a-zA-Z0-9\/\.\\_\+\$\:\[\]\\\,\=\&\!\<\>\-\~]
+CMDFILENAMECHAR1  [_a-zA-Z0-9\/\.\\_\+\$\:\[\]\\\,\=\&\!\<\>\~]
+FILENAMECHAR1  [_a-zA-Z\/\.\\\$\_\~]
 SYMBOLCHARN     [_a-zA-Z\/\.\\0-9]
-FILENAMECHAR   [_a-zA-Z0-9\/\.\-\_\+\=\$\:\[\]\\]
+FILENAMECHAR   [_a-zA-Z0-9\/\.\-\_\+\=\$\:\[\]\\\,\~]
 FILENAME       {FILENAMECHAR}+
 WHITE          [ \t\n]+ 
 
+NOCFILENAMECHAR        [_a-zA-Z0-9\/\.\-\_\+\$\:\[\]\\\~]
+
+
 %s COMMAND
 %s SCRIPT
 %s EXPRESSION
@@ -83,6 +88,10 @@ WHITE                [ \t\n]+
 %s MRI
 %%
 
+
+<BOTH,SCRIPT,EXPRESSION,COMMAND>"/*"   { comment(); }
+
+
 <DEFSYMEXP>"-"                  { RTOKEN('-');}
 <DEFSYMEXP>"+"                  { RTOKEN('+');}
 <DEFSYMEXP>{FILENAMECHAR1}{SYMBOLCHARN}*   { yylval.name = buystring(yytext); return NAME; }
@@ -162,13 +171,20 @@ WHITE             [ \t\n]+
                                 return OPTION_F;
                               }
 
+<COMMAND>"-y"{FILENAME}         {
+                                       yylval.name = buystring(yytext+2);
+                                       return OPTION_y;
+                               }
+                               
 <COMMAND>"-A"{FILENAME}        {
                                        yylval.name = buystring(yytext+2);
                                        return OPTION_Aarch;
                                }
 
+<COMMAND>"-retain-symbols-file"        { return OPTION_RETAIN_SYMBOLS_FILE; }
+
 <MRI,EXPRESSION>"$"([0-9A-Fa-f])+ {
-                               yylval.integer = strtoul(yytext+1, 0,16);       
+                               yylval.integer = strtoul(yytext+1, 0,16);
                                return INT;
                        }
 
@@ -290,9 +306,13 @@ WHITE              [ \t\n]+
 <MRI>"\n"                      { ++ lineno;  RTOKEN(NEWLINE); }
 <MRI>"*".*                     { /* Mri comment line */ }
 <MRI>"END"                      { RTOKEN(ENDWORD); }
+<MRI>"ALIGNMOD"                { RTOKEN(ALIGNMOD);}
+<MRI>"ALIGN"           { RTOKEN(ALIGN_K);}
+
 <MRI>"CHIP"                     { RTOKEN(CHIP); }
 <MRI>"BASE"                     { RTOKEN(BASE); }
 <MRI>"ALIAS"                     { RTOKEN(ALIAS); }
+<MRI>"TRUNCATE"                     { RTOKEN(TRUNCATE); }
 <MRI>"LOAD"                     { RTOKEN(LOAD); }
 <MRI>"PUBLIC"                   { RTOKEN(PUBLIC); }
 <MRI>"ORDER"                    { RTOKEN(ORDER); }
@@ -300,7 +320,7 @@ WHITE               [ \t\n]+
 <MRI>"FORMAT"                   { RTOKEN(FORMAT); }
 <MRI>"LIST".*                   { RTOKEN(LIST); /* LIST and ignore to end of line */ }
 <MRI>"SECT"                    { RTOKEN(SECT); }
-<MRI>"ABSOLUTE"                        { RTOKEN(ABSOLUTE); }
+<EXPRESSION,BOTH,SCRIPT,MRI>"ABSOLUTE"                 { RTOKEN(ABSOLUTE); }
 <MRI>"end"                      { RTOKEN(ENDWORD); }
 <MRI>"chip"                     { RTOKEN(CHIP); }
 <MRI>"load"                     { RTOKEN(LOAD); }
@@ -309,7 +329,7 @@ WHITE               [ \t\n]+
 <MRI>"format"                   { RTOKEN(FORMAT); }
 <MRI>"list".*                   { RTOKEN(LIST); /* LIST and ignore to end of line */ }
 <MRI>"sect"                    { RTOKEN(SECT); }
-<MRI>"absolute"                        { RTOKEN(ABSOLUTE); }
+<EXPRESSION,BOTH,SCRIPT,MRI>"absolute"                 { RTOKEN(ABSOLUTE); }
 
 <COMMAND>{CMDFILENAMECHAR1}{CMDFILENAMECHAR}*  {
                                 yylval.name = buystring(yytext); 
@@ -317,7 +337,14 @@ WHITE              [ \t\n]+
                                }
 
 
-<MRI,BOTH,EXPRESSION>{FILENAMECHAR1}{FILENAMECHAR}*    {
+<MRI>{FILENAMECHAR1}{NOCFILENAMECHAR}* {
+/* Filename without commas, needed to parse mri stuff */
+                                yylval.name = buystring(yytext); 
+                                 return NAME;
+                               }
+
+
+<BOTH,EXPRESSION>{FILENAMECHAR1}{FILENAMECHAR}*        {
                                 yylval.name = buystring(yytext); 
                                  return NAME;
                                }
@@ -335,16 +362,6 @@ WHITE              [ \t\n]+
 <BOTH,SCRIPT,EXPRESSION>"\n"           { lineno++;}
 <MRI,COMMAND,BOTH,SCRIPT,EXPRESSION>[ \t]
 
-"/*"                           { old = INITIAL; BEGIN(COMMENT); }
-<COMMAND>"/*"                  { old = COMMAND; BEGIN(COMMENT); }
-<BOTH>"/*"                     { old =BOTH; BEGIN(COMMENT); }
-<SCRIPT>"/*"                   { old = EXPRESSION; BEGIN(COMMENT); }
-<EXPRESSION>"/*"               { old = SCRIPT; BEGIN(COMMENT); }
-"/*"                           { old = INITIAL; BEGIN(COMMENT); }
-<COMMENT>[^*\\n]*
-<COMMENT>"*"+[^*/\\n]*
-<COMMENT>\\n                   { ++lineno;}
-<COMMENT>"*"+"/"               { BEGIN(old); }
 <<EOF>> {
     include_stack_ptr--;
     
@@ -501,3 +518,34 @@ int max_size;
       YY_FATAL_ERROR( "read() in flex scanner failed" );
   }
 }
+
+static
+comment()
+{
+  int c;
+  while (1)
+  {
+    c = input();
+    while (c !='*' && c != EOF) 
+    {
+      if (c == '\n') lineno++;
+      c = input();
+    }
+
+
+    if (c == '*')
+    {
+      c = input();
+      while ( c == '*')
+       c = input();
+      if ( c == '/' )
+       break;                  /* found the end */
+    }
+
+    if ( c == EOF )
+    {
+      einfo( "%F%P :EOF in comment");
+      break;
+    }
+  }
+}