diff options
| -rw-r--r-- | ld/ChangeLog | 10 | ||||
| -rw-r--r-- | ld/ldlex.l | 34 |
2 files changed, 23 insertions, 21 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index ba412b8..c8c81cb 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,13 @@ +Fri May 22 13:47:19 1992 Per Bothner (bothner@cygnus.com) + + * config/sparc.mh: Fix HOSTING_LIBS so it has a chance of working. + * ldlex.c: Fix some unnecessary flex-specific-isms. + +Fri May 8 11:49:43 1992 Steve Chamberlain (sac@thepub.cygnus.com) + + * ldgram.y: move spurious semicolon + * ldexp.h: fix prototype + Thu May 7 17:01:12 1992 Roland H. Pesch (pesch@fowanton.cygnus.com) * ld.texinfo: references to linker now say "ld" not "gld". @@ -74,15 +74,15 @@ FILENAMECHAR [_a-zA-Z0-9\/\.\-\_\+\=\$\:\[\]\\] FILENAME {FILENAMECHAR}+ WHITE [ \t\n]+ -%x COMMAND -%x SCRIPT -%x EXPRESSION -%x COMMENT -%x BOTH -%x DEFSYMEXP -%x MRI +%s COMMAND +%s SCRIPT +%s EXPRESSION +%s COMMENT +%s BOTH +%s DEFSYMEXP +%s MRI %% - + <DEFSYMEXP>"-" { RTOKEN('-');} <DEFSYMEXP>"+" { RTOKEN('+');} <DEFSYMEXP>{FILENAMECHAR1}{SYMBOLCHARN}* { yylval.name = buystring(yytext); return NAME; } @@ -172,8 +172,7 @@ WHITE [ \t\n]+ return INT; } -<MRI,EXPRESSION>([0-9A-Fa-f])+(H|X|B|O|D) - { +<MRI,EXPRESSION>([0-9A-Fa-f])+(H|X|B|O|D) { int base ; switch (yytext[yyleng-1]) { case 'X': @@ -289,10 +288,13 @@ WHITE [ \t\n]+ <BOTH,SCRIPT>"l" { RTOKEN( LENGTH);} <BOTH,SCRIPT>"len" { RTOKEN( LENGTH);} <MRI>"\n" { ++ lineno; RTOKEN(NEWLINE); } -<MRI>^"*".* { /* Mri comment line */ } +<MRI>"*".* { /* Mri comment line */ } <MRI>"END" { RTOKEN(ENDWORD); } <MRI>"CHIP" { RTOKEN(CHIP); } +<MRI>"BASE" { RTOKEN(BASE); } +<MRI>"ALIAS" { RTOKEN(ALIAS); } <MRI>"LOAD" { RTOKEN(LOAD); } +<MRI>"PUBLIC" { RTOKEN(PUBLIC); } <MRI>"ORDER" { RTOKEN(ORDER); } <MRI>"NAME" { RTOKEN(NAMEWORD); } <MRI>"FORMAT" { RTOKEN(FORMAT); } @@ -343,8 +345,6 @@ WHITE [ \t\n]+ <COMMENT>"*"+[^*/\\n]* <COMMENT>\\n { ++lineno;} <COMMENT>"*"+"/" { BEGIN(old); } - - <<EOF>> { include_stack_ptr--; @@ -360,13 +360,6 @@ WHITE [ \t\n]+ return END; } - - - - - - - %% void @@ -508,4 +501,3 @@ int max_size; YY_FATAL_ERROR( "read() in flex scanner failed" ); } } - |