espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-19 17:18:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re: PR27311, ld.bfd (symbol from plugin): undefined reference

Browse Source 
This does exactly the same as making decisions based on an override
in _bfd_elf_add_default_symbol, and is simpler.

	PR 27311
	* elflink.c (_bfd_elf_add_default_symbol): Revert last two changes.
	(elf_link_add_object_symbols): Here too.  Don't pull in as-needed
	libraries when H is an indirect symbol after calling
	_bfd_elf_add_default_symbol.
This commit is contained in:
Alan Modra
2021-02-03 15:57:35 +10:30
parent 95b91a043a
commit f01fb44c06
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/ChangeLog
View File

@ -1,3 +1,11 @@
2021-02-03 Alan Modra <amodra@gmail.com>
PR 27311
* elflink.c (_bfd_elf_add_default_symbol): Revert last two changes.
(elf_link_add_object_symbols): Here too. Don't pull in as-needed
libraries when H is an indirect symbol after calling
_bfd_elf_add_default_symbol.
2021-02-03 Alan Modra <amodra@gmail.com> 2021-02-03 Alan Modra <amodra@gmail.com>
PR 27311 PR 27311

24
bfd/elflink.c
View File

@ -1850,8 +1850,7 @@ _bfd_elf_add_default_symbol (bfd *abfd,
asection *sec, asection *sec,
bfd_vma value, bfd_vma value,
bfd **poldbfd, bfd **poldbfd,
bfd_boolean *dynsym, bfd_boolean *dynsym)
bfd **override)
{ {
bfd_boolean type_change_ok; bfd_boolean type_change_ok;
bfd_boolean size_change_ok; bfd_boolean size_change_ok;
@ -1862,7 +1861,7 @@ _bfd_elf_add_default_symbol (bfd *abfd,
const struct elf_backend_data *bed; const struct elf_backend_data *bed;
bfd_boolean collect; bfd_boolean collect;
bfd_boolean dynamic; bfd_boolean dynamic;
bfd *nondef_override; bfd *override;
char *p; char *p;
size_t len, shortlen; size_t len, shortlen;
asection *tmp_sec; asection *tmp_sec;
@ -1922,7 +1921,7 @@ _bfd_elf_add_default_symbol (bfd *abfd,
matched = TRUE; matched = TRUE;
tmp_sec = sec; tmp_sec = sec;
if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &tmp_sec, &value, if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &tmp_sec, &value,
&hi, poldbfd, NULL, NULL, &skip, override, &hi, poldbfd, NULL, NULL, &skip, &override,
&type_change_ok, &size_change_ok, &matched)) &type_change_ok, &size_change_ok, &matched))
return FALSE; return FALSE;
@ -1946,19 +1945,15 @@ _bfd_elf_add_default_symbol (bfd *abfd,
if (hi->verinfo.vertree != NULL && hide) if (hi->verinfo.vertree != NULL && hide)
{ {
(*bed->elf_backend_hide_symbol) (info, hi, TRUE); (*bed->elf_backend_hide_symbol) (info, hi, TRUE);
*override = FALSE;
goto nondefault; goto nondefault;
} }
} }
if (hi->verinfo.vertree != NULL if (hi->verinfo.vertree != NULL
&& strcmp (p + 1 + (p[1] == '@'), hi->verinfo.vertree->name) != 0) && strcmp (p + 1 + (p[1] == '@'), hi->verinfo.vertree->name) != 0)
{ goto nondefault;
*override = FALSE;
goto nondefault;
}
} }
if (!*override) if (! override)
{ {
/* Add the default symbol if not performing a relocatable link. */ /* Add the default symbol if not performing a relocatable link. */
if (! bfd_link_relocatable (info)) if (! bfd_link_relocatable (info))
@ -2085,7 +2080,7 @@ _bfd_elf_add_default_symbol (bfd *abfd,
size_change_ok = FALSE; size_change_ok = FALSE;
tmp_sec = sec; tmp_sec = sec;
if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &tmp_sec, &value, if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &tmp_sec, &value,
&hi, poldbfd, NULL, NULL, &skip, &nondef_override, &hi, poldbfd, NULL, NULL, &skip, &override,
&type_change_ok, &size_change_ok, &matched)) &type_change_ok, &size_change_ok, &matched))
return FALSE; return FALSE;
@ -2109,7 +2104,7 @@ _bfd_elf_add_default_symbol (bfd *abfd,
else else
return TRUE; return TRUE;
} }
else if (nondef_override) else if (override)
{ {
/* Here SHORTNAME is a versioned name, so we don't expect to see /* Here SHORTNAME is a versioned name, so we don't expect to see
the type of override we do in the case above unless it is the type of override we do in the case above unless it is
@ -5094,8 +5089,7 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
&& !(hi != h && !(hi != h
&& hi->versioned == versioned_hidden)) && hi->versioned == versioned_hidden))
if (!_bfd_elf_add_default_symbol (abfd, info, h, name, isym, if (!_bfd_elf_add_default_symbol (abfd, info, h, name, isym,
sec, value, &old_bfd, &dynsym, sec, value, &old_bfd, &dynsym))
&override))
goto error_free_vers; goto error_free_vers;
/* Check the alignment when a common symbol is involved. This /* Check the alignment when a common symbol is involved. This
@ -5278,9 +5272,9 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
} }
if (!add_needed if (!add_needed
&& !override
&& matched && matched
&& definition && definition
&& h->root.type != bfd_link_hash_indirect
&& ((dynsym && ((dynsym
&& h->ref_regular_nonweak) && h->ref_regular_nonweak)
|| (old_bfd != NULL || (old_bfd != NULL