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

Don't set link_info.executable for "ld -r" 

This patch changes "ld -r" not to set link_info.executable.  It
removes !info->relocatable check for info->executable and adds it
for !info->executable in elflink.c.

bfd/

	* elflink.c (elf_link_add_object_symbols): Remove
	!info->relocatable check for info->executable.  Add
	!info->relocatable check for !info->executable.
	(elf_link_output_extsym): Remove
	!info->relocatable check for info->executable.

ld/

	* lexsup.c (parse_args): Don't set link_info.executable to
	TRUE for link_info.relocatable.
This commit is contained in:
H.J. Lu 2015-07-29 09:11:15 -07:00
parent 1eef642811
commit e77e648e93
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/ChangeLog
View File

@ -1,3 +1,11 @@
2015-07-29 H.J. Lu <hongjiu.lu@intel.com>
* elflink.c (elf_link_add_object_symbols): Remove
!info->relocatable check for info->executable. Add
!info->relocatable check for !info->executable.
(elf_link_output_extsym): Remove
!info->relocatable check for info->executable.
2015-07-29 Hans-Peter Nilsson <hp@bitrange.com>
* mmo.c (mmo_write_symbols_and_terminator): Skip symbol-type

7
bfd/elflink.c
View File

@ -3488,7 +3488,7 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
FALSE, bed->collect, NULL)))
goto error_return;
if (!info->relocatable && info->executable)
if (info->executable)
{
/* Clobber the section size so that the warning does
not get copied into the output file. */
@ -4257,7 +4257,7 @@ error_free_dyn:
/* If the indirect symbol has been forced local, don't
make the real symbol dynamic. */
if ((h == hi || !hi->forced_local)
&& (! info->executable
&& ((! info->executable && ! info->relocatable)
|| h->def_dynamic
|| h->ref_dynamic))
dynsym = TRUE;
@ -8957,8 +8957,7 @@ elf_link_output_extsym (struct bfd_hash_entry *bh, void *data)
/* We should also warn if a forced local symbol is referenced from
shared libraries. */
if (!flinfo->info->relocatable
&& flinfo->info->executable
if (flinfo->info->executable
&& h->forced_local
&& h->ref_dynamic
&& h->def_regular

5
ld/ChangeLog
View File

@ -1,3 +1,8 @@
2015-07-29 H.J. Lu <hongjiu.lu@intel.com>
* lexsup.c (parse_args): Don't set link_info.executable to
TRUE for link_info.relocatable.
2015-07-27 H.J. Lu <hongjiu.lu@intel.com>
* configure: Regenerated.

2
ld/lexsup.c
View File

@ -1578,7 +1578,7 @@ parse_args (unsigned argc, char **argv)
einfo (_("%P%F: -f may not be used without -shared\n"));
}
if (! link_info.shared || link_info.pie)
if ((! link_info.shared && ! link_info.relocatable) || link_info.pie)
link_info.executable = TRUE;
/* Treat ld -r -s as ld -r -S -x (i.e., strip all local symbols). I