* ld.h (parsing_defsym): Declare.

	* ldlex.h (lex_string): Declare.
	* ldlex.l (lex_string): Define.
	* lexsup.c (parsing_defsym): Define.
	(parse_args): In OPTION_DEFSYM case, set lex_string before calling
	lex_redirect, and clear it after calling yyparse.  Set
	parsing_defsym around call to yyparse.
	* ldmain.c (main): Set lex_string before calling lex_redirect, and
	clear it after calling yyparse.
	* ldmisc.c (vfinfo): For %S, handle --defsym arguments and built
	in linker scripts correctly.
PR 8092.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0601513c485f7c685f5e680a668b8366cbca8439..9155593ee2beebc5959a85bb8c460623f15befdf 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,17 @@
 Thu Sep 28 12:34:13 1995  Ian Lance Taylor  <ian@cygnus.com>
 
+       * ld.h (parsing_defsym): Declare.
+       * ldlex.h (lex_string): Declare.
+       * ldlex.l (lex_string): Define.
+       * lexsup.c (parsing_defsym): Define.
+       (parse_args): In OPTION_DEFSYM case, set lex_string before calling
+       lex_redirect, and clear it after calling yyparse.  Set
+       parsing_defsym around call to yyparse.
+       * ldmain.c (main): Set lex_string before calling lex_redirect, and
+       clear it after calling yyparse.
+       * ldmisc.c (vfinfo): For %S, handle --defsym arguments and built
+       in linker scripts correctly.
+
        * scripttempl/sparccoff.sc: Add .ctors/.dtors handling like other
        COFF targets, allowing for the leading underscore used on SPARC
        COFF.

diff --git a/ld/lexsup.c b/ld/lexsup.c
index a0a5ad00a2c37da1d4c3333257b4b3f3213f7f24..96babdd30e2a7f3dc3900b2e4282c455b1bc59bc 100644 (file)
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -47,6 +47,8 @@ unsigned long strtoul ();
 static void set_default_dirlist PARAMS ((char *dirlist_ptr));
 static void set_section_start PARAMS ((char *sect, char *valstr));
 
+/* Non-zero if we are processing a --defsym from the command line.  */
+int parsing_defsym = 0;
 
 void
 parse_args (argc, argv)
@@ -260,9 +262,13 @@ parse_args (argc, argv)
          command_line.force_common_definition = true;
          break;
        case OPTION_DEFSYM:
+         lex_string = optarg;
          lex_redirect (optarg);
          parser_input = input_defsym;
+         parsing_defsym = 1;
          yyparse ();
+         parsing_defsym = 0;
+         lex_string = NULL;
          break;
        case OPTION_DYNAMIC_LINKER:
          command_line.interpreter = optarg;