diff options
-rw-r--r-- | bfd/elf32-i386.c | 8 | ||||
-rw-r--r-- | bfd/elf64-x86-64.c | 8 | ||||
-rw-r--r-- | ld/testsuite/ld-ifunc/ifunc.exp | 9 | ||||
-rw-r--r-- | ld/testsuite/ld-ifunc/pr29216.c | 62 |
4 files changed, 85 insertions, 2 deletions
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index b034154fb9..3bc710096a 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -1778,7 +1778,13 @@ elf_i386_scan_relocs (bfd *abfd, if (r_type == R_386_32 && (sec->flags & SEC_READONLY) == 0) func_pointer_ref = true; - else + + /* IFUNC symbol needs pointer equality in PDE so that + function pointer reference will be resolved to its + PLT entry directly. */ + if (!func_pointer_ref + || (bfd_link_pde (info) + && h->type == STT_GNU_IFUNC)) h->pointer_equality_needed = 1; } diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 7cf7959cdb..16229b39dc 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -2221,7 +2221,13 @@ elf_x86_64_scan_relocs (bfd *abfd, struct bfd_link_info *info, && (r_type == R_X86_64_32 || r_type == R_X86_64_32S)))) func_pointer_ref = true; - else + + /* IFUNC symbol needs pointer equality in PDE so that + function pointer reference will be resolved to its + PLT entry directly. */ + if (!func_pointer_ref + || (bfd_link_pde (info) + && h->type == STT_GNU_IFUNC)) h->pointer_equality_needed = 1; } diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp index 1cd8d388b2..fdb65d01f9 100644 --- a/ld/testsuite/ld-ifunc/ifunc.exp +++ b/ld/testsuite/ld-ifunc/ifunc.exp @@ -714,6 +714,15 @@ run_ld_link_exec_tests [list \ "pr18841cn" \ "pr18841.out" \ ] \ + [list \ + "Run pr29216" \ + "$NOPIE_LDFLAGS" \ + "" \ + { pr29216.c } \ + "pr29216" \ + "pass.out" \ + "-fPIC" \ + ] \ ] # The pr23169 testcase is not valid. In general, you can't call ifunc diff --git a/ld/testsuite/ld-ifunc/pr29216.c b/ld/testsuite/ld-ifunc/pr29216.c new file mode 100644 index 0000000000..5019c723c2 --- /dev/null +++ b/ld/testsuite/ld-ifunc/pr29216.c @@ -0,0 +1,62 @@ +#include <stdio.h> + +static int +one (void) +{ + return -30; +} + +int foo (void) __attribute__ ((ifunc ("resolve_foo"))); + +void * +resolve_foo (void) +{ + return (void *) one; +} + +typedef int (*foo_p) (void); + +foo_p foo_ptr = foo; + +foo_p +__attribute__ ((noinline)) +get_foo_p (void) +{ + return foo_ptr; +} + +foo_p +__attribute__ ((noinline)) +get_foo (void) +{ + return foo; +} + +int +main (void) +{ + foo_p p; + + p = get_foo (); + if (p != foo) + __builtin_abort (); + if ((*p) () != -30) + __builtin_abort (); + + p = get_foo_p (); + if (p != foo) + __builtin_abort (); + if ((*p) () != -30) + __builtin_abort (); + + if (foo_ptr != foo) + __builtin_abort (); + if ((*foo_ptr) () != -30) + __builtin_abort (); + if (foo () != -30) + __builtin_abort (); + + printf ("PASS\n"); + + return 0; +} |