65 lines
2.4 KiB
Diff
65 lines
2.4 KiB
Diff
diff -rup binutils.orig/bfd/elf32-i386.c binutils-2.30/bfd/elf32-i386.c
|
|
--- binutils.orig/bfd/elf32-i386.c 2018-03-07 14:17:57.645689834 +0000
|
|
+++ binutils-2.30/bfd/elf32-i386.c 2018-03-07 14:22:39.987385632 +0000
|
|
@@ -2202,12 +2202,19 @@ elf_i386_relocate_section (bfd *output_b
|
|
|
|
if ((input_section->flags & SEC_ALLOC) == 0)
|
|
{
|
|
+ /* If this is a SHT_NOTE section without SHF_ALLOC, treat
|
|
+ STT_GNU_IFUNC symbol as STT_FUNC. */
|
|
+ if (elf_section_type (input_section) == SHT_NOTE)
|
|
+ goto skip_ifunc;
|
|
/* 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)
|
|
continue;
|
|
- abort ();
|
|
+ _bfd_error_handler (_("%B: error: relocation againt ifunc symbol in non-alloc section %A"),
|
|
+ input_bfd, input_section);
|
|
+ bfd_set_error (bfd_error_invalid_operation);
|
|
+ return FALSE;
|
|
}
|
|
|
|
/* STT_GNU_IFUNC symbol must go through PLT. */
|
|
@@ -2421,6 +2428,7 @@ do_ifunc_pointer:
|
|
}
|
|
}
|
|
|
|
+ skip_ifunc:
|
|
resolved_to_zero = (eh != NULL
|
|
&& UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh));
|
|
|
|
diff -rup binutils.orig/bfd/elf64-x86-64.c binutils-2.30/bfd/elf64-x86-64.c
|
|
--- binutils.orig/bfd/elf64-x86-64.c 2018-03-07 14:17:57.691689296 +0000
|
|
+++ binutils-2.30/bfd/elf64-x86-64.c 2018-03-07 14:22:33.907456784 +0000
|
|
@@ -2499,12 +2499,19 @@ elf_x86_64_relocate_section (bfd *output
|
|
|
|
if ((input_section->flags & SEC_ALLOC) == 0)
|
|
{
|
|
+ /* If this is a SHT_NOTE section without SHF_ALLOC, treat
|
|
+ STT_GNU_IFUNC symbol as STT_FUNC. */
|
|
+ if (elf_section_type (input_section) == SHT_NOTE)
|
|
+ goto skip_ifunc;
|
|
/* 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)
|
|
continue;
|
|
- abort ();
|
|
+ _bfd_error_handler (_("%B: error: relocation againt ifunc symbol in non-alloc section %A"),
|
|
+ input_bfd, input_section);
|
|
+ bfd_set_error (bfd_error_invalid_operation);
|
|
+ return FALSE;
|
|
}
|
|
|
|
switch (r_type)
|
|
@@ -2722,6 +2729,7 @@ do_ifunc_pointer:
|
|
}
|
|
}
|
|
|
|
+ skip_ifunc:
|
|
resolved_to_zero = (eh != NULL
|
|
&& UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh));
|
|
|