From 539300fb929ada830ec7c4002fd59f0d86c823b1 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 1 Jul 2019 11:17:01 +0100 Subject: Correct the calculation of offsets for ARM exidx relocs when performing a partial link. PR 23839 bfd * elf32-arm.c (elf32_arm_update_relocs): Do not include the section VMA in the offset used to update exidx relocs. ld * testsuite/ld-arm/unwind-4.d: Adjust for corrected calculation of exidx relocs. --- ld/ChangeLog | 6 ++++++ ld/testsuite/ld-arm/unwind-4.d | 2 ++ 2 files changed, 8 insertions(+) (limited to 'ld') diff --git a/ld/ChangeLog b/ld/ChangeLog index f7d7af68d5c..d23ae59a35d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2019-07-01 Nick Clifton + + PR 23839 + * testsuite/ld-arm/unwind-4.d: Adjust for corrected calculation of + exidx relocs. + 2019-06-28 Alan Modra * testsuite/ld-powerpc/callstub-1.d, diff --git a/ld/testsuite/ld-arm/unwind-4.d b/ld/testsuite/ld-arm/unwind-4.d index 0bed0dc6922..6bd4d91bf4b 100644 --- a/ld/testsuite/ld-arm/unwind-4.d +++ b/ld/testsuite/ld-arm/unwind-4.d @@ -13,6 +13,8 @@ OFFSET TYPE VALUE 0000000c R_ARM_PREL31 \.text 00000010 R_ARM_PREL31 \.text 00000010 R_ARM_NONE __aeabi_unwind_cpp_pr0 +00000010 R_ARM_PREL31 \.text +00000010 R_ARM_NONE __aeabi_unwind_cpp_pr0 00000018 R_ARM_PREL31 \.text -- cgit v1.2.1