MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Skip IFUNC relocations in debug sections

Browse Source 
Skip IFUNC relocations in debug sections ignored by ld.so.

bfd/

	PR ld/18808
	* elf32-i386.c (elf_i386_relocate_section): Skip IFUNC
	relocations in debug sections.
	* elf64-x86-64.c (elf_x86_64_relocate_section): Likewise.

ld/testsuite/

	PR ld/18808
	* ld-ifunc/ifunc.exp: Add a test for PR ld/18808.
	* ld-ifunc/pr18808.out: New file.
	* ld-ifunc/pr18808a.c: Likewise.
	* ld-ifunc/pr18808b.c: Likewise.
This commit is contained in:
H.J. Lu 2015-08-11 12:58:52 -07:00
parent 922c5db5e7
commit 97dc35c88d
9 changed files with 141 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bfd/ChangeLog
View File

@ -1,3 +1,10 @@
2015-08-11 H.J. Lu <hongjiu.lu@intel.com>
PR ld/18808
* elf32-i386.c (elf_i386_relocate_section): Skip IFUNC
relocations in debug sections.
* elf64-x86-64.c (elf_x86_64_relocate_section): Likewise.
2015-08-11 Peter Zotov <whitequark@whitequark.org>
PR ld/18759

12
bfd/elf32-i386.c
View File

@ -3503,8 +3503,16 @@ elf_i386_relocate_section (bfd *output_bfd,
bfd_vma plt_index;
const char *name;
if ((input_section->flags & SEC_ALLOC) == 0
|| h->plt.offset == (bfd_vma) -1)
if ((input_section->flags & SEC_ALLOC) == 0)
{
/* Dynamic relocs are not propagated for SEC_DEBUGGING
sections because such sections are not SEC_ALLOC and
thus ld.so will not process them. */
if ((input_section->flags & SEC_DEBUGGING) != 0)
break;
abort ();
}
else if (h->plt.offset == (bfd_vma) -1)
abort ();
/* STT_GNU_IFUNC symbol must go through PLT. */

12
bfd/elf64-x86-64.c
View File

@ -3786,8 +3786,16 @@ elf_x86_64_relocate_section (bfd *output_bfd,
bfd_vma plt_index;
const char *name;
if ((input_section->flags & SEC_ALLOC) == 0
|| h->plt.offset == (bfd_vma) -1)
if ((input_section->flags & SEC_ALLOC) == 0)
{
/* Dynamic relocs are not propagated for SEC_DEBUGGING
sections because such sections are not SEC_ALLOC and
thus ld.so will not process them. */
if ((input_section->flags & SEC_DEBUGGING) != 0)
break;
abort ();
}
else if (h->plt.offset == (bfd_vma) -1)
abort ();
/* STT_GNU_IFUNC symbol must go through PLT. */

8
ld/testsuite/ChangeLog
View File

@ -1,3 +1,11 @@
2015-08-11 H.J. Lu <hongjiu.lu@intel.com>
PR ld/18808
* ld-ifunc/ifunc.exp: Add a test for PR ld/18808.
* ld-ifunc/pr18808.out: New file.
* ld-ifunc/pr18808a.c: Likewise.
* ld-ifunc/pr18808b.c: Likewise.
---
2015-08-07 H.J. Lu <hongjiu.lu@intel.com>
PR ld/18720

27
ld/testsuite/ld-ifunc/ifunc.exp
View File

@ -457,3 +457,30 @@ run_ld_link_exec_tests [] [list \
"-fpic" \
] \
]
# Run-time tests which require working ifunc attribute support.
if { ![check_ifunc_attribute_available] } {
return
}
run_cc_link_tests [list \
[list \
"Build libpr18808.so" \
"-shared" \
"-fPIC -O2 -g" \
{ pr18808b.c } \
{} \
"libpr18808.so" \
] \
]
run_ld_link_exec_tests [] [list \
[list \
"Run pr18808" \
"tmpdir/libpr18808.so" \
"" \
{ pr18808a.c } \
"pr18808" \
"pr18808.out" \
] \
]

1
ld/testsuite/ld-ifunc/pr18808.out Normal file
View File

@ -0,0 +1 @@
OK

9
ld/testsuite/ld-ifunc/pr18808a.c Normal file
View File

@ -0,0 +1,9 @@
#include <stdio.h>
void bar(void);
int main(void)
{
bar();
printf("OK\n");
return 0;
}

24
ld/testsuite/ld-ifunc/pr18808b.c Normal file
View File

@ -0,0 +1,24 @@
int foo (int x) __attribute__ ((ifunc ("resolve_foo")));
extern void abort (void);
static int foo_impl(int x)
{
return x;
}
int bar()
{
int (*f)(int) = foo;
if (foo (5) != 5)
abort ();
if (f(42) != 42)
abort ();
}
void *resolve_foo (void)
{
return (void *) foo_impl;
}

45
ld/testsuite/lib/ld-lib.exp
View File

@ -1960,6 +1960,51 @@ proc check_ifunc_available { } {
return $ifunc_available_saved
}
# Returns true if ifunc attribute works.
proc check_ifunc_attribute_available { } {
global ifunc_attribute_available_saved
global CC
if {![info exists ifunc_attribute_available_saved]} {
if { [which $CC] == 0 } {
set ifunc_attribute_available_saved 0
return 0
}
# Check if gcc supports -flto -fuse-linker-plugin
set flags ""
if [board_info [target_info name] exists cflags] {
append flags " [board_info [target_info name] cflags]"
}
if [board_info [target_info name] exists ldflags] {
append flags " [board_info [target_info name] ldflags]"
}
set basename "tmpdir/ifunc[pid]"
set src ${basename}.c
set output ${basename}.out
set f [open $src "w"]
puts $f "extern int library_func2 (void) __attribute__ ((ifunc (\"foo\")));"
puts $f "int main (void)"
puts $f "{"
puts $f " if (library_func2 () != 2) __builtin_abort ();"
puts $f " return 0; "
puts $f "}"
puts $f "static int library_func1 (void) {return 2; }"
puts $f "void *foo (void) { return library_func1; }"
close $f
remote_download host $src
set ifunc_attribute_available_saved [run_host_cmd_yesno "$CC" "$flags $src -o $output"]
if { $ifunc_attribute_available_saved == 1 } {
set ifunc_attribute_available_saved [run_host_cmd_yesno "$output" ""]
}
remote_file host delete $src
remote_file host delete $output
file delete $src
}
return $ifunc_attribute_available_saved
}
# Provide virtual target "cfi" for targets supporting CFI.
rename "istarget" "istarget_ld"