diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2012-03-05 22:43:39 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2012-03-05 22:43:39 +0000 |
| commit | 9835ffab2f41a3eea894df5d85ec2387426d8081 (patch) | |
| tree | 3278dcc1d4728deb3a9a006fa22f84f5d7269f0f /ld/plugin.c | |
| parent | fb82c2ad06c60b41471b75ba6c7fe37d0707051f (diff) | |
| download | binutils-redhat-9835ffab2f41a3eea894df5d85ec2387426d8081.tar.gz | |
* ldlang.h (struct lang_input_statement_flags): New, extract from..
(lang_input_statement_type): ..here. New field "flags".
(input_flags): Declare.
(missing_file): Delete.
* ldmain.h (whole_archive): Delete.
(add_DT_NEEDED_for_regular, add_DT_NEEDED_for_dynamic): Delete.
* ld.h (ld_config_type <dynamic_link>): Delete.
* ldmain.c (whole_archive): Delete.
(add_DT_NEEDED_for_regular, add_DT_NEEDED_for_dynamic): Delete.
* ldlang.c (missing_file, ldlang_sysrooted_script): Delete.
(input_flags): New variable. Replace all uses of config.dynamic_link,
missing_file, ldlang_sysrooted_script, whole_archive,
add_DT_NEEDED_for_regular and add_DT_NEEDED_for_dynamic with fields
from here.
* ldfile.c: Likewise.
* ldgram.y: Likewise.
* ldmain.c: Likewise.
* ldwrite.c: Likewise.
* lexsup.c: Likewise.
* plugin.c: Likewise.
* emultempl/aix.em: Likewise.
* emultempl/armelf.em: Likewise.
* emultempl/elf32.em: Likewise.
* emultempl/hppaelf.em: Likewise.
* emultempl/linux.em: Likewise.
* emultempl/pe.em: Likewise.
* emultempl/pep.em: Likewise.
* emultempl/ppc64elf.em: Likewise.
* emultempl/scoreelf.em: Likewise.
* emultempl/spuelf.em: Likewise.
* emultempl/sunos.em: Likewise.
* emultempl/vms.em: Likewise.
* ldlang.c (new_afile): Use memset to init zero fields.
(load_symbols): Simplify save and restore of flags around command
file processing.
* ldfile.c (is_sysrooted_pathname): Tidy.
Diffstat (limited to 'ld/plugin.c')
| -rw-r--r-- | ld/plugin.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ld/plugin.c b/ld/plugin.c index 91fe48b9f2..2515888878 100644 --- a/ld/plugin.c +++ b/ld/plugin.c @@ -1,5 +1,5 @@ /* Plugin control for the GNU linker. - Copyright 2010, 2011 Free Software Foundation, Inc. + Copyright 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU Binutils. @@ -262,7 +262,7 @@ is_ir_dummy_bfd (const bfd *abfd) when processing DT_NEEDED dependencies. */ return (abfd && abfd->usrdata - && ((lang_input_statement_type *)(abfd->usrdata))->claimed); + && ((lang_input_statement_type *)(abfd->usrdata))->flags.claimed); } /* Helpers to convert between BFD and GOLD symbol formats. */ @@ -873,7 +873,7 @@ plugin_maybe_claim (struct ld_plugin_input_file *file, if (entry->the_bfd->my_archive == NULL) bfd_close (entry->the_bfd); entry->the_bfd = file->handle; - entry->claimed = TRUE; + entry->flags.claimed = TRUE; bfd_make_readable (entry->the_bfd); } else @@ -881,7 +881,7 @@ plugin_maybe_claim (struct ld_plugin_input_file *file, /* If plugin didn't claim the file, we don't need the dummy bfd. Can't avoid speculatively creating it, alas. */ bfd_close_all_done (file->handle); - entry->claimed = FALSE; + entry->flags.claimed = FALSE; } } |