diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2012-03-08 05:29:31 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2012-03-08 05:29:31 +0000 |
| commit | 0e11a417df9174426299028994306df829a217ae (patch) | |
| tree | b0b9f76ee519cdaeb250c00e0c992da69acc59ba /ld/ldlang.h | |
| parent | 0bd04f7f6bb21ca100662a6a17edaba6ed1222b4 (diff) | |
| download | binutils-redhat-0e11a417df9174426299028994306df829a217ae.tar.gz | |
PR ld/10340
* ldfile.c (is_sysrooted_pathname): Remove notsame param.
(ldfile_add_library_path): Don't set sysrooted flag.
(ldfile_open_file_search): Likewise, and don't copy them.
(try_open): Delete exten and code handling such. Add sysrooted
param and return whether path is in sysroot.
(ldfile_find_command_file): Delete extend param. Add sysrooted
param. Rename local var. Update try_open calls.
(ldfile_open_command_file_1): Pass sysrooted to lex_push_file.
* ldfile.h (search_dirs_type): Remove sysrooted field.
* ldlang.c (new_afile): Always set sysrooted from input_flags.
(load_symbols): Don't set input_flags.sysrooted.
* ldlang.h (struct lang_input_statement_flags): Revise sysrooted
comment.
* ldlex.h (lex_push_file): Update prototype.
* ldlex.l (sysrooted_stack): New array.
(EOF): Pop input_flags.sysrooted.
(lex_push_file): Add sysrooted param. Save and set
input_flags.sysrooted.
Diffstat (limited to 'ld/ldlang.h')
| -rw-r--r-- | ld/ldlang.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ld/ldlang.h b/ld/ldlang.h index 9ed3952c4b..e36a0664c2 100644 --- a/ld/ldlang.h +++ b/ld/ldlang.h @@ -236,10 +236,7 @@ struct lang_input_statement_flags /* 1 means search a set of directories for this file. */ unsigned int search_dirs : 1; - /* 1 means this was found in a search directory marked as sysrooted, - if search_dirs is false, otherwise, that it should be - searched in ld_sysroot before any other location, as long as it - starts with a slash. */ + /* 1 means this was found when processing a script in the sysroot. */ unsigned int sysrooted : 1; /* 1 means this is base file of incremental load. |