FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* ldlang.c (ldlang_add_undef): If the output bfd has been opened,

Browse source 
add the symbol to the linker hash table immediately.
	(lang_place_undefineds): Split symbol creation out..
	(insert_undefined): ..to here.
This commit is contained in:
Alan Modra 2002-03-20 07:49:53 +00:00
parent c429b7ddd8
commit fcf0e35b46
2 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ld/ChangeLog
View file

@ -1,3 +1,10 @@
2002-03-20 Alan Modra <amodra@bigpond.net.au>
* ldlang.c (ldlang_add_undef): If the output bfd has been opened,
add the symbol to the linker hash table immediately.
(lang_place_undefineds): Split symbol creation out..
(insert_undefined): ..to here.
2002-03-18 David O'Brien <obrien@FreeBSD.org> 2002-03-18 David O'Brien <obrien@FreeBSD.org>
* emultempl/elf32.em: Use lbasename vs. basename to fix problem where * emultempl/elf32.em: Use lbasename vs. basename to fix problem where

41
ld/ldlang.c
View file

@ -92,6 +92,7 @@ static bfd *open_output PARAMS ((const char *));
static void ldlang_open_output PARAMS ((lang_statement_union_type *)); static void ldlang_open_output PARAMS ((lang_statement_union_type *));
static void open_input_bfds PARAMS ((lang_statement_union_type *, boolean)); static void open_input_bfds PARAMS ((lang_statement_union_type *, boolean));
static void lang_reasonable_defaults PARAMS ((void)); static void lang_reasonable_defaults PARAMS ((void));
static void insert_undefined PARAMS ((const char *));
static void lang_place_undefineds PARAMS ((void)); static void lang_place_undefineds PARAMS ((void));
static void map_input_to_output_sections static void map_input_to_output_sections
PARAMS ((lang_statement_union_type *, const char *, PARAMS ((lang_statement_union_type *, const char *,
@ -2010,7 +2011,11 @@ lang_reasonable_defaults ()
} }
/* Add the supplied name to the symbol table as an undefined reference. /* Add the supplied name to the symbol table as an undefined reference.
Remove items from the chain as we open input bfds. */ This is a two step process as the symbol table doesn't even exist at
the time the ld command line is processed. First we put the name
on a list, then, once the output file has been opened, transfer the
name to the symbol table. */
typedef struct ldlang_undef_chain_list typedef struct ldlang_undef_chain_list
{ {
struct ldlang_undef_chain_list *next; struct ldlang_undef_chain_list *next;
@ -2031,6 +2036,28 @@ ldlang_add_undef (name)
ldlang_undef_chain_list_head = new; ldlang_undef_chain_list_head = new;
new->name = xstrdup (name); new->name = xstrdup (name);
if (output_bfd != NULL)
insert_undefined (new->name);
}
/* Insert NAME as undefined in the symbol table. */
static void
insert_undefined (name)
const char *name;
{
struct bfd_link_hash_entry *h;
h = bfd_link_hash_lookup (link_info.hash, name, true, false, true);
if (h == (struct bfd_link_hash_entry *) NULL)
einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n"));
if (h->type == bfd_link_hash_new)
{
h->type = bfd_link_hash_undefined;
h->u.undef.abfd = NULL;
bfd_link_add_undef (link_info.hash, h);
}
} }
/* Run through the list of undefineds created above and place them /* Run through the list of undefineds created above and place them
@ -2046,17 +2073,7 @@ lang_place_undefineds ()
ptr != (ldlang_undef_chain_list_type *) NULL; ptr != (ldlang_undef_chain_list_type *) NULL;
ptr = ptr->next) ptr = ptr->next)
{ {
struct bfd_link_hash_entry *h; insert_undefined (ptr->name);
h = bfd_link_hash_lookup (link_info.hash, ptr->name, true, false, true);
if (h == (struct bfd_link_hash_entry *) NULL)
einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n"));
if (h->type == bfd_link_hash_new)
{
h->type = bfd_link_hash_undefined;
h->u.undef.abfd = NULL;
bfd_link_add_undef (link_info.hash, h);
}
} }
} }