aboutsummaryrefslogtreecommitdiff
path: root/ld/lexsup.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2012-02-17 14:09:57 +0000
committerAlan Modra <amodra@gmail.com>2012-02-17 14:09:57 +0000
commitdab69f680baf93b577f85c1a9344d7ea7996f466 (patch)
treed39b8e854f707ee6bd0dba8e73c3a8d79cd1ae22 /ld/lexsup.c
parent9e507076870544c11dc3711e836d6803f30e7658 (diff)
downloadgdb-dab69f680baf93b577f85c1a9344d7ea7996f466.zip
gdb-dab69f680baf93b577f85c1a9344d7ea7996f466.tar.gz
gdb-dab69f680baf93b577f85c1a9344d7ea7996f466.tar.bz2
PR ld/13343
* ld.h (parsing_defsym): Delete. * ldexp.c (exp_intop, exp_bigintop, exp_relop): Set type.filename. (fold_binary, fold_name, exp_fold_tree_1, exp_get_vma, exp_get_fill, exp_get_abs_int): Add tree arg for %S in error messages. Don't fudge lineno. (exp_binop, exp_unop, exp_nameop, exp_assop, exp_assert): Copy type.filename from sub-tree. (exp_trinop): Likewise, and use "cond" rather than "lhs". * ldexp.h (node_type): Add filename field to struct. * ldfile.c (ldfile_input_filename): Delete. Remove all refs. * ldfile.h (ldfile_input_filename): Delete. * ldgram.y (phdr_type, phdr_qualifiers, yyerror): Add NULL arg for %S in error messages. * ldemul.c (syslib_default, hll_default): Likewise. * ldlang.c (lang_memory_region_lookup, lang_memory_region_alias, lang_get_regions, lang_new_phdr): Likewise. (lang_size_sections_1): Pass addr_tree for %S. * ldlex.h (lex_redirect): Update prototype. (ldlex_filename): Declare. * ldlex.l (<EOF>): Don't set ldfile_input_filename. (lex_redirect): Add fake_filename and count params. Push fake_filename to file_name_stack and init lineno from count. (ldlex_filename): New function. (lex_warn_invalid): Use above. * ldmain.c (main): Update lex_redirect call. * ldmisc.c (vfinfo <%S>): Take file name and line number from etree_type arg, or use current if arg is NULL. * lexsup.c (parsing_defsym): Delete. (parse_args <OPTION_DEFSYM>): Update lex_redirect call.
Diffstat (limited to 'ld/lexsup.c')
-rw-r--r--ld/lexsup.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/ld/lexsup.c b/ld/lexsup.c
index 20e0271..7c1bc46 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -1,6 +1,6 @@
/* Parse options for the GNU linker.
Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012
Free Software Foundation, Inc.
This file is part of the GNU Binutils.
@@ -62,9 +62,6 @@ static void set_section_start (char *, char *);
static void set_segment_start (const char *, char *);
static void help (void);
-/* Non-zero if we are processing a --defsym from the command line. */
-int parsing_defsym = 0;
-
/* Codes used for the long options with no short synonyms. 150 isn't
special; it's just an arbitrary non-ASCII char value. */
enum option_values
@@ -729,6 +726,7 @@ parse_args (unsigned argc, char **argv)
{
int longind;
int optc;
+ static unsigned int defsym_count;
/* Using last_optind lets us avoid calling ldemul_parse_args
multiple times on a single option, which would lead to
@@ -823,11 +821,9 @@ parse_args (unsigned argc, char **argv)
break;
case OPTION_DEFSYM:
lex_string = optarg;
- lex_redirect (optarg);
+ lex_redirect (optarg, "--defsym", ++defsym_count);
parser_input = input_defsym;
- parsing_defsym = 1;
yyparse ();
- parsing_defsym = 0;
lex_string = NULL;
break;
case OPTION_DEMANGLE: