OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* elflink.c (_bfd_elf_add_default_symbol): Preserve section

Browse Source 
over _bfd_elf_merge_symbol calls.
This commit is contained in:
Alan Modra 2013-03-26 07:02:52 +00:00
parent 3a81e8251e
commit ffd65175b8
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2013-03-26 Alan Modra <amodra@gmail.com>
* elflink.c (_bfd_elf_add_default_symbol): Preserve section
over _bfd_elf_merge_symbol calls.
2013-03-26 Alan Modra <amodra@gmail.com>
* elflink.c (elf_link_add_object_symbols): Add assertion for

7
bfd/elflink.c
View File

@ -1600,6 +1600,7 @@ _bfd_elf_add_default_symbol (bfd *abfd,
bfd_boolean override;
char *p;
size_t len, shortlen;
asection *tmp_sec;
/* If this symbol has a version, and it is the default version, we
create an indirect symbol from the default name to the fully
@ -1626,7 +1627,8 @@ _bfd_elf_add_default_symbol (bfd *abfd,
actually going to define an indirect symbol. */
type_change_ok = FALSE;
size_change_ok = FALSE;
if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &sec, &value,
tmp_sec = sec;
if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &tmp_sec, &value,
&hi, poldbfd, NULL, NULL, &skip, &override,
&type_change_ok, &size_change_ok))
return FALSE;
@ -1734,7 +1736,8 @@ nondefault:
/* Once again, merge with any existing symbol. */
type_change_ok = FALSE;
size_change_ok = FALSE;
if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &sec, &value,
tmp_sec = sec;
if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &tmp_sec, &value,
&hi, NULL, NULL, NULL, &skip, &override,
&type_change_ok, &size_change_ok))
return FALSE;