diff options
| author | Alan Modra <amodra@gmail.com> | 2012-02-17 14:09:57 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2012-02-17 14:09:57 +0000 |
| commit | dab69f680baf93b577f85c1a9344d7ea7996f466 (patch) | |
| tree | d39b8e854f707ee6bd0dba8e73c3a8d79cd1ae22 /ld/ldlex.h | |
| parent | 9e507076870544c11dc3711e836d6803f30e7658 (diff) | |
| download | binutils-gdb-dab69f680baf93b577f85c1a9344d7ea7996f466.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/ldlex.h')
| -rw-r--r-- | ld/ldlex.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ld/ldlex.h b/ld/ldlex.h index 9663ce0d294..1a2aa122446 100644 --- a/ld/ldlex.h +++ b/ld/ldlex.h @@ -1,6 +1,6 @@ /* ldlex.h - - Copyright 1991, 1992, 1993, 1994, 1995, 1997, 2000, 2003, 2005, 2006, 2007 - Free Software Foundation, Inc. + Copyright 1991, 1992, 1993, 1994, 1995, 1997, 2000, 2003, 2005, 2006, + 2007, 2012 Free Software Foundation, Inc. This file is part of the GNU Binutils. @@ -42,7 +42,7 @@ extern const char *lex_string; /* In ldlex.l. */ extern int yylex (void); extern void lex_push_file (FILE *, const char *); -extern void lex_redirect (const char *); +extern void lex_redirect (const char *, const char *, unsigned int); extern void ldlex_script (void); extern void ldlex_mri_script (void); extern void ldlex_version_script (void); @@ -52,6 +52,7 @@ extern void ldlex_expression (void); extern void ldlex_both (void); extern void ldlex_command (void); extern void ldlex_popstate (void); +extern const char* ldlex_filename (void); /* In lexsup.c. */ extern int lex_input (void); |