From fdb056307cf24d2535bed7d88e5134001aafec98 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Tue, 30 Apr 2013 13:40:27 +0000 Subject: [PATCH] ld/testsuite/ld-arm: Fix ifunc-17 failure with arm-eabi. ld/testsuite/ChangeLog: 2013-04-30 Will Newton * ld-arm/arm-elf.exp: Use linker script for IFUNC test 17. * ld-arm/ifunc-17.dd: Update offsets for linker script. * ld-arm/ifunc-17.gd: Likewise. * ld-arm/ifunc-17.rd: Likewise. --- ld/testsuite/ChangeLog | 7 +++++++ ld/testsuite/ld-arm/arm-elf.exp | 2 +- ld/testsuite/ld-arm/ifunc-17.dd | 22 +++++++++++----------- ld/testsuite/ld-arm/ifunc-17.gd | 8 ++++---- ld/testsuite/ld-arm/ifunc-17.rd | 6 +++--- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 27dae44d1cb..b777c967fe5 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2013-04-30 Will Newton + + * ld-arm/arm-elf.exp: Use linker script for IFUNC test 17. + * ld-arm/ifunc-17.dd: Update offsets for linker script. + * ld-arm/ifunc-17.gd: Likewise. + * ld-arm/ifunc-17.rd: Likewise. + 2013-04-29 Will Newton * ld-arm/arm-elf.exp: Add IFUNC test 17. diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp index c488e3cba81..a6abe82878a 100644 --- a/ld/testsuite/ld-arm/arm-elf.exp +++ b/ld/testsuite/ld-arm/arm-elf.exp @@ -451,7 +451,7 @@ set armelftests_nonacl { {objdump {-s -j.data -j.got} ifunc-16.gd} {readelf -r ifunc-16.rd}} "ifunc-16"} - {"IFUNC test 17" "" "" "" {ifunc-17.s} + {"IFUNC test 17" "-T ifunc-static.ld" "" "" {ifunc-17.s} {{objdump -d ifunc-17.dd} {objdump {-s -j.data -j.got} ifunc-17.gd} {readelf -r ifunc-17.rd}} diff --git a/ld/testsuite/ld-arm/ifunc-17.dd b/ld/testsuite/ld-arm/ifunc-17.dd index f23a2490c22..ee5cd050aa3 100644 --- a/ld/testsuite/ld-arm/ifunc-17.dd +++ b/ld/testsuite/ld-arm/ifunc-17.dd @@ -4,22 +4,22 @@ Disassembly of section \.iplt: -00008084 <.iplt>: +00009000 <.iplt>: #------------------------------------------------------------------------------ #------ appfunc1's .iplt entry #------------------------------------------------------------------------------ - 8084: e28fc600 add ip, pc, #0, 12 - 8088: e28cca08 add ip, ip, #8, 20 ; 0x8000 - 808c: e5bcf01c ldr pc, \[ip, #28\]! + 9000: e28fc600 add ip, pc, #0, 12 + 9004: e28cca08 add ip, ip, #8, 20 ; 0x8000 + 9008: e5bcf004 ldr pc, \[ip, #4\]! Disassembly of section \.text: -00008090 : - 8090: 46f7 mov pc, lr +0000a000 : + a000: 46f7 mov pc, lr -00008092 : - 8092: 46f7 mov pc, lr +0000a002 : + a002: 46f7 mov pc, lr -00008094 <_start>: - 8094: f7ff eff6 blx 8084 - 8098: 00000010 \.word 0x00000010 +0000a004 <_start>: + a004: f7fe effc blx 9000 + a008: 00000010 \.word 0x00000010 diff --git a/ld/testsuite/ld-arm/ifunc-17.gd b/ld/testsuite/ld-arm/ifunc-17.gd index 4a12eb87f65..dadfc9eeb5e 100644 --- a/ld/testsuite/ld-arm/ifunc-17.gd +++ b/ld/testsuite/ld-arm/ifunc-17.gd @@ -3,8 +3,8 @@ Contents of section \.got: #------------------------------------------------------------------------------ -#------ 000100a8: 0x8091 (appfunc1) -#------ 000100ac: 0x8093 (appfunc2) +#------ 0001100c: 0xa001 (appfunc1) +#------ 00011010: 0xa003 (appfunc2) #------------------------------------------------------------------------------ - 1009c 00000000 00000000 00000000 91800000 .* - 100ac 93800000 .* + 11000 00000000 00000000 00000000 01a00000 .* + 11010 03a00000 .* diff --git a/ld/testsuite/ld-arm/ifunc-17.rd b/ld/testsuite/ld-arm/ifunc-17.rd index a93fd64a9b6..b167f4529d5 100644 --- a/ld/testsuite/ld-arm/ifunc-17.rd +++ b/ld/testsuite/ld-arm/ifunc-17.rd @@ -1,5 +1,5 @@ -Relocation section '\.rel\.dyn' at offset 0x74 contains 2 entries: +Relocation section '\.rel\.dyn' at offset 0x8000 contains 2 entries: Offset Info Type Sym\.Value Sym\. Name -000100a8 ......a0 R_ARM_IRELATIVE -000100ac ......a0 R_ARM_IRELATIVE +0001100c ......a0 R_ARM_IRELATIVE +00011010 ......a0 R_ARM_IRELATIVE -- 2.30.2