diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2012-02-17 14:09:55 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2012-02-17 14:09:55 +0000 |
| commit | 488915c3aae8d8c37e397be0bfe4be8706d09ea5 (patch) | |
| tree | 4993d454da63a9d187ae6a940ac813df643ccb88 /ld/ldfile.c | |
| parent | 29c4be2d9344b923f6df7adc4d63f431e3eed760 (diff) | |
| download | binutils-redhat-488915c3aae8d8c37e397be0bfe4be8706d09ea5.tar.gz | |
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/ldfile.c')
| -rw-r--r-- | ld/ldfile.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ld/ldfile.c b/ld/ldfile.c index c4b89120ee..e9cb173672 100644 --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -1,6 +1,6 @@ /* Linker file opening and searching. Copyright 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011 + 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU Binutils. @@ -40,7 +40,6 @@ #include "plugin.h" #endif /* ENABLE_PLUGINS */ -const char * ldfile_input_filename; bfd_boolean ldfile_assumed_script = FALSE; const char * ldfile_output_machine_name = ""; unsigned long ldfile_output_machine; @@ -638,7 +637,6 @@ ldfile_open_command_file_1 (const char *name, bfd_boolean default_only) lex_push_file (ldlex_input_stack, name); - ldfile_input_filename = name; lineno = 1; saved_script_handle = ldlex_input_stack; |