summaryrefslogtreecommitdiffstats
path: root/binutils-2.25/ld/testsuite/ld-arm
diff options
context:
space:
mode:
Diffstat (limited to 'binutils-2.25/ld/testsuite/ld-arm')
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/arm-app-abs32.d7
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/arm-app.d9
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/arm-dyn.ld2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/arm-elf.exp415
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/arm-lib-plt32.d9
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/arm-lib.d9
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/arm-lib.ld4
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/arm-no-rel-plt.ld4
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/arm-rel32.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/arm-static-app.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/armthumb-lib.d9
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/attr-merge-arch-2.d5
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/attr-merge-arch-2a.s18
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/attr-merge-arch-2b.s8
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/cortex-a8-far.d1
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d7
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d7
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d7
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d73
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d7
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/data-only-map.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/export-class.exp2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/farcall-cond-thumb-arm.d18
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/farcall-cond-thumb-arm.s27
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-app-v5.d12
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-app.d14
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d18
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-lib.d18
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/fix-arm1176-off.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/fix-arm1176-on.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/gc-hidden-1.d17
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-1.gd8
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-10.dd164
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-10.gd52
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-11.gd8
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-12.gd12
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-13.gd8
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-14.dd4
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-14.gd8
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-14.rd4
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-15.dd4
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-15.gd8
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-16.gd8
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-17.gd4
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-2.gd14
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-3.dd13
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-3.gd12
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-4.dd202
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-4.gd38
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-5.gd6
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-6.gd8
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-7.dd14
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-7.gd12
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-8.dd208
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-8.gd32
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-9.dd9
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-9.gd8
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-gdesc.r6
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-gdesc.s29
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/ifunc-gdesc.ver4
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long-backward.d24
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long.d24
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-short-backward.d13
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-short.d13
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond.s12
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-long.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/long-plt-format.d16
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/long-plt-format.s7
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/mixed-app-v5.d10
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/mixed-app.d10
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/mixed-lib.d9
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/pcrel-shared.rd16
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/pcrel-shared.s25
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/reloc-boundaries.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/script-type.sym1
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/thumb2-bl-undefweak.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/tls-app.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/tls-descrelax-be32.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/tls-descrelax.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/tls-descseq.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/tls-gdesc-got.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/tls-gdesc.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/tls-gdierelax.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/tls-gdierelax2.d10
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/tls-gdlerelax.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/tls-lib-loc.d2
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/tls-lib.d6
-rw-r--r--binutils-2.25/ld/testsuite/ld-arm/tls-thumb1.d2
89 files changed, 1121 insertions, 747 deletions
diff --git a/binutils-2.25/ld/testsuite/ld-arm/arm-app-abs32.d b/binutils-2.25/ld/testsuite/ld-arm/arm-app-abs32.d
index e6c46322..13221f08 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/arm-app-abs32.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/arm-app-abs32.d
@@ -1,17 +1,18 @@
tmpdir/arm-app-abs32: file format elf32-(little|big)arm.*
-architecture: armv4t, flags 0x00000112:
+architecture: arm.*, flags 0x00000112:
EXEC_P, HAS_SYMS, D_PAGED
start address .*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func1@plt-0x14>:
+.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- +.*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x10>
+ +.*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1@plt-0x4>
+.*: e08fe00e add lr, pc, lr
+.*: e5bef008 ldr pc, \[lr, #8\]!
+.*: .* .*
+.* <lib_func1@plt>:
+.*: e28fc6.* add ip, pc, #.*
+.*: e28cca.* add ip, ip, #.* ; .*
+.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/arm-app.d b/binutils-2.25/ld/testsuite/ld-arm/arm-app.d
index 88169af1..98fc8996 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/arm-app.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/arm-app.d
@@ -1,17 +1,18 @@
tmpdir/arm-app: file format elf32-(little|big)arm
-architecture: armv4t, flags 0x00000112:
+architecture: arm.*, flags 0x00000112:
EXEC_P, HAS_SYMS, D_PAGED
start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func1@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x10>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -27,7 +28,7 @@ Disassembly of section .text:
.* <app_func>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff4 bl .* <_start-0xc>
+ .*: ebfffff4 bl .* <lib_func1@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
diff --git a/binutils-2.25/ld/testsuite/ld-arm/arm-dyn.ld b/binutils-2.25/ld/testsuite/ld-arm/arm-dyn.ld
index bef9a182..71cb4c9e 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/arm-dyn.ld
+++ b/binutils-2.25/ld/testsuite/ld-arm/arm-dyn.ld
@@ -149,7 +149,7 @@ SECTIONS
/* Align here to ensure that the .bss section occupies space up to
_end. Align after .bss to ensure correct alignment even if the
.bss section disappears because there are no input sections. */
- . = ALIGN(32 / 8);
+ . = ALIGN(. != 0 ? 32 / 8 : 1);
}
. = ALIGN(32 / 8);
_end = .;
diff --git a/binutils-2.25/ld/testsuite/ld-arm/arm-elf.exp b/binutils-2.25/ld/testsuite/ld-arm/arm-elf.exp
index 4c0f8026..3c8cc689 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/arm-elf.exp
+++ b/binutils-2.25/ld/testsuite/ld-arm/arm-elf.exp
@@ -1,5 +1,5 @@
# Expect script for various ARM ELF tests.
-# Copyright 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is part of the GNU Binutils.
#
@@ -168,9 +168,6 @@ set armelftests_common {
{"callweak" "-static -T arm.ld" "" "" {callweak.s}
{{objdump -dr callweak.d}}
"callweak"}
- {"callweak-2" "-static -T arm.ld" "" "" {callweak-2.s}
- {{objdump -dr callweak-2.d}}
- "callweak-2"}
{"Relocation boundaries" "-defsym x=0 -defsym y=0 -defsym _start=0" "" "" {reloc-boundaries.s}
{{objdump -s reloc-boundaries.d}}
"reloc-boundaries"}
@@ -188,9 +185,6 @@ set armelftests_common {
"" {exec-got-1b.s}
{{readelf --relocs exec-got-1.d}}
"exec-got-1"}
- {"abs call" "-T arm.ld" "" "" {abs-call-1.s}
- {{objdump -d abs-call-1.d}}
- "abs-call-1"}
{"Simple non-PIC shared library (no PLT check)" "-shared" "" "" {arm-lib.s}
{{objdump -Rw arm-lib.r}}
"arm-lib.so"}
@@ -209,6 +203,10 @@ set armelftests_common {
{"EABI ABI flags ld -r" "-r" "" "-mfloat-abi=soft -meabi=5" {eabi-soft-float.s}
{{readelf -h eabi-soft-float-r.d}}
"eabi-soft-float-r.o"}
+ {"PC-relative in -shared" "-shared" ""
+ "" {pcrel-shared.s}
+ {{readelf -dr pcrel-shared.rd}}
+ "pcrel-shared.so"}
}
set armelftests_nonacl {
@@ -230,9 +228,6 @@ set armelftests_nonacl {
{"Thumb and -gc-sections" "-pie -T arm.ld -gc-sections tmpdir/gc-thumb-lib.so" "" "" {gc-thumb.s}
{{readelf --relocs gc-thumb.d}}
"gc-thumb"}
- {"arm-pic-veneer" "-static -T arm.ld --pic-veneer" "" "" {arm-pic-veneer.s}
- {{objdump -d arm-pic-veneer.d}}
- "arm-pic-veneer"}
{"Simple non-PIC shared library" "-shared" "" "" {arm-lib.s}
{{objdump -fdw arm-lib.d} {objdump -Rw arm-lib.r}}
@@ -276,186 +271,12 @@ set armelftests_nonacl {
{"Using Thumb lib by another lib" "-shared tmpdir/mixed-lib.so" "" "" {use-thumb-lib.s}
{{readelf -Ds use-thumb-lib.sym}}
"use-thumb-lib.so"}
- {"Preempt Thumb symbol" "tmpdir/mixed-lib.so -T arm-dyn.ld --use-blx" "" ""
- {preempt-app.s}
- {{readelf -Ds preempt-app.sym}}
- "preempt-app"}
{"TLS gnu shared library inlined trampoline" "--no-fix-arm1176 -shared -T arm-dyn.ld" "" "" {tls-descseq.s}
{{objdump -fdw tls-descseq.d} {objdump -Rw tls-descseq.r}}
"tls-lib2inline.so"}
{"TLS shared library gdesc local" "--no-fix-arm1176 -shared -T arm-dyn.ld" "" "" {tls-lib-loc.s}
{{objdump -fdw tls-lib-loc.d} {objdump -Rw tls-lib-loc.r}}
"tls-lib-loc.so"}
- {"Cortex-A8 erratum fix, b.w"
- "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-fix-b.s}
- {{objdump -dr cortex-a8-fix-b.d}}
- "cortex-a8-fix-b"}
- {"Cortex-A8 erratum fix, bl.w"
- "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-fix-bl.s}
- {{objdump -dr cortex-a8-fix-bl.d}}
- "cortex-a8-fix-bl"}
- {"Cortex-A8 erratum fix, bcc.w"
- "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-fix-bcc.s}
- {{objdump -dr cortex-a8-fix-bcc.d}}
- "cortex-a8-fix-bcc"}
- {"Cortex-A8 erratum fix, blx.w"
- "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-fix-blx.s}
- {{objdump -dr cortex-a8-fix-blx.d}}
- "cortex-a8-fix-blx"}
- {"Cortex-A8 erratum fix, relocate b.w to ARM"
- "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-arm-target.s cortex-a8-fix-b-rel.s}
- {{objdump -dr cortex-a8-fix-b-rel-arm.d}}
- "cortex-a8-fix-b-rel-arm"}
- {"Cortex-A8 erratum fix, relocate b.w to Thumb"
- "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-thumb-target.s cortex-a8-fix-b-rel.s}
- {{objdump -dr cortex-a8-fix-b-rel-thumb.d}}
- "cortex-a8-fix-b-rel-thumb"}
- {"Cortex-A8 erratum fix, relocate bl.w to ARM"
- "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-arm-target.s cortex-a8-fix-bl-rel.s}
- {{objdump -dr cortex-a8-fix-bl-rel-arm.d}}
- "cortex-a8-fix-bl-rel-arm"}
- {"Cortex-A8 erratum fix, relocate bl.w to Thumb"
- "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-thumb-target.s cortex-a8-fix-bl-rel.s}
- {{objdump -dr cortex-a8-fix-bl-rel-thumb.d}}
- "cortex-a8-fix-bl-rel-thumb"}
- {"Cortex-A8 erratum fix, relocate b<cond>.w to Thumb"
- "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-thumb-target.s cortex-a8-fix-bcc-rel.s}
- {{objdump -dr cortex-a8-fix-bcc-rel-thumb.d}}
- "cortex-a8-fix-bcc-rel-thumb"}
- {"Cortex-A8 erratum fix, relocate blx.w to ARM"
- "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-arm-target.s cortex-a8-fix-blx-rel.s}
- {{objdump -dr cortex-a8-fix-blx-rel-arm.d}}
- "cortex-a8-fix-blx-rel-arm"}
- {"Cortex-A8 erratum fix, relocate blx.w to Thumb"
- "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-thumb-target.s cortex-a8-fix-blx-rel.s}
- {{objdump -dr cortex-a8-fix-blx-rel-thumb.d}}
- "cortex-a8-fix-blx-rel-thumb"}
- {"Cortex-A8 erratum fix, relocate bl.w and far call"
- "-EL -Ttext=0x00 --fix-cortex-a8 --defsym _start=0" ""
- "-EL -mcpu=cortex-a8" {cortex-a8-far-1.s cortex-a8-far-2.s cortex-a8-far-3.s}
- {{objdump -dr cortex-a8-far.d}}
- "cortex-a8-far"}
- {"Cortex-A8 erratum fix, headers"
- "-EL --fix-cortex-a8 -T cortex-a8-fix-hdr.t" ""
- "-EL -mcpu=cortex-a8" {cortex-a8-fix-hdr.s}
- {{objdump -dr cortex-a8-fix-hdr.d}}
- "cortex-a8-fix-hdr"}
- {"Cortex-A8 erratum fix, blx.w and b<cond>.w together"
- "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-fix-blx-bcond.s}
- {{objdump -dr cortex-a8-fix-blx-bcond.d}}
- "cortex-a8-fix-blx-bcond"}
- {"Cortex-A8 erratum fix, b.w to PLT"
- "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "" "-EL"
- {cortex-a8-fix-b-plt.s}
- {{objdump -dr cortex-a8-fix-b-plt.d}}
- "cortex-a8-fix-b-plt"}
- {"Cortex-A8 erratum fix, bl.w to PLT"
- "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "" "-EL"
- {cortex-a8-fix-bl-plt.s}
- {{objdump -dr cortex-a8-fix-bl-plt.d}}
- "cortex-a8-fix-bl-plt"}
- {"Cortex-A8 erratum fix, bcc.w to PLT"
- "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "" "-EL"
- {cortex-a8-fix-bcc-plt.s}
- {{objdump -dr cortex-a8-fix-bcc-plt.d}}
- "cortex-a8-fix-bcc-plt"}
- {"Cortex-A8 erratum fix, blx.w to PLT"
- "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "" "-EL"
- {cortex-a8-fix-blx-plt.s}
- {{objdump -dr cortex-a8-fix-blx-plt.d}}
- "cortex-a8-fix-blx-plt"}
- {"Cortex-A8 erratum fix, relocate bl.w to PLT"
- "-EL --section-start=.plt=0x8e00 -Ttext=0x8f00 --fix-cortex-a8 -shared" ""
- "-EL" {cortex-a8-thumb-target.s cortex-a8-fix-bl-rel.s}
- {{objdump -dr cortex-a8-fix-bl-rel-plt.d}}
- "cortex-a8-fix-bl-rel-thumb"}
- {"IFUNC test 1" "-T ifunc-static.ld" "" "" {ifunc-1.s}
- {{objdump -d ifunc-1.dd}
- {objdump {-s -j.data -j.got} ifunc-1.gd}
- {readelf -dr ifunc-1.rd}}
- "ifunc-1"}
- {"IFUNC test 2" "-T ifunc-static.ld" "" "" {ifunc-2.s}
- {{objdump -d ifunc-2.dd}
- {objdump {-s -j.data -j.got} ifunc-2.gd}
- {readelf -dr ifunc-2.rd}}
- "ifunc-2"}
- {"IFUNC test 3" "-T ifunc-dynamic.ld -shared" "" "" {ifunc-3.s}
- {{objdump -d ifunc-3.dd}
- {objdump {-s -j.data -j.got} ifunc-3.gd}
- {readelf -r ifunc-3.rd}}
- "ifunc-3.so"}
- {"IFUNC test 4" "-T ifunc-dynamic.ld -shared" "" "" {ifunc-4.s}
- {{objdump -d ifunc-4.dd}
- {objdump {-s -j.data -j.got} ifunc-4.gd}
- {readelf -r ifunc-4.rd}}
- "ifunc-4.so"}
- {"IFUNC test 5" "-T ifunc-static.ld" "" "" {ifunc-5.s}
- {{objdump -d ifunc-5.dd}
- {objdump {-s -j.data -j.got} ifunc-5.gd}
- {readelf -dr ifunc-5.rd}}
- "ifunc-5"}
- {"IFUNC test 6" "-T ifunc-static.ld" "" "" {ifunc-6.s}
- {{objdump -d ifunc-6.dd}
- {objdump {-s -j.data -j.got} ifunc-6.gd}
- {readelf -dr ifunc-6.rd}}
- "ifunc-6"}
- {"IFUNC test 7" "-T ifunc-dynamic.ld tmpdir/ifunc-3.so -shared" ""
- "" {ifunc-7.s}
- {{objdump -d ifunc-7.dd}
- {objdump {-s -j.data -j.got} ifunc-7.gd}
- {readelf -r ifunc-7.rd}}
- "ifunc-7.so"}
- {"IFUNC test 8" "-T ifunc-dynamic.ld tmpdir/ifunc-4.so -shared" ""
- "" {ifunc-8.s}
- {{objdump -d ifunc-8.dd}
- {objdump {-s -j.data -j.got} ifunc-8.gd}
- {readelf -r ifunc-8.rd}}
- "ifunc-8.so"}
- {"IFUNC test 9" "-T ifunc-dynamic.ld tmpdir/ifunc-3.so" "" "" {ifunc-9.s}
- {{objdump -d ifunc-9.dd}
- {objdump {-s -j.data -j.got} ifunc-9.gd}
- {readelf -r ifunc-9.rd}}
- "ifunc-9"}
- {"IFUNC test 10" "-T ifunc-dynamic.ld tmpdir/ifunc-4.so" "" "" {ifunc-10.s}
- {{objdump -d ifunc-10.dd}
- {objdump {-s -j.data -j.got} ifunc-10.gd}
- {readelf -r ifunc-10.rd}}
- "ifunc-10"}
- {"IFUNC test 11" "-T ifunc-static.ld" "" "" {ifunc-11.s}
- {{objdump -d ifunc-11.dd}
- {objdump {-s -j.data -j.got} ifunc-11.gd}
- {readelf -dr ifunc-11.rd}}
- "ifunc-11"}
- {"IFUNC test 12" "-T ifunc-dynamic.ld -shared" "" "" {ifunc-12.s}
- {{objdump -d ifunc-12.dd}
- {objdump {-s -j.data -j.got} ifunc-12.gd}
- {readelf -r ifunc-12.rd}}
- "ifunc-12.so"}
- {"IFUNC test 13" "-T ifunc-dynamic.ld tmpdir/ifunc-12.so" "" "" {ifunc-13.s}
- {{objdump -d ifunc-13.dd}
- {objdump {-s -j.data -j.got} ifunc-13.gd}
- {readelf -r ifunc-13.rd}}
- "ifunc-13"}
- {"IFUNC test 14" "-T ifunc-dynamic.ld tmpdir/ifunc-12.so" "" "" {ifunc-14.s}
- {{objdump -d ifunc-14.dd}
- {objdump {-s -j.data -j.got} ifunc-14.gd}
- {readelf -r ifunc-14.rd}}
- "ifunc-14"}
- {"IFUNC test 15" "-T ifunc-dynamic.ld tmpdir/ifunc-12.so" "" "" {ifunc-15.s}
- {{objdump -d ifunc-15.dd}
- {objdump {-s -j.data -j.got} ifunc-15.gd}
- {readelf -r ifunc-15.rd}}
- "ifunc-15"}
- {"IFUNC test 16" "-T ifunc-dynamic.ld tmpdir/ifunc-12.so" "" "" {ifunc-16.s}
- {{objdump -d ifunc-16.dd}
- {objdump {-s -j.data -j.got} ifunc-16.gd}
- {readelf -r ifunc-16.rd}}
- "ifunc-16"}
- {"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}}
- "ifunc-17"}
}
run_ld_link_tests $armelftests_common
@@ -566,6 +387,12 @@ set armeabitests_common {
{"Long branch with mixed text and data" "-T arm.ld" "" "" {farcall-data.s}
{{objdump -dr farcall-data.d farcall-data-nacl.d}}
"farcall-data"}
+ {"callweak-2" "-static -T arm.ld" "" "" {callweak-2.s}
+ {{objdump -dr callweak-2.d}}
+ "callweak-2"}
+ {"abs call" "-T arm.ld" "" "" {abs-call-1.s}
+ {{objdump -d abs-call-1.d}}
+ "abs-call-1"}
}
set armeabitests_nonacl {
@@ -626,6 +453,16 @@ set armeabitests_nonacl {
{{objdump -d farcall-thumb-arm-pic-veneer.d}}
"farcall-thumb-arm-pic-veneer"}
+ {"Thumb-ARM farcall cond" "-Ttext 0x8000 --section-start .foo=0x118000" "" "-W" {farcall-cond-thumb-arm.s}
+ {{objdump -d farcall-cond-thumb-arm.d}}
+ "farcall-cond-thumb-arm"}
+ {"Thumb-ARM farcall cond (BE8)" "-Ttext 0x8000 --section-start .foo=0x118000 -EB --be8" "" "-W -EB" {farcall-cond-thumb-arm.s}
+ {{objdump -d farcall-cond-thumb-arm.d}}
+ "farcall-cond-thumb-arm-be8"}
+ {"Thumb-ARM farcall cond (BE)" "-Ttext 0x8000 --section-start .foo=0x118000 -EB" "" "-W -EB" {farcall-cond-thumb-arm.s}
+ {{objdump -d farcall-cond-thumb-arm.d}}
+ "farcall-cond-thumb-arm-be"}
+
{"Multiple farcalls" "-Ttext 0x1000 --section-start .foo=0x2002020" "" "" {farcall-mix.s}
{{objdump -d farcall-mix.d}}
"farcall-mix"}
@@ -724,6 +561,31 @@ set armeabitests_nonacl {
{{objdump -d jump-reloc-veneers-long.d}}
"jump-reloc-veneers-long"}
+ {"R_ARM_THM_JUMP19 Relocation veneers: Short"
+ "--section-start destsect=0x000108002 --section-start .text=0x8000" ""
+ "-march=armv7-m -mthumb"
+ {jump-reloc-veneers-cond.s}
+ {{objdump -d jump-reloc-veneers-cond-short.d}}
+ "jump-reloc-veneers-cond-short"}
+ {"R_ARM_THM_JUMP19 Relocation veneers: Long"
+ "--section-start destsect=0x00108004 --section-start .text=0x8000" ""
+ "-march=armv7-m -mthumb"
+ {jump-reloc-veneers-cond.s}
+ {{objdump -d jump-reloc-veneers-cond-long.d}}
+ "jump-reloc-veneers-cond-long"}
+ {"R_ARM_THM_JUMP19 Relocation veneers: Short backward"
+ "--section-start destsect=0x8004 --section-start .text=0x108000" ""
+ "-march=armv7-m -mthumb"
+ {jump-reloc-veneers-cond.s}
+ {{objdump -d jump-reloc-veneers-cond-short-backward.d}}
+ "jump-reloc-veneers-cond-short-backward"}
+ {"R_ARM_THM_JUMP19 Relocation veneers: Long backward"
+ "--section-start destsect=0x8002 --section-start .text=0x108000" ""
+ "-march=armv7-m -mthumb"
+ {jump-reloc-veneers-cond.s}
+ {{objdump -d jump-reloc-veneers-cond-long-backward.d}}
+ "jump-reloc-veneers-cond-long-backward"}
+
{"Default group size" "-Ttext 0x1000 --section-start .foo=0x2003020" "" "" {farcall-group.s farcall-group2.s}
{{objdump -d farcall-group.d}}
"farcall-group-default"}
@@ -749,6 +611,190 @@ set armeabitests_nonacl {
{"TLS thumb1" "-shared -T arm-dyn.ld --section-start .foo=0x4001000" "" "" {tls-thumb1.s}
{{objdump -fdw tls-thumb1.d}}
"tls-thumb1"}
+ {"Cortex-A8 erratum fix, b.w"
+ "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-fix-b.s}
+ {{objdump -dr cortex-a8-fix-b.d}}
+ "cortex-a8-fix-b"}
+ {"Cortex-A8 erratum fix, bl.w"
+ "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-fix-bl.s}
+ {{objdump -dr cortex-a8-fix-bl.d}}
+ "cortex-a8-fix-bl"}
+ {"Cortex-A8 erratum fix, bcc.w"
+ "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-fix-bcc.s}
+ {{objdump -dr cortex-a8-fix-bcc.d}}
+ "cortex-a8-fix-bcc"}
+ {"Cortex-A8 erratum fix, blx.w"
+ "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-fix-blx.s}
+ {{objdump -dr cortex-a8-fix-blx.d}}
+ "cortex-a8-fix-blx"}
+ {"Cortex-A8 erratum fix, relocate b.w to ARM"
+ "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-arm-target.s cortex-a8-fix-b-rel.s}
+ {{objdump -dr cortex-a8-fix-b-rel-arm.d}}
+ "cortex-a8-fix-b-rel-arm"}
+ {"Cortex-A8 erratum fix, relocate b.w to Thumb"
+ "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-thumb-target.s cortex-a8-fix-b-rel.s}
+ {{objdump -dr cortex-a8-fix-b-rel-thumb.d}}
+ "cortex-a8-fix-b-rel-thumb"}
+ {"Cortex-A8 erratum fix, relocate bl.w to ARM"
+ "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-arm-target.s cortex-a8-fix-bl-rel.s}
+ {{objdump -dr cortex-a8-fix-bl-rel-arm.d}}
+ "cortex-a8-fix-bl-rel-arm"}
+ {"Cortex-A8 erratum fix, relocate bl.w to Thumb"
+ "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-thumb-target.s cortex-a8-fix-bl-rel.s}
+ {{objdump -dr cortex-a8-fix-bl-rel-thumb.d}}
+ "cortex-a8-fix-bl-rel-thumb"}
+ {"Cortex-A8 erratum fix, relocate b<cond>.w to Thumb"
+ "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-thumb-target.s cortex-a8-fix-bcc-rel.s}
+ {{objdump -dr cortex-a8-fix-bcc-rel-thumb.d}}
+ "cortex-a8-fix-bcc-rel-thumb"}
+ {"Cortex-A8 erratum fix, relocate blx.w to ARM"
+ "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-arm-target.s cortex-a8-fix-blx-rel.s}
+ {{objdump -dr cortex-a8-fix-blx-rel-arm.d}}
+ "cortex-a8-fix-blx-rel-arm"}
+ {"Cortex-A8 erratum fix, relocate blx.w to Thumb"
+ "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-thumb-target.s cortex-a8-fix-blx-rel.s}
+ {{objdump -dr cortex-a8-fix-blx-rel-thumb.d}}
+ "cortex-a8-fix-blx-rel-thumb"}
+ {"Cortex-A8 erratum fix, relocate bl.w and far call"
+ "-EL -Ttext=0x00 --fix-cortex-a8 --defsym _start=0" ""
+ "-EL -mcpu=cortex-a8" {cortex-a8-far-1.s cortex-a8-far-2.s cortex-a8-far-3.s}
+ {{objdump -dr cortex-a8-far.d}}
+ "cortex-a8-far"}
+ {"Cortex-A8 erratum fix, headers"
+ "-EL --fix-cortex-a8 -T cortex-a8-fix-hdr.t" ""
+ "-EL -mcpu=cortex-a8" {cortex-a8-fix-hdr.s}
+ {{objdump -dr cortex-a8-fix-hdr.d}}
+ "cortex-a8-fix-hdr"}
+ {"Cortex-A8 erratum fix, blx.w and b<cond>.w together"
+ "-EL -Ttext=0x8f00 --fix-cortex-a8" "" "-EL" {cortex-a8-fix-blx-bcond.s}
+ {{objdump -dr cortex-a8-fix-blx-bcond.d}}
+ "cortex-a8-fix-blx-bcond"}
+ {"Cortex-A8 erratum fix, b.w to PLT"
+ "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "" "-EL"
+ {cortex-a8-fix-b-plt.s}
+ {{objdump -dr cortex-a8-fix-b-plt.d}}
+ "cortex-a8-fix-b-plt"}
+ {"Cortex-A8 erratum fix, bl.w to PLT"
+ "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "" "-EL"
+ {cortex-a8-fix-bl-plt.s}
+ {{objdump -dr cortex-a8-fix-bl-plt.d}}
+ "cortex-a8-fix-bl-plt"}
+ {"Cortex-A8 erratum fix, bcc.w to PLT"
+ "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "" "-EL"
+ {cortex-a8-fix-bcc-plt.s}
+ {{objdump -dr cortex-a8-fix-bcc-plt.d}}
+ "cortex-a8-fix-bcc-plt"}
+ {"Cortex-A8 erratum fix, blx.w to PLT"
+ "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "" "-EL"
+ {cortex-a8-fix-blx-plt.s}
+ {{objdump -dr cortex-a8-fix-blx-plt.d}}
+ "cortex-a8-fix-blx-plt"}
+ {"Cortex-A8 erratum fix, relocate bl.w to PLT"
+ "-EL --section-start=.plt=0x8e00 -Ttext=0x8f00 --fix-cortex-a8 -shared" ""
+ "-EL" {cortex-a8-thumb-target.s cortex-a8-fix-bl-rel.s}
+ {{objdump -dr cortex-a8-fix-bl-rel-plt.d}}
+ "cortex-a8-fix-bl-rel-thumb"}
+ {"IFUNC test 1" "-T ifunc-static.ld" "" "" {ifunc-1.s}
+ {{objdump -d ifunc-1.dd}
+ {objdump {-s -j.data -j.got} ifunc-1.gd}
+ {readelf -dr ifunc-1.rd}}
+ "ifunc-1"}
+ {"IFUNC test 2" "-T ifunc-static.ld" "" "" {ifunc-2.s}
+ {{objdump -d ifunc-2.dd}
+ {objdump {-s -j.data -j.got} ifunc-2.gd}
+ {readelf -dr ifunc-2.rd}}
+ "ifunc-2"}
+ {"IFUNC test 3" "-T ifunc-dynamic.ld -shared" "" "" {ifunc-3.s}
+ {{objdump -d ifunc-3.dd}
+ {objdump {-s -j.data -j.got} ifunc-3.gd}
+ {readelf -r ifunc-3.rd}}
+ "ifunc-3.so"}
+ {"IFUNC test 4" "-T ifunc-dynamic.ld -shared" "" "" {ifunc-4.s}
+ {{objdump -d ifunc-4.dd}
+ {objdump {-s -j.data -j.got} ifunc-4.gd}
+ {readelf -r ifunc-4.rd}}
+ "ifunc-4.so"}
+ {"IFUNC test 5" "-T ifunc-static.ld" "" "" {ifunc-5.s}
+ {{objdump -d ifunc-5.dd}
+ {objdump {-s -j.data -j.got} ifunc-5.gd}
+ {readelf -dr ifunc-5.rd}}
+ "ifunc-5"}
+ {"IFUNC test 6" "-T ifunc-static.ld" "" "" {ifunc-6.s}
+ {{objdump -d ifunc-6.dd}
+ {objdump {-s -j.data -j.got} ifunc-6.gd}
+ {readelf -dr ifunc-6.rd}}
+ "ifunc-6"}
+ {"IFUNC test 7" "-T ifunc-dynamic.ld tmpdir/ifunc-3.so -shared" ""
+ "" {ifunc-7.s}
+ {{objdump -d ifunc-7.dd}
+ {objdump {-s -j.data -j.got} ifunc-7.gd}
+ {readelf -r ifunc-7.rd}}
+ "ifunc-7.so"}
+ {"IFUNC test 8" "-T ifunc-dynamic.ld tmpdir/ifunc-4.so -shared" ""
+ "" {ifunc-8.s}
+ {{objdump -d ifunc-8.dd}
+ {objdump {-s -j.data -j.got} ifunc-8.gd}
+ {readelf -r ifunc-8.rd}}
+ "ifunc-8.so"}
+ {"IFUNC test 9" "-T ifunc-dynamic.ld tmpdir/ifunc-3.so" "" "" {ifunc-9.s}
+ {{objdump -d ifunc-9.dd}
+ {objdump {-s -j.data -j.got} ifunc-9.gd}
+ {readelf -r ifunc-9.rd}}
+ "ifunc-9"}
+ {"IFUNC test 10" "-T ifunc-dynamic.ld tmpdir/ifunc-4.so" "" "" {ifunc-10.s}
+ {{objdump -d ifunc-10.dd}
+ {objdump {-s -j.data -j.got} ifunc-10.gd}
+ {readelf -r ifunc-10.rd}}
+ "ifunc-10"}
+ {"IFUNC test 11" "-T ifunc-static.ld" "" "" {ifunc-11.s}
+ {{objdump -d ifunc-11.dd}
+ {objdump {-s -j.data -j.got} ifunc-11.gd}
+ {readelf -dr ifunc-11.rd}}
+ "ifunc-11"}
+ {"IFUNC test 12" "-T ifunc-dynamic.ld -shared" "" "" {ifunc-12.s}
+ {{objdump -d ifunc-12.dd}
+ {objdump {-s -j.data -j.got} ifunc-12.gd}
+ {readelf -r ifunc-12.rd}}
+ "ifunc-12.so"}
+ {"IFUNC test 13" "-T ifunc-dynamic.ld tmpdir/ifunc-12.so" "" "" {ifunc-13.s}
+ {{objdump -d ifunc-13.dd}
+ {objdump {-s -j.data -j.got} ifunc-13.gd}
+ {readelf -r ifunc-13.rd}}
+ "ifunc-13"}
+ {"IFUNC test 14" "-T ifunc-dynamic.ld tmpdir/ifunc-12.so" "" "" {ifunc-14.s}
+ {{objdump -d ifunc-14.dd}
+ {objdump {-s -j.data -j.got} ifunc-14.gd}
+ {readelf -r ifunc-14.rd}}
+ "ifunc-14"}
+ {"IFUNC test 15" "-T ifunc-dynamic.ld tmpdir/ifunc-12.so" "" "" {ifunc-15.s}
+ {{objdump -d ifunc-15.dd}
+ {objdump {-s -j.data -j.got} ifunc-15.gd}
+ {readelf -r ifunc-15.rd}}
+ "ifunc-15"}
+ {"IFUNC test 16" "-T ifunc-dynamic.ld tmpdir/ifunc-12.so" "" "" {ifunc-16.s}
+ {{objdump -d ifunc-16.dd}
+ {objdump {-s -j.data -j.got} ifunc-16.gd}
+ {readelf -r ifunc-16.rd}}
+ "ifunc-16"}
+ {"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}}
+ "ifunc-17"}
+ {"Long PLT entries in executables" "--long-plt -shared --section-start=.plt=0x1000 --section-start=.got=0xf0001100" ""
+ "" {long-plt-format.s}
+ {{objdump "-d -j .plt" long-plt-format.d}}
+ "long-plt-format"}
+ {"IFUNC and TLS descriptor shared library" "-shared -T arm-lib.ld --version-script=ifunc-gdesc.ver" "" "" {ifunc-gdesc.s}
+ {{objdump "-Rw" ifunc-gdesc.r}}
+ "ifunc-gdesc.so"}
+ {"arm-pic-veneer" "-static -T arm.ld --pic-veneer" "" "" {arm-pic-veneer.s}
+ {{objdump -d arm-pic-veneer.d}}
+ "arm-pic-veneer"}
+ {"Preempt Thumb symbol" "tmpdir/mixed-lib.so -T arm-dyn.ld --use-blx" "" ""
+ {preempt-app.s}
+ {{readelf -Ds preempt-app.sym}}
+ "preempt-app"}
}
# Massage the $armeabitests_common list into run_ld_link_tests standard form.
@@ -832,6 +878,7 @@ run_dump_test "attr-merge-vfp-6r"
run_dump_test "attr-merge-vfp-7"
run_dump_test "attr-merge-vfp-7r"
run_dump_test "attr-merge-incompatible"
+run_dump_test "attr-merge-arch-2"
run_dump_test "unresolved-1"
if { ![istarget "arm*-*-nacl*"] } {
run_dump_test "unresolved-1-dyn"
diff --git a/binutils-2.25/ld/testsuite/ld-arm/arm-lib-plt32.d b/binutils-2.25/ld/testsuite/ld-arm/arm-lib-plt32.d
index 279ea5a4..ecc2cf2a 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/arm-lib-plt32.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/arm-lib-plt32.d
@@ -1,17 +1,18 @@
tmpdir/arm-lib-plt32.so: file format elf32-(little|big)arm
-architecture: armv4t, flags 0x00000150:
+architecture: arm.*, flags 0x00000150:
HAS_SYMS, DYNAMIC, D_PAGED
start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x10>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff9 bl .* <lib_func1-0xc>
+ .*: ebfffff9 bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
diff --git a/binutils-2.25/ld/testsuite/ld-arm/arm-lib.d b/binutils-2.25/ld/testsuite/ld-arm/arm-lib.d
index 22e21d59..0e2a7aa4 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/arm-lib.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/arm-lib.d
@@ -1,17 +1,18 @@
tmpdir/arm-lib.so: file format elf32-(little|big)arm.*
-architecture: armv4t, flags 0x00000150:
+architecture: arm.*, flags 0x00000150:
HAS_SYMS, DYNAMIC, D_PAGED
start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x10>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff9 bl .* <lib_func1-0xc>
+ .*: ebfffff9 bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
diff --git a/binutils-2.25/ld/testsuite/ld-arm/arm-lib.ld b/binutils-2.25/ld/testsuite/ld-arm/arm-lib.ld
index c9482c35..f946d0a8 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/arm-lib.ld
+++ b/binutils-2.25/ld/testsuite/ld-arm/arm-lib.ld
@@ -75,7 +75,7 @@ SECTIONS
.gcc_except_table : ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) }
/* Adjust the address for the data segment. We want to adjust up to
the same address within the page on the next page up. */
- . = ALIGN (0x8000) - ((0x8000 - .) & (0x8000 - 1)); . = DATA_SEGMENT_ALIGN (0x8000, 0x1000);
+ . = ALIGN (0x10000) - ((0x10000 - .) & (0x10000 - 1)); . = DATA_SEGMENT_ALIGN (0x10000, 0x1000);
/* Exception handling */
.eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) }
.gcc_except_table : ONLY_IF_RW { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) }
@@ -141,7 +141,7 @@ SECTIONS
/* Align here to ensure that the .bss section occupies space up to
_end. Align after .bss to ensure correct alignment even if the
.bss section disappears because there are no input sections. */
- . = ALIGN(32 / 8);
+ . = ALIGN(. != 0 ? 32 / 8 : 1);
}
. = ALIGN(32 / 8);
_end = .;
diff --git a/binutils-2.25/ld/testsuite/ld-arm/arm-no-rel-plt.ld b/binutils-2.25/ld/testsuite/ld-arm/arm-no-rel-plt.ld
index 439909c8..391e6633 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/arm-no-rel-plt.ld
+++ b/binutils-2.25/ld/testsuite/ld-arm/arm-no-rel-plt.ld
@@ -1,9 +1,6 @@
/* Script for -z combreloc: combine and sort reloc sections */
-OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
- "elf32-littlearm")
OUTPUT_ARCH(arm)
ENTRY(_start)
-SEARCH_DIR("/home/meadori/Code/install/arm-none-eabi/lib");
SECTIONS
{
/* Read-only sections, merged into text segment: */
@@ -181,7 +178,6 @@ SECTIONS
}
_bss_end__ = . ; __bss_end__ = . ;
. = ALIGN(32 / 8);
- . = ALIGN(32 / 8);
__end__ = . ;
_end = .; PROVIDE (end = .);
/* Stabs debugging sections. */
diff --git a/binutils-2.25/ld/testsuite/ld-arm/arm-rel32.d b/binutils-2.25/ld/testsuite/ld-arm/arm-rel32.d
index 919aaa42..ff263868 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/arm-rel32.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/arm-rel32.d
@@ -9,4 +9,4 @@ OFFSET +TYPE +VALUE
Contents of section \.data:
- [^ ]+ 00000000 00010000 .*
+ [^ ]+ 00000000 (00010000|00000100) .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/arm-static-app.d b/binutils-2.25/ld/testsuite/ld-arm/arm-static-app.d
index c08c27ff..40355c8d 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/arm-static-app.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/arm-static-app.d
@@ -1,6 +1,6 @@
tmpdir/arm-static-app: file format elf32-(little|big)arm.*
-architecture: armv4t, flags 0x00000112:
+architecture: arm.*, flags 0x00000112:
EXEC_P, HAS_SYMS, D_PAGED
start address 0x.*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/armthumb-lib.d b/binutils-2.25/ld/testsuite/ld-arm/armthumb-lib.d
index dae72ed1..f87829cc 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/armthumb-lib.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/armthumb-lib.d
@@ -1,17 +1,18 @@
tmpdir/armthumb-lib.so: file format elf32-(little|big)arm
-architecture: armv4t, flags 0x00000150:
+architecture: arm.*, flags 0x00000150:
HAS_SYMS, DYNAMIC, D_PAGED
start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x1.>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff. bl .* <lib_func1-0x..?>
+ .*: ebfffff. bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
diff --git a/binutils-2.25/ld/testsuite/ld-arm/attr-merge-arch-2.d b/binutils-2.25/ld/testsuite/ld-arm/attr-merge-arch-2.d
new file mode 100644
index 00000000..0e98edb6
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/attr-merge-arch-2.d
@@ -0,0 +1,5 @@
+#source: attr-merge-arch-2a.s
+#source: attr-merge-arch-2b.s
+#as:
+#ld: -e main
+#error: Conflicting CPU architectures 13/0
diff --git a/binutils-2.25/ld/testsuite/ld-arm/attr-merge-arch-2a.s b/binutils-2.25/ld/testsuite/ld-arm/attr-merge-arch-2a.s
new file mode 100644
index 00000000..6235a3ed
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/attr-merge-arch-2a.s
@@ -0,0 +1,18 @@
+ .syntax unified
+ .cpu cortex-m4
+ .fpu softvfp
+ .thumb
+ .file "m.c"
+ .text
+ .align 2
+ .global main
+ .thumb
+ .thumb_func
+ .type main, %function
+main:
+ push {r7, lr}
+ add r7, sp, #0
+ bl foo
+ mov r3, r0
+ mov r0, r3
+ pop {r7, pc}
diff --git a/binutils-2.25/ld/testsuite/ld-arm/attr-merge-arch-2b.s b/binutils-2.25/ld/testsuite/ld-arm/attr-merge-arch-2b.s
new file mode 100644
index 00000000..57718354
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/attr-merge-arch-2b.s
@@ -0,0 +1,8 @@
+ .eabi_attribute 6, 0 @Tag_CPU_arch, 0 means pre-v4.
+ .file "f.c"
+ .text
+ .align 2
+ .global foo
+ .type foo, %function
+foo:
+ bx lr
diff --git a/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-far.d b/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-far.d
index e327ac1e..06bb646b 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-far.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-far.d
@@ -1,3 +1,4 @@
+#target: *-*-*eabi* *-*-nacl*
.*: file format .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d b/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
index 4f1078d6..0f40861b 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00000ffc \.word 0x00000ffc
+00008014 <bar@plt>:
8014: 4778 bx pc
8016: 46c0 nop ; \(mov r8, r8\)
8018: e28fc600 add ip, pc, #0, 12
@@ -27,4 +28,4 @@ Disassembly of section \.text:
9002: 0000 movs r0, r0
9004: 0000 movs r0, r0
9006: 0000 movs r0, r0
- 9008: f7ff b804 b\.w 8014 <foo-0xfdc>
+ 9008: f7ff b804 b\.w 8014 <bar@plt>
diff --git a/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d b/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
index 1e0cab2d..b6e6fff0 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00001004 \.word 0x00001004
+00008014 <bar@plt>:
8014: 4778 bx pc
8016: 46c0 nop ; \(mov r8, r8\)
8018: e28fc600 add ip, pc, #0, 12
@@ -29,4 +30,4 @@ Disassembly of section \.text:
9006: 0000 movs r0, r0
9008: d001 beq\.n 900e <foo\+0x1e>
900a: f7ff bffa b\.w 9002 <foo\+0x12>
- 900e: f7ff b801 b\.w 8014 <foo-0xfdc>
+ 900e: f7ff b801 b\.w 8014 <bar@plt>
diff --git a/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d b/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
index ebb480f0..baad3d07 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00000ffc \.word 0x00000ffc
+00008014 <bar@plt>:
8014: e28fc600 add ip, pc, #0, 12
8018: e28cca00 add ip, ip, #0, 20
801c: e5bcfffc ldr pc, \[ip, #4092\]! ; 0xffc
@@ -25,4 +26,4 @@ Disassembly of section \.text:
9002: 0000 movs r0, r0
9004: 0000 movs r0, r0
9006: 0000 movs r0, r0
- 9008: eafffc01 b 8014 <foo-0xfdc>
+ 9008: eafffc01 b 8014 <bar@plt>
diff --git a/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d b/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
index f8a9c242..ba1f5378 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
@@ -4,14 +4,15 @@
Disassembly of section \.plt:
-00008e00 <\.plt>:
+00008e00 <targetfn@plt-0x14>:
8e00: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8e04: e59fe004 ldr lr, \[pc, #4\] ; 8e10 <targetfn-0xf0>
+ 8e04: e59fe004 ldr lr, \[pc, #4\] ; 8e10 <targetfn@plt-0x4>
8e08: e08fe00e add lr, pc, lr
8e0c: e5bef008 ldr pc, \[lr, #8\]!
- 8e10: 0000827c \.word 0x0000827c
+ 8e10: 0001027c \.word 0x0001027c
+00008e14 <targetfn@plt>:
8e14: e28fc600 add ip, pc, #0, 12
- 8e18: e28cca08 add ip, ip, #8, 20 ; 0x8000
+ 8e18: e28cca10 add ip, ip, #16, 20 ; 0x10000
8e1c: e5bcf27c ldr pc, \[ip, #636\]! ; 0x27c
Disassembly of section \.text:
@@ -24,69 +25,69 @@ Disassembly of section \.text:
00008f08 <_start>:
8f08: bf00 nop
8f0a: eb01 0002 add\.w r0, r1, r2
- 8f0e: f7ff ef82 blx 8e14 <targetfn-0xec>
+ 8f0e: f7ff ef82 blx 8e14 <targetfn@plt>
8f12: eb01 0002 add\.w r0, r1, r2
- 8f16: f7ff ef7e blx 8e14 <targetfn-0xec>
+ 8f16: f7ff ef7e blx 8e14 <targetfn@plt>
8f1a: eb01 0002 add\.w r0, r1, r2
- 8f1e: f7ff ef7a blx 8e14 <targetfn-0xec>
+ 8f1e: f7ff ef7a blx 8e14 <targetfn@plt>
8f22: eb01 0002 add\.w r0, r1, r2
- 8f26: f7ff ef76 blx 8e14 <targetfn-0xec>
+ 8f26: f7ff ef76 blx 8e14 <targetfn@plt>
8f2a: eb01 0002 add\.w r0, r1, r2
- 8f2e: f7ff ef72 blx 8e14 <targetfn-0xec>
+ 8f2e: f7ff ef72 blx 8e14 <targetfn@plt>
8f32: eb01 0002 add\.w r0, r1, r2
- 8f36: f7ff ef6e blx 8e14 <targetfn-0xec>
+ 8f36: f7ff ef6e blx 8e14 <targetfn@plt>
8f3a: eb01 0002 add\.w r0, r1, r2
- 8f3e: f7ff ef6a blx 8e14 <targetfn-0xec>
+ 8f3e: f7ff ef6a blx 8e14 <targetfn@plt>
8f42: eb01 0002 add\.w r0, r1, r2
- 8f46: f7ff ef66 blx 8e14 <targetfn-0xec>
+ 8f46: f7ff ef66 blx 8e14 <targetfn@plt>
8f4a: eb01 0002 add\.w r0, r1, r2
- 8f4e: f7ff ef62 blx 8e14 <targetfn-0xec>
+ 8f4e: f7ff ef62 blx 8e14 <targetfn@plt>
8f52: eb01 0002 add\.w r0, r1, r2
- 8f56: f7ff ef5e blx 8e14 <targetfn-0xec>
+ 8f56: f7ff ef5e blx 8e14 <targetfn@plt>
8f5a: eb01 0002 add\.w r0, r1, r2
- 8f5e: f7ff ef5a blx 8e14 <targetfn-0xec>
+ 8f5e: f7ff ef5a blx 8e14 <targetfn@plt>
8f62: eb01 0002 add\.w r0, r1, r2
- 8f66: f7ff ef56 blx 8e14 <targetfn-0xec>
+ 8f66: f7ff ef56 blx 8e14 <targetfn@plt>
8f6a: eb01 0002 add\.w r0, r1, r2
- 8f6e: f7ff ef52 blx 8e14 <targetfn-0xec>
+ 8f6e: f7ff ef52 blx 8e14 <targetfn@plt>
8f72: eb01 0002 add\.w r0, r1, r2
- 8f76: f7ff ef4e blx 8e14 <targetfn-0xec>
+ 8f76: f7ff ef4e blx 8e14 <targetfn@plt>
8f7a: eb01 0002 add\.w r0, r1, r2
- 8f7e: f7ff ef4a blx 8e14 <targetfn-0xec>
+ 8f7e: f7ff ef4a blx 8e14 <targetfn@plt>
8f82: eb01 0002 add\.w r0, r1, r2
- 8f86: f7ff ef46 blx 8e14 <targetfn-0xec>
+ 8f86: f7ff ef46 blx 8e14 <targetfn@plt>
8f8a: eb01 0002 add\.w r0, r1, r2
- 8f8e: f7ff ef42 blx 8e14 <targetfn-0xec>
+ 8f8e: f7ff ef42 blx 8e14 <targetfn@plt>
8f92: eb01 0002 add\.w r0, r1, r2
- 8f96: f7ff ef3e blx 8e14 <targetfn-0xec>
+ 8f96: f7ff ef3e blx 8e14 <targetfn@plt>
8f9a: eb01 0002 add\.w r0, r1, r2
- 8f9e: f7ff ef3a blx 8e14 <targetfn-0xec>
+ 8f9e: f7ff ef3a blx 8e14 <targetfn@plt>
8fa2: eb01 0002 add\.w r0, r1, r2
- 8fa6: f7ff ef36 blx 8e14 <targetfn-0xec>
+ 8fa6: f7ff ef36 blx 8e14 <targetfn@plt>
8faa: eb01 0002 add\.w r0, r1, r2
- 8fae: f7ff ef32 blx 8e14 <targetfn-0xec>
+ 8fae: f7ff ef32 blx 8e14 <targetfn@plt>
8fb2: eb01 0002 add\.w r0, r1, r2
- 8fb6: f7ff ef2e blx 8e14 <targetfn-0xec>
+ 8fb6: f7ff ef2e blx 8e14 <targetfn@plt>
8fba: eb01 0002 add\.w r0, r1, r2
- 8fbe: f7ff ef2a blx 8e14 <targetfn-0xec>
+ 8fbe: f7ff ef2a blx 8e14 <targetfn@plt>
8fc2: eb01 0002 add\.w r0, r1, r2
- 8fc6: f7ff ef26 blx 8e14 <targetfn-0xec>
+ 8fc6: f7ff ef26 blx 8e14 <targetfn@plt>
8fca: eb01 0002 add\.w r0, r1, r2
- 8fce: f7ff ef22 blx 8e14 <targetfn-0xec>
+ 8fce: f7ff ef22 blx 8e14 <targetfn@plt>
8fd2: eb01 0002 add\.w r0, r1, r2
- 8fd6: f7ff ef1e blx 8e14 <targetfn-0xec>
+ 8fd6: f7ff ef1e blx 8e14 <targetfn@plt>
8fda: eb01 0002 add\.w r0, r1, r2
- 8fde: f7ff ef1a blx 8e14 <targetfn-0xec>
+ 8fde: f7ff ef1a blx 8e14 <targetfn@plt>
8fe2: eb01 0002 add\.w r0, r1, r2
- 8fe6: f7ff ef16 blx 8e14 <targetfn-0xec>
+ 8fe6: f7ff ef16 blx 8e14 <targetfn@plt>
8fea: eb01 0002 add\.w r0, r1, r2
- 8fee: f7ff ef12 blx 8e14 <targetfn-0xec>
+ 8fee: f7ff ef12 blx 8e14 <targetfn@plt>
8ff2: eb01 0002 add\.w r0, r1, r2
- 8ff6: f7ff ef0e blx 8e14 <targetfn-0xec>
+ 8ff6: f7ff ef0e blx 8e14 <targetfn@plt>
8ffa: eb01 0002 add\.w r0, r1, r2
8ffe: f000 e808 blx 9010 <_start\+0x108>
9002: eb01 0002 add\.w r0, r1, r2
- 9006: f7ff ef06 blx 8e14 <targetfn-0xec>
+ 9006: f7ff ef06 blx 8e14 <targetfn@plt>
900a: 4770 bx lr
900c: f3af 8000 nop\.w
- 9010: eaffff7f b 8e14 <targetfn-0xec>
+ 9010: eaffff7f b 8e14 <targetfn@plt>
diff --git a/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d b/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
index ebb480f0..baad3d07 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00000ffc \.word 0x00000ffc
+00008014 <bar@plt>:
8014: e28fc600 add ip, pc, #0, 12
8018: e28cca00 add ip, ip, #0, 20
801c: e5bcfffc ldr pc, \[ip, #4092\]! ; 0xffc
@@ -25,4 +26,4 @@ Disassembly of section \.text:
9002: 0000 movs r0, r0
9004: 0000 movs r0, r0
9006: 0000 movs r0, r0
- 9008: eafffc01 b 8014 <foo-0xfdc>
+ 9008: eafffc01 b 8014 <bar@plt>
diff --git a/binutils-2.25/ld/testsuite/ld-arm/data-only-map.d b/binutils-2.25/ld/testsuite/ld-arm/data-only-map.d
index 706e7097..fee073a4 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/data-only-map.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/data-only-map.d
@@ -1,5 +1,5 @@
-[^:]*: file format elf32-littlearm.*
+[^:]*: file format elf32-(big|little)arm.*
Disassembly of section \.text:
diff --git a/binutils-2.25/ld/testsuite/ld-arm/export-class.exp b/binutils-2.25/ld/testsuite/ld-arm/export-class.exp
index 8fac9eca..97d3c0a2 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/export-class.exp
+++ b/binutils-2.25/ld/testsuite/ld-arm/export-class.exp
@@ -1,6 +1,6 @@
# Expect script for symbol export classes, ARM variation.
#
-# Copyright 2012 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014 Free Software Foundation, Inc.
#
# This file is part of the GNU Binutils.
#
diff --git a/binutils-2.25/ld/testsuite/ld-arm/farcall-cond-thumb-arm.d b/binutils-2.25/ld/testsuite/ld-arm/farcall-cond-thumb-arm.d
new file mode 100644
index 00000000..0b0172b7
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/farcall-cond-thumb-arm.d
@@ -0,0 +1,18 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00008000 <_start>:
+ 8000: f050 a002 bne.w 58008 <__bar_from_thumb>
+ \.\.\.
+ 58004: f040 8000 bne.w 58008 <__bar_from_thumb>
+
+00058008 <__bar_from_thumb>:
+ 58008: 4778 bx pc
+ 5800a: 46c0 nop ; \(mov r8, r8\)
+ 5800c: ea02fffb b 118000 <bar>
+
+Disassembly of section .foo:
+
+00118000 <bar>:
+ 118000: e12fff1e bx lr
diff --git a/binutils-2.25/ld/testsuite/ld-arm/farcall-cond-thumb-arm.s b/binutils-2.25/ld/testsuite/ld-arm/farcall-cond-thumb-arm.s
new file mode 100644
index 00000000..809f2fcf
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/farcall-cond-thumb-arm.s
@@ -0,0 +1,27 @@
+@ Test to ensure that a Thumb to ARM call exceeding 4Mb generates a stub.
+@ Check that we can generate two types of stub in the same section.
+
+ .global _start
+ .syntax unified
+
+@ We will place the section .text at 0x1c01010.
+
+ .text
+ .thumb_func
+_start:
+ .global bar
+ bne bar
+@ This call is close enough to generate a "short branch" stub
+@ or no stub if blx is available.
+ .space 0x050000
+ bne bar
+
+@ We will place the section .foo at 0x2001014.
+
+ .section .foo, "xa"
+
+ .arm
+ .type bar, %function
+bar:
+ bx lr
+
diff --git a/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-app-v5.d b/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
index 781b9727..74668837 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
@@ -6,15 +6,17 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -25,15 +27,15 @@ Disassembly of section .text:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
.*: eb000008 bl .* <__app_func_veneer>
- .*: ebfffff5 bl .* <_start-0x18>
- .*: ebfffff1 bl .* <_start-0x24>
+ .*: ebfffff5 bl .* <lib_func1@plt>
+ .*: ebfffff1 bl .* <lib_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
.* <app_tfunc_close>:
.*: b500 push {lr}
- .*: f7ff efdc blx .* <_start-0x24>
+ .*: f7ff efdc blx .* <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-app.d b/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-app.d
index b6cc2d0d..6fa799d3 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-app.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-app.d
@@ -1,22 +1,24 @@
tmpdir/farcall-mixed-app: file format elf32-(little|big)arm
-architecture: armv4t, flags 0x00000112:
+architecture: arm.*, flags 0x00000112:
EXEC_P, HAS_SYMS, D_PAGED
start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -27,15 +29,15 @@ Disassembly of section .text:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
.*: eb000008 bl .* <__app_func_veneer>
- .*: ebfffff6 bl .* <_start-0x14>
- .*: ebfffff2 bl .* <_start-0x20>
+ .*: ebfffff6 bl .* <lib_func1@plt>
+ .*: ebfffff2 bl .* <lib_func2@plt\+0x4>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
.* <app_tfunc_close>:
.*: b500 push {lr}
- .*: f7ff ffdb bl 81dc <_start-0x24>
+ .*: f7ff ffdb bl 81dc <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d b/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
index 3be297bc..54f4fab7 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
@@ -1,31 +1,35 @@
tmpdir/farcall-mixed-lib.so: file format elf32-(little|big)arm
-architecture: armv4t, flags 0x00000150:
+architecture: arm.*, flags 0x00000150:
HAS_SYMS, DYNAMIC, D_PAGED
start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x.*>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .* .word .*
+.* <app_func@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]! ; .*
+.* <app_func_weak@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]! ; 0x.*
+.* <lib_func3@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]! ; 0x.*
+.* <lib_func4@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
@@ -37,10 +41,10 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebffff.. bl .* <lib_func1-0x.*>
- .*: ebffff.. bl .* <lib_func1-0x.*>
- .*: ebffff.. bl .* <lib_func1-0x.*>
- .*: ebffff.. bl .* <lib_func1-0x.*>
+ .*: ebffff.. bl .* <app_func@plt\+0x.*>
+ .*: ebffff.. bl .* <app_func_weak@plt\+0x.*>
+ .*: ebffff.. bl .* <lib_func3@plt\+0x.*>
+ .*: ebffff.. bl .* <lib_func4@plt\+0x.*>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
...
diff --git a/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-lib.d b/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-lib.d
index 05578f47..8524e90a 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-lib.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/farcall-mixed-lib.d
@@ -1,25 +1,29 @@
tmpdir/farcall-mixed-lib.so: file format elf32-(little|big)arm
-architecture: armv5t, flags 0x00000150:
+architecture: arm.*, flags 0x00000150:
HAS_SYMS, DYNAMIC, D_PAGED
start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x.*>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <app_func_weak@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func3@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func4@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -29,10 +33,10 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebffff.. bl .* <lib_func1-0x..?>
- .*: ebffff.. bl .* <lib_func1-0x..?>
- .*: ebfffff. bl .* <lib_func1-0x..?>
- .*: ebfffff. bl .* <lib_func1-0x..?>
+ .*: ebffff.. bl .* <app_func@plt>
+ .*: ebffff.. bl .* <app_func_weak@plt>
+ .*: ebfffff. bl .* <lib_func3@plt>
+ .*: ebfffff. bl .* <lib_func4@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
...
diff --git a/binutils-2.25/ld/testsuite/ld-arm/fix-arm1176-off.d b/binutils-2.25/ld/testsuite/ld-arm/fix-arm1176-off.d
index 89f01e2a..26938730 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/fix-arm1176-off.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/fix-arm1176-off.d
@@ -1,5 +1,5 @@
-.*: file format elf32-littlearm.*
+.*: file format elf32-(big|little)arm.*
Disassembly of section .foo:
diff --git a/binutils-2.25/ld/testsuite/ld-arm/fix-arm1176-on.d b/binutils-2.25/ld/testsuite/ld-arm/fix-arm1176-on.d
index 6417a33a..834618e8 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/fix-arm1176-on.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/fix-arm1176-on.d
@@ -1,5 +1,5 @@
-.+: file format elf32-littlearm.*
+.+: file format elf32-(big|little)arm.*
Disassembly of section .foo:
diff --git a/binutils-2.25/ld/testsuite/ld-arm/gc-hidden-1.d b/binutils-2.25/ld/testsuite/ld-arm/gc-hidden-1.d
index fe77abcc..f0f1fd47 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/gc-hidden-1.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/gc-hidden-1.d
@@ -1,9 +1,10 @@
-#target: arm*-*-*eabi*
#source: main.s
#source: gcdfn.s
#source: hidfn.s
#ld: --gc-sections --shared --version-script hideall.ld
#objdump: -dRT
+# This test is only valid on ELF based ports.
+# not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
# See PR ld/13990: a forced-local PLT reference to a
# forced-local symbol is GC'ed, trigging a BFD_ASSERT.
@@ -11,15 +12,15 @@
.*: file format elf32-.*
DYNAMIC SYMBOL TABLE:
-0+124 l d .text 0+ .text
+0+[0-9a-f]+ l d .text 0+ .text
0+ g DO \*ABS\* 0+ NS NS
Disassembly of section .text:
-0+124 <_start>:
- 124: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 128: eb000000 bl 130 <hidfn>
- 12c: e8bd8000 ldmfd sp!, {pc}
+0+[0-9a-f]+ <_start>:
+\s*[0-9a-f]+:\s+e52de004\s+push {lr} ; \(str lr, \[sp, #-4\]!\)
+\s*[0-9a-f]+:\s+eb000000\s+bl [0-9a-f]+ <hidfn>
+\s*[0-9a-f]+:\s+e8bd8000\s+ldmfd sp!, {pc}
-0+130 <hidfn>:
- 130: e8bd8000 ldmfd sp!, {pc}
+0+[0-9a-f]+ <hidfn>:
+\s*[0-9a-f]+:\s+e8bd8000\s+ldmfd sp!, {pc}
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-1.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-1.gd
index ff51d37e..f76f6cd7 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-1.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-1.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
#------------------------------------------------------------------------------
#------ 00010000: foo
#------------------------------------------------------------------------------
- 10000 44332211 00800000 18800000 .*
+ 10000 (44332211 00800000 18800000|11223344 00008000 00008018) .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -13,17 +13,17 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: f1's .igot.plt entry [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11000 00000000 00000000 00000000 00a00000 .*
+ 11000 00000000 00000000 00000000 (00a00000|0000a000) .*
#------------------------------------------------------------------------------
#------ 00011010: f3's .igot.plt pointer to 0xa008 [R_ARM_IRELATIVE]
#------ 00011014: f2's .igot.plt pointer to 0xa004 [R_ARM_IRELATIVE]
#------ 00011018: .got entry for foo
#------ 0001101c: .got entry for f1's .iplt entry
#------------------------------------------------------------------------------
- 11010 08a00000 04a00000 00000100 00900000 .*
+ 11010 (08a00000 04a00000 00000100 00900000|0000a008 0000a004 00010000 00009000) .*
#------------------------------------------------------------------------------
#------ 00011020: .got entry for foo
#------ 00011024: .got entry for f3
#------ 00011028: .got entry for f2
#------------------------------------------------------------------------------
- 11020 00000100 0c900000 18900000 .*
+ 11020 (00000100 0c900000 18900000|00010000 0000900c 00009018) .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-10.dd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-10.dd
index 105b09b9..88bae50a 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-10.dd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-10.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <atf2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf3-0x110>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
+00009014 <atf2@plt>:
9014: 4778 bx pc
9016: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -27,12 +28,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
+00009024 <aaf4@plt>:
9024: e28fc600 add ip, pc, #0, 12
9028: e28cca07 add ip, ip, #28672 ; 0x7000
902c: e5bcffe4 ldr pc, \[ip, #4068\]! ; 0xfe4
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
+00009030 <ttf2@plt>:
9030: 4778 bx pc
9032: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -44,6 +47,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
+00009040 <tbf2@plt>:
9040: 4778 bx pc
9042: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -55,18 +59,21 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
+00009050 <taf2@plt>:
9050: e28fc600 add ip, pc, #0, 12
9054: e28cca07 add ip, ip, #28672 ; 0x7000
9058: e5bcffc4 ldr pc, \[ip, #4036\]! ; 0xfc4
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
+0000905c <aaf2@plt>:
905c: e28fc600 add ip, pc, #0, 12
9060: e28cca07 add ip, ip, #28672 ; 0x7000
9064: e5bcffbc ldr pc, \[ip, #4028\]! ; 0xfbc
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
+00009068 <abf4@plt>:
9068: 4778 bx pc
906a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -78,6 +85,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
+00009078 <tbf4@plt>:
9078: 4778 bx pc
907a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -89,6 +97,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
+00009088 <ttf4@plt>:
9088: 4778 bx pc
908a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -100,6 +109,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
+00009098 <atf4@plt>:
9098: 4778 bx pc
909a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -111,12 +121,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
+000090a8 <taf4@plt>:
90a8: e28fc600 add ip, pc, #0, 12
90ac: e28cca07 add ip, ip, #28672 ; 0x7000
90b0: e5bcff84 ldr pc, \[ip, #3972\]! ; 0xf84
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
+000090b4 <abf2@plt>:
90b4: 4778 bx pc
90b6: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -281,15 +293,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a044: ebfffc1e bl 90c4 <atf3-0x5c>
+ a044: ebfffc1e bl 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a048: eafffc1d b 90c4 <atf3-0x5c>
+ a048: eafffc1d b 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a04c: 0afffc1c beq 90c4 <atf3-0x5c>
+ a04c: 0afffc1c beq 90c4 <abf2@plt\+0x10>
a050: e59f4000 ldr r4, \[pc\] ; a058 <_start\+0x30>
a054: e59f4000 ldr r4, \[pc\] ; a05c <_start\+0x34>
#------------------------------------------------------------------------------
@@ -303,15 +315,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a060: ebfffc22 bl 90f0 <atf3-0x30>
+ a060: ebfffc22 bl 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a064: eafffc21 b 90f0 <atf3-0x30>
+ a064: eafffc21 b 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a068: 0afffc20 beq 90f0 <atf3-0x30>
+ a068: 0afffc20 beq 90f0 <abf2@plt\+0x3c>
a06c: e59f4000 ldr r4, \[pc\] ; a074 <_start\+0x4c>
a070: e59f4000 ldr r4, \[pc\] ; a078 <_start\+0x50>
#------------------------------------------------------------------------------
@@ -325,15 +337,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a07c: ebfffc18 bl 90e4 <atf3-0x3c>
+ a07c: ebfffc18 bl 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a080: eafffc17 b 90e4 <atf3-0x3c>
+ a080: eafffc17 b 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a084: 0afffc16 beq 90e4 <atf3-0x3c>
+ a084: 0afffc16 beq 90e4 <abf2@plt\+0x30>
a088: e59f4000 ldr r4, \[pc\] ; a090 <_start\+0x68>
a08c: e59f4000 ldr r4, \[pc\] ; a094 <_start\+0x6c>
#------------------------------------------------------------------------------
@@ -347,15 +359,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a098: ebfffc1c bl 9110 <atf3-0x10>
+ a098: ebfffc1c bl 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a09c: eafffc1b b 9110 <atf3-0x10>
+ a09c: eafffc1b b 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0a0: 0afffc1a beq 9110 <atf3-0x10>
+ a0a0: 0afffc1a beq 9110 <abf2@plt\+0x5c>
a0a4: e59f4000 ldr r4, \[pc\] ; a0ac <_start\+0x84>
a0a8: e59f4000 ldr r4, \[pc\] ; a0b0 <_start\+0x88>
#------------------------------------------------------------------------------
@@ -369,15 +381,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b4: ebfffbe8 bl 905c <atf3-0xc4>
+ a0b4: ebfffbe8 bl 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b8: eafffbe7 b 905c <atf3-0xc4>
+ a0b8: eafffbe7 b 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0bc: 0afffbe6 beq 905c <atf3-0xc4>
+ a0bc: 0afffbe6 beq 905c <aaf2@plt>
a0c0: e59f4000 ldr r4, \[pc\] ; a0c8 <_start\+0xa0>
a0c4: e59f4000 ldr r4, \[pc\] ; a0cc <_start\+0xa4>
#------------------------------------------------------------------------------
@@ -391,15 +403,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d0: ebfffbde bl 9050 <atf3-0xd0>
+ a0d0: ebfffbde bl 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d4: eafffbdd b 9050 <atf3-0xd0>
+ a0d4: eafffbdd b 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d8: 0afffbdc beq 9050 <atf3-0xd0>
+ a0d8: 0afffbdc beq 9050 <taf2@plt>
a0dc: e59f4000 ldr r4, \[pc\] ; a0e4 <_start\+0xbc>
a0e0: e59f4000 ldr r4, \[pc\] ; a0e8 <_start\+0xc0>
#------------------------------------------------------------------------------
@@ -413,15 +425,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0ec: ebfffbf1 bl 90b8 <atf3-0x68>
+ a0ec: ebfffbf1 bl 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f0: eafffbf0 b 90b8 <atf3-0x68>
+ a0f0: eafffbf0 b 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f4: 0afffbef beq 90b8 <atf3-0x68>
+ a0f4: 0afffbef beq 90b8 <abf2@plt\+0x4>
a0f8: e59f4000 ldr r4, \[pc\] ; a100 <_start\+0xd8>
a0fc: e59f4000 ldr r4, \[pc\] ; a104 <_start\+0xdc>
#------------------------------------------------------------------------------
@@ -435,15 +447,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a108: ebfffbcd bl 9044 <atf3-0xdc>
+ a108: ebfffbcd bl 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a10c: eafffbcc b 9044 <atf3-0xdc>
+ a10c: eafffbcc b 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a110: 0afffbcb beq 9044 <atf3-0xdc>
+ a110: 0afffbcb beq 9044 <tbf2@plt\+0x4>
a114: e59f4000 ldr r4, \[pc\] ; a11c <_start\+0xf4>
a118: e59f4000 ldr r4, \[pc\] ; a120 <_start\+0xf8>
#------------------------------------------------------------------------------
@@ -509,15 +521,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a194: ebfffba2 bl 9024 <atf3-0xfc>
+ a194: ebfffba2 bl 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a198: eafffba1 b 9024 <atf3-0xfc>
+ a198: eafffba1 b 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a19c: 0afffba0 beq 9024 <atf3-0xfc>
+ a19c: 0afffba0 beq 9024 <aaf4@plt>
a1a0: e59f4000 ldr r4, \[pc\] ; a1a8 <_start\+0x180>
a1a4: e59f4000 ldr r4, \[pc\] ; a1ac <_start\+0x184>
#------------------------------------------------------------------------------
@@ -531,15 +543,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b0: ebfffbbc bl 90a8 <atf3-0x78>
+ a1b0: ebfffbbc bl 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b4: eafffbbb b 90a8 <atf3-0x78>
+ a1b4: eafffbbb b 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b8: 0afffbba beq 90a8 <atf3-0x78>
+ a1b8: 0afffbba beq 90a8 <taf4@plt>
a1bc: e59f4000 ldr r4, \[pc\] ; a1c4 <_start\+0x19c>
a1c0: e59f4000 ldr r4, \[pc\] ; a1c8 <_start\+0x1a0>
#------------------------------------------------------------------------------
@@ -553,15 +565,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1cc: ebfffba6 bl 906c <atf3-0xb4>
+ a1cc: ebfffba6 bl 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d0: eafffba5 b 906c <atf3-0xb4>
+ a1d0: eafffba5 b 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d4: 0afffba4 beq 906c <atf3-0xb4>
+ a1d4: 0afffba4 beq 906c <abf4@plt\+0x4>
a1d8: e59f4000 ldr r4, \[pc\] ; a1e0 <_start\+0x1b8>
a1dc: e59f4000 ldr r4, \[pc\] ; a1e4 <_start\+0x1bc>
#------------------------------------------------------------------------------
@@ -575,15 +587,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1e8: ebfffba3 bl 907c <atf3-0xa4>
+ a1e8: ebfffba3 bl 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1ec: eafffba2 b 907c <atf3-0xa4>
+ a1ec: eafffba2 b 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1f0: 0afffba1 beq 907c <atf3-0xa4>
+ a1f0: 0afffba1 beq 907c <tbf4@plt\+0x4>
a1f4: e59f4000 ldr r4, \[pc\] ; a1fc <_start\+0x1d4>
a1f8: e59f4000 ldr r4, \[pc\] ; a200 <_start\+0x1d8>
#------------------------------------------------------------------------------
@@ -612,15 +624,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf1's .iplt entry
#------------------------------------------------------------------------------
- a21c: f7fe ef5a blx 90d4 <atf3-0x4c>
+ a21c: f7fe ef5a blx 90d4 <abf2@plt\+0x20>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a220: f7fe bf56 b\.w 90d0 <atf3-0x50>
+ a220: f7fe bf56 b\.w 90d0 <abf2@plt\+0x1c>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a224: f43e af54 beq\.w 90d0 <atf3-0x50>
+ a224: f43e af54 beq\.w 90d0 <abf2@plt\+0x1c>
a228: 4c00 ldr r4, \[pc, #0\] ; \(a22c <_thumb\+0x28>\)
a22a: 4c01 ldr r4, \[pc, #4\] ; \(a230 <_thumb\+0x2c>\)
#------------------------------------------------------------------------------
@@ -634,15 +646,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf1's .iplt entry
#------------------------------------------------------------------------------
- a234: f7fe ef64 blx 9100 <atf3-0x20>
+ a234: f7fe ef64 blx 9100 <abf2@plt\+0x4c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a238: f7fe bf60 b\.w 90fc <atf3-0x24>
+ a238: f7fe bf60 b\.w 90fc <abf2@plt\+0x48>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a23c: f43e af5e beq\.w 90fc <atf3-0x24>
+ a23c: f43e af5e beq\.w 90fc <abf2@plt\+0x48>
a240: 4c00 ldr r4, \[pc, #0\] ; \(a244 <_thumb\+0x40>\)
a242: 4c01 ldr r4, \[pc, #4\] ; \(a248 <_thumb\+0x44>\)
#------------------------------------------------------------------------------
@@ -656,15 +668,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a24c: f7fe ef4a blx 90e4 <atf3-0x3c>
+ a24c: f7fe ef4a blx 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a250: f7fe bf46 b\.w 90e0 <atf3-0x40>
+ a250: f7fe bf46 b\.w 90e0 <abf2@plt\+0x2c>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a254: f43e af44 beq\.w 90e0 <atf3-0x40>
+ a254: f43e af44 beq\.w 90e0 <abf2@plt\+0x2c>
a258: 4c00 ldr r4, \[pc, #0\] ; \(a25c <_thumb\+0x58>\)
a25a: 4c01 ldr r4, \[pc, #4\] ; \(a260 <_thumb\+0x5c>\)
#------------------------------------------------------------------------------
@@ -678,15 +690,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a264: f7fe ef54 blx 9110 <atf3-0x10>
+ a264: f7fe ef54 blx 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a268: f7fe bf50 b\.w 910c <atf3-0x14>
+ a268: f7fe bf50 b\.w 910c <abf2@plt\+0x58>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a26c: f43e af4e beq\.w 910c <atf3-0x14>
+ a26c: f43e af4e beq\.w 910c <abf2@plt\+0x58>
a270: 4c00 ldr r4, \[pc, #0\] ; \(a274 <_thumb\+0x70>\)
a272: 4c01 ldr r4, \[pc, #4\] ; \(a278 <_thumb\+0x74>\)
#------------------------------------------------------------------------------
@@ -700,15 +712,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf2's .plt entry
#------------------------------------------------------------------------------
- a27c: f7fe eecc blx 9018 <atf3-0x108>
+ a27c: f7fe eecc blx 9018 <atf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a280: f7fe bec8 b\.w 9014 <atf3-0x10c>
+ a280: f7fe bec8 b\.w 9014 <atf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a284: f43e aec6 beq\.w 9014 <atf3-0x10c>
+ a284: f43e aec6 beq\.w 9014 <atf2@plt>
a288: 4c00 ldr r4, \[pc, #0\] ; \(a28c <_thumb\+0x88>\)
a28a: 4c01 ldr r4, \[pc, #4\] ; \(a290 <_thumb\+0x8c>\)
#------------------------------------------------------------------------------
@@ -722,15 +734,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf2's .plt entry
#------------------------------------------------------------------------------
- a294: f7fe eece blx 9034 <atf3-0xec>
+ a294: f7fe eece blx 9034 <ttf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a298: f7fe beca b\.w 9030 <atf3-0xf0>
+ a298: f7fe beca b\.w 9030 <ttf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a29c: f43e aec8 beq\.w 9030 <atf3-0xf0>
+ a29c: f43e aec8 beq\.w 9030 <ttf2@plt>
a2a0: 4c00 ldr r4, \[pc, #0\] ; \(a2a4 <_thumb\+0xa0>\)
a2a2: 4c01 ldr r4, \[pc, #4\] ; \(a2a8 <_thumb\+0xa4>\)
#------------------------------------------------------------------------------
@@ -744,15 +756,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a2ac: f7fe ef04 blx 90b8 <atf3-0x68>
+ a2ac: f7fe ef04 blx 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b0: f7fe bf00 b\.w 90b4 <atf3-0x6c>
+ a2b0: f7fe bf00 b\.w 90b4 <abf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b4: f43e aefe beq\.w 90b4 <atf3-0x6c>
+ a2b4: f43e aefe beq\.w 90b4 <abf2@plt>
a2b8: 4c00 ldr r4, \[pc, #0\] ; \(a2bc <_thumb\+0xb8>\)
a2ba: 4c01 ldr r4, \[pc, #4\] ; \(a2c0 <_thumb\+0xbc>\)
#------------------------------------------------------------------------------
@@ -766,15 +778,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c4: f7fe eebe blx 9044 <atf3-0xdc>
+ a2c4: f7fe eebe blx 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c8: f7fe beba b\.w 9040 <atf3-0xe0>
+ a2c8: f7fe beba b\.w 9040 <tbf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2cc: f43e aeb8 beq\.w 9040 <atf3-0xe0>
+ a2cc: f43e aeb8 beq\.w 9040 <tbf2@plt>
a2d0: 4c00 ldr r4, \[pc, #0\] ; \(a2d4 <_thumb\+0xd0>\)
a2d2: 4c01 ldr r4, \[pc, #4\] ; \(a2d8 <_thumb\+0xd4>\)
#------------------------------------------------------------------------------
@@ -789,11 +801,11 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ thumb entry to atf3
#------------------------------------------------------------------------------
- a2e0: f7fe bf1c b\.w 911c <atf3-0x4>
+ a2e0: f7fe bf1c b\.w 911c <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ thumb entry to atf3
#------------------------------------------------------------------------------
- a2e4: f43e af1a beq\.w 911c <atf3-0x4>
+ a2e4: f43e af1a beq\.w 911c <abf2@plt\+0x68>
a2e8: 4c00 ldr r4, \[pc, #0\] ; \(a2ec <_thumb\+0xe8>\)
a2ea: 4c01 ldr r4, \[pc, #4\] ; \(a2f0 <_thumb\+0xec>\)
#------------------------------------------------------------------------------
@@ -864,15 +876,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf4's .plt entry
#------------------------------------------------------------------------------
- a33c: f7fe eeae blx 909c <atf3-0x84>
+ a33c: f7fe eeae blx 909c <atf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a340: f7fe beaa b\.w 9098 <atf3-0x88>
+ a340: f7fe beaa b\.w 9098 <atf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a344: f43e aea8 beq\.w 9098 <atf3-0x88>
+ a344: f43e aea8 beq\.w 9098 <atf4@plt>
a348: 4c00 ldr r4, \[pc, #0\] ; \(a34c <_thumb\+0x148>\)
a34a: 4c01 ldr r4, \[pc, #4\] ; \(a350 <_thumb\+0x14c>\)
#------------------------------------------------------------------------------
@@ -886,15 +898,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf4's .plt entry
#------------------------------------------------------------------------------
- a354: f7fe ee9a blx 908c <atf3-0x94>
+ a354: f7fe ee9a blx 908c <ttf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a358: f7fe be96 b\.w 9088 <atf3-0x98>
+ a358: f7fe be96 b\.w 9088 <ttf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a35c: f43e ae94 beq\.w 9088 <atf3-0x98>
+ a35c: f43e ae94 beq\.w 9088 <ttf4@plt>
a360: 4c00 ldr r4, \[pc, #0\] ; \(a364 <_thumb\+0x160>\)
a362: 4c01 ldr r4, \[pc, #4\] ; \(a368 <_thumb\+0x164>\)
#------------------------------------------------------------------------------
@@ -908,15 +920,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a36c: f7fe ee7e blx 906c <atf3-0xb4>
+ a36c: f7fe ee7e blx 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a370: f7fe be7a b\.w 9068 <atf3-0xb8>
+ a370: f7fe be7a b\.w 9068 <abf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a374: f43e ae78 beq\.w 9068 <atf3-0xb8>
+ a374: f43e ae78 beq\.w 9068 <abf4@plt>
a378: 4c00 ldr r4, \[pc, #0\] ; \(a37c <_thumb\+0x178>\)
a37a: 4c01 ldr r4, \[pc, #4\] ; \(a380 <_thumb\+0x17c>\)
#------------------------------------------------------------------------------
@@ -930,15 +942,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a384: f7fe ee7a blx 907c <atf3-0xa4>
+ a384: f7fe ee7a blx 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a388: f7fe be76 b\.w 9078 <atf3-0xa8>
+ a388: f7fe be76 b\.w 9078 <tbf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a38c: f43e ae74 beq\.w 9078 <atf3-0xa8>
+ a38c: f43e ae74 beq\.w 9078 <tbf4@plt>
a390: 4c00 ldr r4, \[pc, #0\] ; \(a394 <_thumb\+0x190>\)
a392: 4c01 ldr r4, \[pc, #4\] ; \(a398 <_thumb\+0x194>\)
#------------------------------------------------------------------------------
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-10.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-10.gd
index be3e09fd..b35e10b2 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-10.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-10.gd
@@ -8,88 +8,88 @@ Contents of section \.data:
#------ 00010008: contains PC-relative offset of aaf1's .iplt entry
#------ 0001000c: contains atf1's .iplt entry
#------------------------------------------------------------------------------
- 10000 44332211 c4900000 bc90ffff d4900000 .*
+ 10000 (44332211 c4900000 bc90ffff d4900000|11223344 000090c4 ffff90bc 000090d4) .*
#------------------------------------------------------------------------------
#------ 00010010: contains PC-relative offset of atf1's .iplt entry
#------ 00010014: contains abf1's .iplt entry
#------ 00010018: contains PC-relative offset of abf1's .iplt entry
#------ 0001001c: contains taf1's .iplt entry
#------------------------------------------------------------------------------
- 10010 c490ffff e4900000 cc90ffff f0900000 .*
+ 10010 (c490ffff e4900000 cc90ffff f0900000|ffff90c4 000090e4 ffff90cc 000090f0) .*
#------------------------------------------------------------------------------
#------ 00010020: contains PC-relative offset of taf1's .iplt entry
#------ 00010024: contains ttf1's .iplt entry
#------ 00010028: contains PC-relative offset of ttf1's .iplt entry
#------ 0001002c: contains tbf1's .iplt entry
#------------------------------------------------------------------------------
- 10020 d090ffff 00910000 d890ffff 10910000 .*
+ 10020 (d090ffff 00910000 d890ffff 10910000|ffff90d0 00009100 ffff90d8 00009110) .*
#------------------------------------------------------------------------------
#------ 00010030: contains PC-relative offset of tbf1's .iplt entry
#------ 00010034: contains aaf2's .plt entry
#------ 00010038: contains PC-relative offset of aaf2's .plt entry
#------ 0001003c: contains atf2's .plt entry
#------------------------------------------------------------------------------
- 10030 e090ffff 5c900000 2490ffff 18900000 .*
+ 10030 (e090ffff 5c900000 2490ffff 18900000|ffff90e0 0000905c ffff9024 00009018) .*
#------------------------------------------------------------------------------
#------ 00010040: contains PC-relative offset of atf2's .plt entry
#------ 00010044: contains abf2's .plt entry
#------ 00010048: contains PC-relative offset of abf2's .plt entry
#------ 0001004c: contains taf2's .plt entry
#------------------------------------------------------------------------------
- 10040 d88fffff b8900000 7090ffff 50900000 .*
+ 10040 (d88fffff b8900000 7090ffff 50900000|ffff8fd8 000090b8 ffff9070 00009050) .*
#------------------------------------------------------------------------------
#------ 00010050: contains PC-relative offset of taf2's .plt entry
#------ 00010054: contains ttf2's .plt entry
#------ 00010058: contains PC-relative offset of ttf2's .plt entry
#------ 0001005c: contains tbf2's .plt entry
#------------------------------------------------------------------------------
- 10050 0090ffff 34900000 dc8fffff 44900000 .*
+ 10050 (0090ffff 34900000 dc8fffff 44900000|ffff9000 00009034 ffff8fdc 00009044) .*
#------------------------------------------------------------------------------
#------ 00010060: contains PC-relative offset of tbf2's .plt entry
#------ 00010064: contains aaf3
#------ 00010068: contains PC-relative offset of aaf3
#------ 0001006c: contains atf3
#------------------------------------------------------------------------------
- 10060 e48fffff 68910000 0091ffff 20910000 .*
+ 10060 (e48fffff 68910000 0091ffff 20910000|ffff8fe4 00009168 ffff9100 00009120) .*
#------------------------------------------------------------------------------
#------ 00010070: contains PC-relative offset of atf3
#------ 00010074: contains abf3
#------ 00010078: contains PC-relative offset of abf3
#------ 0001007c: contains taf3
#------------------------------------------------------------------------------
- 10070 b090ffff 30910000 b890ffff 5c910000 .*
+ 10070 (b090ffff 30910000 b890ffff 5c910000|ffff90b0 00009130 ffff90b8 0000915c) .*
#------------------------------------------------------------------------------
#------ 00010080: contains PC-relative offset of taf3
#------ 00010084: contains ttf3
#------ 00010088: contains PC-relative offset of ttf3
#------ 0001008c: contains tbf3
#------------------------------------------------------------------------------
- 10080 dc90ffff 40910000 b890ffff 50910000 .*
+ 10080 (dc90ffff 40910000 b890ffff 50910000|ffff90dc 00009140 ffff90b8 00009150) .*
#------------------------------------------------------------------------------
#------ 00010090: contains PC-relative offset of tbf3
#------ 00010094: contains aaf4's .plt entry
#------ 00010098: contains PC-relative offset of aaf4's .plt entry
#------ 0001009c: contains atf4's .plt entry
#------------------------------------------------------------------------------
- 10090 c090ffff 24900000 8c8fffff 9c900000 .*
+ 10090 (c090ffff 24900000 8c8fffff 9c900000|ffff90c0 00009024 ffff8f8c 0000909c) .*
#------------------------------------------------------------------------------
#------ 000100a0: contains PC-relative offset of atf4's .plt entry
#------ 000100a4: contains abf4's .plt entry
#------ 000100a8: contains PC-relative offset of abf4's .plt entry
#------ 000100ac: contains taf4's .plt entry
#------------------------------------------------------------------------------
- 100a0 fc8fffff 6c900000 c48fffff a8900000 .*
+ 100a0 (fc8fffff 6c900000 c48fffff a8900000|ffff8ffc 0000906c ffff8fc4 000090a8) .*
#------------------------------------------------------------------------------
#------ 000100b0: contains PC-relative offset of taf4's .plt entry
#------ 000100b4: contains ttf4's .plt entry
#------ 000100b8: contains PC-relative offset of ttf4's .plt entry
#------ 000100bc: contains tbf4's .plt entry
#------------------------------------------------------------------------------
- 100b0 f88fffff 8c900000 d48fffff 7c900000 .*
+ 100b0 (f88fffff 8c900000 d48fffff 7c900000|ffff8ff8 0000908c ffff8fd4 0000907c) .*
#------------------------------------------------------------------------------
#------ 000100c0: contains PC-relative offset of tbf4's .plt entry
#------------------------------------------------------------------------------
- 100c0 bc8fffff .*
+ 100c0 (bc8fffff|ffff8fbc) .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -97,91 +97,91 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: atf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000 .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000) .*
#------------------------------------------------------------------------------
#------ 00011010: aaf4's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011014: ttf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011018: tbf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 0001101c: taf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------------------------------------------------------------------------------
- 11010 00900000 00900000 00900000 00900000 .*
+ 11010 (00900000 00900000 00900000 00900000|00009000 00009000 00009000 00009000) .*
#------------------------------------------------------------------------------
#------ 00011020: aaf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011024: abf4's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011028: tbf4's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 0001102c: ttf4's .got.plt entry [R_ARM_JUMP_SLOT]
#------------------------------------------------------------------------------
- 11020 00900000 00900000 00900000 00900000 .*
+ 11020 (00900000 00900000 00900000 00900000|00009000 00009000 00009000 00009000) .*
#------------------------------------------------------------------------------
#------ 00011030: atf4's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011034: taf4's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011038: abf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 0001103c: aaf1's .igot.plt entry [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11030 00900000 00900000 00900000 00a00000 .*
+ 11030 (00900000 00900000 00900000 00a00000|00009000 00009000 00009000 0000a000) .*
#------------------------------------------------------------------------------
#------ 00011040: atf1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011044: abf1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011048: taf1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001104c: ttf1's .igot.plt entry [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11040 04a00000 08a00000 0da00000 0fa00000 .*
+ 11040 (04a00000 08a00000 0da00000 0fa00000|0000a004 0000a008 0000a00d 0000a00f) .*
#------------------------------------------------------------------------------
#------ 00011050: tbf1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011054: atf3's .igot.plt pointer to 0xa018 [R_ARM_IRELATIVE]
#------ 00011058: abf3's .igot.plt pointer to 0xa01c [R_ARM_IRELATIVE]
#------ 0001105c: ttf3's .igot.plt pointer to 0xa023 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11050 11a00000 18a00000 1ca00000 23a00000 .*
+ 11050 (11a00000 18a00000 1ca00000 23a00000|0000a011 0000a018 0000a01c 0000a023) .*
#------------------------------------------------------------------------------
#------ 00011060: tbf3's .igot.plt pointer to 0xa025 [R_ARM_IRELATIVE]
#------ 00011064: taf3's .igot.plt pointer to 0xa021 [R_ARM_IRELATIVE]
#------ 00011068: aaf3's .igot.plt pointer to 0xa014 [R_ARM_IRELATIVE]
#------ 0001106c: .got entry for foo
#------------------------------------------------------------------------------
- 11060 25a00000 21a00000 14a00000 00000100 .*
+ 11060 (25a00000 21a00000 14a00000 00000100|0000a025 0000a021 0000a014 00010000) .*
#------------------------------------------------------------------------------
#------ 00011070: .got entry for aaf1's .iplt entry
#------ 00011074: .got entry for atf1's .iplt entry
#------ 00011078: .got entry for abf1's .iplt entry
#------ 0001107c: .got entry for taf1's .iplt entry
#------------------------------------------------------------------------------
- 11070 c4900000 d4900000 e4900000 f0900000 .*
+ 11070 (c4900000 d4900000 e4900000 f0900000|000090c4 000090d4 000090e4 000090f0) .*
#------------------------------------------------------------------------------
#------ 00011080: .got entry for ttf1's .iplt entry
#------ 00011084: .got entry for tbf1's .iplt entry
#------ 00011088: .got entry for foo
#------ 0001108c: .got entry for atf2 [R_ARM_GLOB_DAT]
#------------------------------------------------------------------------------
- 11080 00910000 10910000 00000100 00000000 .*
+ 11080 (00910000 10910000 00000100|00009100 00009110 00010000) 00000000 .*
#------------------------------------------------------------------------------
#------ 00011090: .got entry for aaf4 [R_ARM_GLOB_DAT]
#------ 00011094: .got entry for ttf2 [R_ARM_GLOB_DAT]
#------ 00011098: .got entry for tbf2 [R_ARM_GLOB_DAT]
#------ 0001109c: .got entry for atf3
#------------------------------------------------------------------------------
- 11090 00000000 00000000 00000000 20910000 .*
+ 11090 00000000 00000000 00000000 (20910000|00009120) .*
#------------------------------------------------------------------------------
#------ 000110a0: .got entry for abf3
#------ 000110a4: .got entry for taf2 [R_ARM_GLOB_DAT]
#------ 000110a8: .got entry for aaf2 [R_ARM_GLOB_DAT]
#------ 000110ac: .got entry for ttf3
#------------------------------------------------------------------------------
- 110a0 30910000 00000000 00000000 40910000 .*
+ 110a0 (30910000 00000000 00000000 40910000|00009130 00000000 00000000 00009140) .*
#------------------------------------------------------------------------------
#------ 000110b0: .got entry for tbf3
#------ 000110b4: .got entry for taf3
#------ 000110b8: .got entry for abf4 [R_ARM_GLOB_DAT]
#------ 000110bc: .got entry for tbf4 [R_ARM_GLOB_DAT]
#------------------------------------------------------------------------------
- 110b0 50910000 5c910000 00000000 00000000 .*
+ 110b0 (50910000 5c910000|00009150 0000915c) 00000000 00000000 .*
#------------------------------------------------------------------------------
#------ 000110c0: .got entry for ttf4 [R_ARM_GLOB_DAT]
#------ 000110c4: .got entry for aaf3
#------ 000110c8: .got entry for atf4 [R_ARM_GLOB_DAT]
#------ 000110cc: .got entry for taf4 [R_ARM_GLOB_DAT]
#------------------------------------------------------------------------------
- 110c0 00000000 68910000 00000000 00000000 .*
+ 110c0 00000000 (68910000|00009168) 00000000 00000000 .*
#------------------------------------------------------------------------------
#------ 000110d0: .got entry for abf2 [R_ARM_GLOB_DAT]
#------------------------------------------------------------------------------
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-11.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-11.gd
index aea15830..b62524c7 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-11.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-11.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
#------------------------------------------------------------------------------
#------ 00010000: foo
#------------------------------------------------------------------------------
- 10000 44332211 00800000 30800000 .*
+ 10000 (44332211 00800000 30800000|11223344 00008000 00008030) .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -13,17 +13,17 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: .got entry for foo
#------------------------------------------------------------------------------
- 11000 00000000 00000000 00000000 00000100 .*
+ 11000 00000000 00000000 00000000 (00000100|00010000) .*
#------------------------------------------------------------------------------
#------ 00011010: .got entry for f1 [R_ARM_IRELATIVE]
#------ 00011014: .got entry for f1t [R_ARM_IRELATIVE]
#------ 00011018: .got entry for foo
#------ 0001101c: .got entry for f2t [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11010 00a00000 0da00000 00000100 0fa00000 .*
+ 11010 (00a00000 0da00000 00000100 0fa00000|0000a000 0000a00d 00010000 0000a00f) .*
#------------------------------------------------------------------------------
#------ 00011020: .got entry for f3 [R_ARM_IRELATIVE]
#------ 00011024: .got entry for f2 [R_ARM_IRELATIVE]
#------ 00011028: .got entry for f3t [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11020 08a00000 04a00000 11a00000 .*
+ 11020 (08a00000 04a00000 11a00000|0000a008 0000a004 0000a011) .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-12.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-12.gd
index 721c3154..7f1c0ef0 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-12.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-12.gd
@@ -8,14 +8,14 @@ Contents of section \.data:
#------ 00010008: f2 [R_ARM_ABS32]
#------ 0001000c: contains f3 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10000 44332211 00a00000 00000000 08a00000 .*
+ 10000 (44332211 00a00000 00000000 08a00000|11223344 0000a000 00000000 0000a008) .*
#------------------------------------------------------------------------------
#------ 00010010: contains f1t [R_ARM_IRELATIVE]
#------ 00010014: f2t [R_ARM_ABS32]
#------ 00010018: contains f3t [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10010 0da00000 00000000 11a00000 80800000 .*
- 10020 80800000 .*
+ 10010 (0da00000 00000000 11a00000 80800000|0000a00d 00000000 0000a011 00008080) .*
+ 10020 (80800000|00008080) .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -23,17 +23,17 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: .got entry for foo [R_ARM_RELATIVE]
#------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00000100 .*
+ 11000 (00200100 00000000 00000000 00000100|00012000 00000000 00000000 00010000) .*
#------------------------------------------------------------------------------
#------ 00011010: .got entry for f1 [R_ARM_IRELATIVE]
#------ 00011014: .got entry for f1t [R_ARM_IRELATIVE]
#------ 00011018: .got entry for foo [R_ARM_RELATIVE]
#------ 0001101c: .got entry for f2t [R_ARM_GLOB_DAT]
#------------------------------------------------------------------------------
- 11010 00a00000 0da00000 00000100 00000000 .*
+ 11010 (00a00000 0da00000 00000100|0000a000 0000a00d 00010000) 00000000 .*
#------------------------------------------------------------------------------
#------ 00011020: .got entry for f3 [R_ARM_IRELATIVE]
#------ 00011024: .got entry for f2 [R_ARM_GLOB_DAT]
#------ 00011028: .got entry for f3t [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11020 08a00000 00000000 11a00000 .*
+ 11020 (08a00000 00000000 11a00000|0000a008 00000000 0000a011) .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-13.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-13.gd
index 9b5dbcb8..43f8aad2 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-13.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-13.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
#------------------------------------------------------------------------------
#------ 00010000: foo
#------------------------------------------------------------------------------
- 10000 44332211 30800000 30800000 .*
+ 10000 (44332211 30800000 30800000|11223344 00008030 00008030) .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -13,17 +13,17 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: .got entry for foo
#------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00000100 .*
+ 11000 (00200100 00000000 00000000 00000100|00012000 00000000 00000000 00010000) .*
#------------------------------------------------------------------------------
#------ 00011010: .got entry for f1 [R_ARM_IRELATIVE]
#------ 00011014: .got entry for f1t [R_ARM_IRELATIVE]
#------ 00011018: .got entry for foo
#------ 0001101c: .got entry for f2t [R_ARM_GLOB_DAT]
#------------------------------------------------------------------------------
- 11010 00a00000 09a00000 00000100 00000000 .*
+ 11010 (00a00000 09a00000 00000100 00000000|0000a000 0000a009 00010000 00000000) .*
#------------------------------------------------------------------------------
#------ 00011020: .got entry for f3 [R_ARM_IRELATIVE]
#------ 00011024: .got entry for f2 [R_ARM_GLOB_DAT]
#------ 00011028: .got entry for f3t [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11020 04a00000 00000000 0ba00000 .*
+ 11020 (04a00000 00000000 0ba00000|0000a004 00000000 0000a00b) .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-14.dd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-14.dd
index 861f6877..cbad1c8c 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-14.dd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-14.dd
@@ -4,7 +4,7 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2t@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <__irel_end\+0xff0>
9008: e08fe00e add lr, pc, lr
@@ -16,12 +16,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2t's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2t@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009020 <f2@plt>:
9020: e28fc600 add ip, pc, #0, 12
9024: e28cca07 add ip, ip, #28672 ; 0x7000
9028: e5bcffe8 ldr pc, \[ip, #4072\]! ; 0xfe8
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-14.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-14.gd
index c054e6bb..40479ccb 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-14.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-14.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
#------------------------------------------------------------------------------
#------ 00010000: foo
#------------------------------------------------------------------------------
- 10000 44332211 00800000 20800000 .*
+ 10000 (44332211 00800000 20800000|11223344 00008000 00008020) .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -13,15 +13,15 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: f2t's .got.plt entry [R_ARM_JUMP_SLOT]
#------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000 .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000) .*
#------------------------------------------------------------------------------
#------ 00011010: f2's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011014: f1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011018: f1t's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001101c: f3's .igot.plt pointer to 0xa004 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11010 00900000 00a00000 09a00000 04a00000 .*
+ 11010 (00900000 00a00000 09a00000 04a00000|00009000 0000a000 0000a009 0000a004) .*
#------------------------------------------------------------------------------
#------ 00011020: f3t's .igot.plt pointer to 0xa00b [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11020 0ba00000 .*
+ 11020 (0ba00000|0000a00b) .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-14.rd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-14.rd
index 59ea29bc..9c440928 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-14.rd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-14.rd
@@ -8,5 +8,5 @@ Relocation section '\.rel\.dyn' at offset 0x8000 contains 4 entries:
Relocation section '\.rel\.plt' at offset 0x8020 contains 2 entries:
Offset Info Type Sym\.Value Sym\. Name
-0001100c ......16 R_ARM_JUMP_SLOT 00009014 f2t
-00011010 ......16 R_ARM_JUMP_SLOT 00009020 f2
+0001100c ......16 R_ARM_JUMP_SLOT 00000000 f2t
+00011010 ......16 R_ARM_JUMP_SLOT 00000000 f2
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-15.dd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-15.dd
index d7648410..f23e8e8a 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-15.dd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-15.dd
@@ -4,7 +4,7 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2t@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <__irel_end\+0xff0>
9008: e08fe00e add lr, pc, lr
@@ -16,12 +16,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2t's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2t@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009020 <f2@plt>:
9020: e28fc600 add ip, pc, #0, 12
9024: e28cca07 add ip, ip, #28672 ; 0x7000
9028: e5bcffe8 ldr pc, \[ip, #4072\]! ; 0xfe8
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-15.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-15.gd
index c054e6bb..40479ccb 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-15.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-15.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
#------------------------------------------------------------------------------
#------ 00010000: foo
#------------------------------------------------------------------------------
- 10000 44332211 00800000 20800000 .*
+ 10000 (44332211 00800000 20800000|11223344 00008000 00008020) .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -13,15 +13,15 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: f2t's .got.plt entry [R_ARM_JUMP_SLOT]
#------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000 .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000) .*
#------------------------------------------------------------------------------
#------ 00011010: f2's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011014: f1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011018: f1t's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001101c: f3's .igot.plt pointer to 0xa004 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11010 00900000 00a00000 09a00000 04a00000 .*
+ 11010 (00900000 00a00000 09a00000 04a00000|00009000 0000a000 0000a009 0000a004) .*
#------------------------------------------------------------------------------
#------ 00011020: f3t's .igot.plt pointer to 0xa00b [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11020 0ba00000 .*
+ 11020 (0ba00000|0000a00b) .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-16.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-16.gd
index 7c4e8209..b3a19026 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-16.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-16.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
#------------------------------------------------------------------------------
#------ 00010000: foo
#------------------------------------------------------------------------------
- 10000 44332211 00800000 30800000 .*
+ 10000 (44332211 00800000 30800000|11223344 00008000 00008030) .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -13,15 +13,15 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: f1's .igot.plt entry [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00a00000 .*
+ 11000 (00200100 00000000 00000000 00a00000|00012000 00000000 00000000 0000a000) .*
#------------------------------------------------------------------------------
#------ 00011010: f1t's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011014: f2t's .igot.plt pointer to 0xa00f [R_ARM_IRELATIVE]
#------ 00011018: f3's .igot.plt pointer to 0xa008 [R_ARM_IRELATIVE]
#------ 0001101c: f2's .igot.plt pointer to 0xa004 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11010 0da00000 0fa00000 08a00000 04a00000 .*
+ 11010 (0da00000 0fa00000 08a00000 04a00000|0000a00d 0000a00f 0000a008 0000a004) .*
#------------------------------------------------------------------------------
#------ 00011020: f3t's .igot.plt pointer to 0xa011 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11020 11a00000 .*
+ 11020 (11a00000|0000a011) .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-17.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-17.gd
index dadfc9ee..41e3adf2 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-17.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-17.gd
@@ -6,5 +6,5 @@ Contents of section \.got:
#------ 0001100c: 0xa001 (appfunc1)
#------ 00011010: 0xa003 (appfunc2)
#------------------------------------------------------------------------------
- 11000 00000000 00000000 00000000 01a00000 .*
- 11010 03a00000 .*
+ 11000 00000000 00000000 00000000 (01a00000|0000a001) .*
+ 11010 (03a00000|0000a003) .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-2.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-2.gd
index 0917a75b..864d902b 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-2.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-2.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
#------------------------------------------------------------------------------
#------ 00010000: foo
#------------------------------------------------------------------------------
- 10000 44332211 .*
+ 10000 (44332211|11223344) .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -13,36 +13,36 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: f1's .igot.plt entry [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11000 00000000 00000000 00000000 00a00000 .*
+ 11000 00000000 00000000 00000000 (00a00000|0000a000) .*
#------------------------------------------------------------------------------
#------ 00011010: f2's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011014: f3's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011018: f4's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001101c: f7's .igot.plt pointer to 0xa018 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11010 05a00000 08a00000 0da00000 18a00000 .*
+ 11010 (05a00000 08a00000 0da00000 18a00000|0000a005 0000a008 0000a00d 0000a018) .*
#------------------------------------------------------------------------------
#------ 00011020: f5's .igot.plt pointer to 0xa010 [R_ARM_IRELATIVE]
#------ 00011024: f8's .igot.plt pointer to 0xa01d [R_ARM_IRELATIVE]
#------ 00011028: f6's .igot.plt pointer to 0xa015 [R_ARM_IRELATIVE]
#------ 0001102c: .got entry for foo
#------------------------------------------------------------------------------
- 11020 10a00000 1da00000 15a00000 00000100 .*
+ 11020 (10a00000 1da00000 15a00000 00000100|0000a010 0000a01d 0000a015 00010000) .*
#------------------------------------------------------------------------------
#------ 00011030: .got entry for f1's .iplt entry
#------ 00011034: .got entry for f2's .iplt entry
#------ 00011038: .got entry for f3's .iplt entry
#------ 0001103c: .got entry for f4's .iplt entry
#------------------------------------------------------------------------------
- 11030 00900000 0c900000 1c900000 2c900000 .*
+ 11030 (00900000 0c900000 1c900000 2c900000|00009000 0000900c 0000901c 0000902c) .*
#------------------------------------------------------------------------------
#------ 00011040: .got entry for foo
#------ 00011044: .got entry for f7
#------ 00011048: .got entry for f5
#------ 0001104c: .got entry for f8
#------------------------------------------------------------------------------
- 11040 00000100 3c900000 48900000 58900000 .*
+ 11040 (00000100 3c900000 48900000 58900000|00010000 0000903c 00009048 00009058) .*
#------------------------------------------------------------------------------
#------ 00011050: .got entry for f6
#------------------------------------------------------------------------------
- 11050 64900000 .*
+ 11050 (64900000|00009064) .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-3.dd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-3.dd
index a1fb37a8..b267bf1e 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-3.dd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-3.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
@@ -71,7 +72,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f1's .iplt entry
#------------------------------------------------------------------------------
- a024: ebfffbfd bl 9020 <f1-0xfe0>
+ a024: ebfffbfd bl 9020 <f2@plt\+0xc>
a028: e59f4000 ldr r4, \[pc\] ; a030 <arm\+0x20>
a02c: e59f4000 ldr r4, \[pc\] ; a034 <arm\+0x24>
#------------------------------------------------------------------------------
@@ -85,7 +86,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
- a038: ebfffbf5 bl 9014 <f1-0xfec>
+ a038: ebfffbf5 bl 9014 <f2@plt>
a03c: e59f4000 ldr r4, \[pc\] ; a044 <arm\+0x34>
a040: e59f4000 ldr r4, \[pc\] ; a048 <arm\+0x38>
#------------------------------------------------------------------------------
@@ -99,7 +100,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f3's .iplt entry
#------------------------------------------------------------------------------
- a04c: ebfffbf6 bl 902c <f1-0xfd4>
+ a04c: ebfffbf6 bl 902c <f2@plt\+0x18>
a050: e59f4000 ldr r4, \[pc\] ; a058 <arm\+0x48>
a054: e59f4000 ldr r4, \[pc\] ; a05c <arm\+0x4c>
#------------------------------------------------------------------------------
@@ -113,7 +114,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f4's .iplt entry
#------------------------------------------------------------------------------
- a060: ebfffbf4 bl 9038 <f1-0xfc8>
+ a060: ebfffbf4 bl 9038 <f2@plt\+0x24>
a064: e59f4000 ldr r4, \[pc\] ; a06c <arm\+0x5c>
a068: e59f4000 ldr r4, \[pc\] ; a070 <arm\+0x60>
#------------------------------------------------------------------------------
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-3.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-3.gd
index db7fd422..ef6f2df6 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-3.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-3.gd
@@ -8,20 +8,20 @@ Contents of section \.data:
#------ 00010008: contains PC-relative offset of foo
#------ 0001000c: contains f1 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10000 44332211 00000100 f8ffffff 00a00000 .*
+ 10000 (44332211 00000100 f8ffffff 00a00000|11223344 00010000 fffffff8 0000a000) .*
#------------------------------------------------------------------------------
#------ 00010010: contains PC-relative offset of f1's .iplt entry
#------ 00010014: f2 [R_ARM_ABS32]
#------ 00010018: f2 [R_ARM_REL32]
#------ 0001001c: contains f3 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10010 1090ffff 00000000 00000000 08a00000 .*
+ 10010 (1090ffff 00000000 00000000 08a00000|ffff9010 00000000 00000000 0000a008) .*
#------------------------------------------------------------------------------
#------ 00010020: contains PC-relative offset of f3's .iplt entry
#------ 00010024: f4 [R_ARM_ABS32]
#------ 00010028: contains PC-relative offset of f4's .iplt entry
#------------------------------------------------------------------------------
- 10020 0c90ffff 00000000 1090ffff .*
+ 10020 (0c90ffff 00000000 1090ffff|ffff900c 00000000 ffff9010) .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -29,17 +29,17 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: f2's .got.plt entry [R_ARM_JUMP_SLOT]
#------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000 .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000) .*
#------------------------------------------------------------------------------
#------ 00011010: f1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011014: f3's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011018: f4's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001101c: .got entry for foo [R_ARM_RELATIVE]
#------------------------------------------------------------------------------
- 11010 00a00000 08a00000 0ca00000 00000100 .*
+ 11010 (00a00000 08a00000 0ca00000 00000100|0000a000 0000a008 0000a00c 00010000) .*
#------------------------------------------------------------------------------
#------ 00011020: .got entry for foo [R_ARM_RELATIVE]
#------ 00011024: .got entry for f2 [R_ARM_GLOB_DAT]
#------ 00011028: .got entry for f4 [R_ARM_GLOB_DAT]
#------------------------------------------------------------------------------
- 11020 00000100 00000000 00000000 .*
+ 11020 (00000100|00010000) 00000000 00000000 .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-4.dd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-4.dd
index f5a4d919..6ce996b2 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-4.dd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-4.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <atf2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <aaf1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
+00009014 <atf2@plt>:
9014: 4778 bx pc
9016: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -27,6 +28,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
+00009024 <ttf2@plt>:
9024: 4778 bx pc
9026: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -38,6 +40,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
+00009034 <tbf2@plt>:
9034: 4778 bx pc
9036: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -49,18 +52,21 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
+00009044 <taf2@plt>:
9044: e28fc600 add ip, pc, #0, 12
9048: e28cca07 add ip, ip, #28672 ; 0x7000
904c: e5bcffcc ldr pc, \[ip, #4044\]! ; 0xfcc
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
+00009050 <aaf2@plt>:
9050: e28fc600 add ip, pc, #0, 12
9054: e28cca07 add ip, ip, #28672 ; 0x7000
9058: e5bcffc4 ldr pc, \[ip, #4036\]! ; 0xfc4
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
+0000905c <abf2@plt>:
905c: 4778 bx pc
905e: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -337,15 +343,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a06c: ebfffbfe bl 906c <aaf1-0xf94>
+ a06c: ebfffbfe bl 906c <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a070: eafffbfd b 906c <aaf1-0xf94>
+ a070: eafffbfd b 906c <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a074: 0afffbfc beq 906c <aaf1-0xf94>
+ a074: 0afffbfc beq 906c <abf2@plt\+0x10>
a078: e59f4000 ldr r4, \[pc\] ; a080 <arm\+0x30>
a07c: e59f4000 ldr r4, \[pc\] ; a084 <arm\+0x34>
#------------------------------------------------------------------------------
@@ -359,15 +365,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a088: ebfffc02 bl 9098 <aaf1-0xf68>
+ a088: ebfffc02 bl 9098 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a08c: eafffc01 b 9098 <aaf1-0xf68>
+ a08c: eafffc01 b 9098 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a090: 0afffc00 beq 9098 <aaf1-0xf68>
+ a090: 0afffc00 beq 9098 <abf2@plt\+0x3c>
a094: e59f4000 ldr r4, \[pc\] ; a09c <arm\+0x4c>
a098: e59f4000 ldr r4, \[pc\] ; a0a0 <arm\+0x50>
#------------------------------------------------------------------------------
@@ -381,15 +387,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a0a4: ebfffbf8 bl 908c <aaf1-0xf74>
+ a0a4: ebfffbf8 bl 908c <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a0a8: eafffbf7 b 908c <aaf1-0xf74>
+ a0a8: eafffbf7 b 908c <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a0ac: 0afffbf6 beq 908c <aaf1-0xf74>
+ a0ac: 0afffbf6 beq 908c <abf2@plt\+0x30>
a0b0: e59f4000 ldr r4, \[pc\] ; a0b8 <arm\+0x68>
a0b4: e59f4000 ldr r4, \[pc\] ; a0bc <arm\+0x6c>
#------------------------------------------------------------------------------
@@ -403,15 +409,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0c0: ebfffbfc bl 90b8 <aaf1-0xf48>
+ a0c0: ebfffbfc bl 90b8 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0c4: eafffbfb b 90b8 <aaf1-0xf48>
+ a0c4: eafffbfb b 90b8 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0c8: 0afffbfa beq 90b8 <aaf1-0xf48>
+ a0c8: 0afffbfa beq 90b8 <abf2@plt\+0x5c>
a0cc: e59f4000 ldr r4, \[pc\] ; a0d4 <arm\+0x84>
a0d0: e59f4000 ldr r4, \[pc\] ; a0d8 <arm\+0x88>
#------------------------------------------------------------------------------
@@ -425,15 +431,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0dc: ebfffbdb bl 9050 <aaf1-0xfb0>
+ a0dc: ebfffbdb bl 9050 <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0e0: eafffbda b 9050 <aaf1-0xfb0>
+ a0e0: eafffbda b 9050 <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0e4: 0afffbd9 beq 9050 <aaf1-0xfb0>
+ a0e4: 0afffbd9 beq 9050 <aaf2@plt>
a0e8: e59f4000 ldr r4, \[pc\] ; a0f0 <arm\+0xa0>
a0ec: e59f4000 ldr r4, \[pc\] ; a0f4 <arm\+0xa4>
#------------------------------------------------------------------------------
@@ -447,15 +453,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0f8: ebfffbd1 bl 9044 <aaf1-0xfbc>
+ a0f8: ebfffbd1 bl 9044 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0fc: eafffbd0 b 9044 <aaf1-0xfbc>
+ a0fc: eafffbd0 b 9044 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a100: 0afffbcf beq 9044 <aaf1-0xfbc>
+ a100: 0afffbcf beq 9044 <taf2@plt>
a104: e59f4000 ldr r4, \[pc\] ; a10c <arm\+0xbc>
a108: e59f4000 ldr r4, \[pc\] ; a110 <arm\+0xc0>
#------------------------------------------------------------------------------
@@ -469,15 +475,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a114: ebfffbd1 bl 9060 <aaf1-0xfa0>
+ a114: ebfffbd1 bl 9060 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a118: eafffbd0 b 9060 <aaf1-0xfa0>
+ a118: eafffbd0 b 9060 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a11c: 0afffbcf beq 9060 <aaf1-0xfa0>
+ a11c: 0afffbcf beq 9060 <abf2@plt\+0x4>
a120: e59f4000 ldr r4, \[pc\] ; a128 <arm\+0xd8>
a124: e59f4000 ldr r4, \[pc\] ; a12c <arm\+0xdc>
#------------------------------------------------------------------------------
@@ -491,15 +497,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a130: ebfffbc0 bl 9038 <aaf1-0xfc8>
+ a130: ebfffbc0 bl 9038 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a134: eafffbbf b 9038 <aaf1-0xfc8>
+ a134: eafffbbf b 9038 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a138: 0afffbbe beq 9038 <aaf1-0xfc8>
+ a138: 0afffbbe beq 9038 <tbf2@plt\+0x4>
a13c: e59f4000 ldr r4, \[pc\] ; a144 <arm\+0xf4>
a140: e59f4000 ldr r4, \[pc\] ; a148 <arm\+0xf8>
#------------------------------------------------------------------------------
@@ -513,15 +519,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a14c: ebfffbfe bl 914c <aaf1-0xeb4>
+ a14c: ebfffbfe bl 914c <abf2@plt\+0xf0>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a150: eafffbfd b 914c <aaf1-0xeb4>
+ a150: eafffbfd b 914c <abf2@plt\+0xf0>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a154: 0afffbfc beq 914c <aaf1-0xeb4>
+ a154: 0afffbfc beq 914c <abf2@plt\+0xf0>
a158: e59f4000 ldr r4, \[pc\] ; a160 <arm\+0x110>
a15c: e59f4000 ldr r4, \[pc\] ; a164 <arm\+0x114>
#------------------------------------------------------------------------------
@@ -535,15 +541,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a168: ebfffbe8 bl 9110 <aaf1-0xef0>
+ a168: ebfffbe8 bl 9110 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a16c: eafffbe7 b 9110 <aaf1-0xef0>
+ a16c: eafffbe7 b 9110 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a170: 0afffbe6 beq 9110 <aaf1-0xef0>
+ a170: 0afffbe6 beq 9110 <abf2@plt\+0xb4>
a174: e59f4000 ldr r4, \[pc\] ; a17c <arm\+0x12c>
a178: e59f4000 ldr r4, \[pc\] ; a180 <arm\+0x130>
#------------------------------------------------------------------------------
@@ -557,15 +563,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a184: ebfffbd6 bl 90e4 <aaf1-0xf1c>
+ a184: ebfffbd6 bl 90e4 <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a188: eafffbd5 b 90e4 <aaf1-0xf1c>
+ a188: eafffbd5 b 90e4 <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a18c: 0afffbd4 beq 90e4 <aaf1-0xf1c>
+ a18c: 0afffbd4 beq 90e4 <abf2@plt\+0x88>
a190: e59f4000 ldr r4, \[pc\] ; a198 <arm\+0x148>
a194: e59f4000 ldr r4, \[pc\] ; a19c <arm\+0x14c>
#------------------------------------------------------------------------------
@@ -579,15 +585,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a1a0: ebfffbd7 bl 9104 <aaf1-0xefc>
+ a1a0: ebfffbd7 bl 9104 <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a1a4: eafffbd6 b 9104 <aaf1-0xefc>
+ a1a4: eafffbd6 b 9104 <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a1a8: 0afffbd5 beq 9104 <aaf1-0xefc>
+ a1a8: 0afffbd5 beq 9104 <abf2@plt\+0xa8>
a1ac: e59f4000 ldr r4, \[pc\] ; a1b4 <arm\+0x164>
a1b0: e59f4000 ldr r4, \[pc\] ; a1b8 <arm\+0x168>
#------------------------------------------------------------------------------
@@ -601,15 +607,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf4's .iplt entry
#------------------------------------------------------------------------------
- a1bc: ebfffbc0 bl 90c4 <aaf1-0xf3c>
+ a1bc: ebfffbc0 bl 90c4 <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ aaf4's .iplt entry
#------------------------------------------------------------------------------
- a1c0: eafffbbf b 90c4 <aaf1-0xf3c>
+ a1c0: eafffbbf b 90c4 <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ aaf4's .iplt entry
#------------------------------------------------------------------------------
- a1c4: 0afffbbe beq 90c4 <aaf1-0xf3c>
+ a1c4: 0afffbbe beq 90c4 <abf2@plt\+0x68>
a1c8: e59f4000 ldr r4, \[pc\] ; a1d0 <arm\+0x180>
a1cc: e59f4000 ldr r4, \[pc\] ; a1d4 <arm\+0x184>
#------------------------------------------------------------------------------
@@ -623,15 +629,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf4's .iplt entry
#------------------------------------------------------------------------------
- a1d8: ebfffbe2 bl 9168 <aaf1-0xe98>
+ a1d8: ebfffbe2 bl 9168 <abf2@plt\+0x10c>
#------------------------------------------------------------------------------
#------ taf4's .iplt entry
#------------------------------------------------------------------------------
- a1dc: eafffbe1 b 9168 <aaf1-0xe98>
+ a1dc: eafffbe1 b 9168 <abf2@plt\+0x10c>
#------------------------------------------------------------------------------
#------ taf4's .iplt entry
#------------------------------------------------------------------------------
- a1e0: 0afffbe0 beq 9168 <aaf1-0xe98>
+ a1e0: 0afffbe0 beq 9168 <abf2@plt\+0x10c>
a1e4: e59f4000 ldr r4, \[pc\] ; a1ec <arm\+0x19c>
a1e8: e59f4000 ldr r4, \[pc\] ; a1f0 <arm\+0x1a0>
#------------------------------------------------------------------------------
@@ -645,15 +651,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a1f4: ebfffbc9 bl 9120 <aaf1-0xee0>
+ a1f4: ebfffbc9 bl 9120 <abf2@plt\+0xc4>
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a1f8: eafffbc8 b 9120 <aaf1-0xee0>
+ a1f8: eafffbc8 b 9120 <abf2@plt\+0xc4>
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a1fc: 0afffbc7 beq 9120 <aaf1-0xee0>
+ a1fc: 0afffbc7 beq 9120 <abf2@plt\+0xc4>
a200: e59f4000 ldr r4, \[pc\] ; a208 <arm\+0x1b8>
a204: e59f4000 ldr r4, \[pc\] ; a20c <arm\+0x1bc>
#------------------------------------------------------------------------------
@@ -667,15 +673,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a210: ebfffbc6 bl 9130 <aaf1-0xed0>
+ a210: ebfffbc6 bl 9130 <abf2@plt\+0xd4>
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a214: eafffbc5 b 9130 <aaf1-0xed0>
+ a214: eafffbc5 b 9130 <abf2@plt\+0xd4>
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a218: 0afffbc4 beq 9130 <aaf1-0xed0>
+ a218: 0afffbc4 beq 9130 <abf2@plt\+0xd4>
a21c: e59f4000 ldr r4, \[pc\] ; a224 <arm\+0x1d4>
a220: e59f4000 ldr r4, \[pc\] ; a228 <arm\+0x1d8>
#------------------------------------------------------------------------------
@@ -704,15 +710,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf1's .iplt entry
#------------------------------------------------------------------------------
- a244: f7fe ef1a blx 907c <aaf1-0xf84>
+ a244: f7fe ef1a blx 907c <abf2@plt\+0x20>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a248: f7fe bf16 b\.w 9078 <aaf1-0xf88>
+ a248: f7fe bf16 b\.w 9078 <abf2@plt\+0x1c>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a24c: f43e af14 beq\.w 9078 <aaf1-0xf88>
+ a24c: f43e af14 beq\.w 9078 <abf2@plt\+0x1c>
a250: 4c00 ldr r4, \[pc, #0\] ; \(a254 <_thumb\+0x28>\)
a252: 4c01 ldr r4, \[pc, #4\] ; \(a258 <_thumb\+0x2c>\)
#------------------------------------------------------------------------------
@@ -726,15 +732,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf1's .iplt entry
#------------------------------------------------------------------------------
- a25c: f7fe ef24 blx 90a8 <aaf1-0xf58>
+ a25c: f7fe ef24 blx 90a8 <abf2@plt\+0x4c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a260: f7fe bf20 b\.w 90a4 <aaf1-0xf5c>
+ a260: f7fe bf20 b\.w 90a4 <abf2@plt\+0x48>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a264: f43e af1e beq\.w 90a4 <aaf1-0xf5c>
+ a264: f43e af1e beq\.w 90a4 <abf2@plt\+0x48>
a268: 4c00 ldr r4, \[pc, #0\] ; \(a26c <_thumb\+0x40>\)
a26a: 4c01 ldr r4, \[pc, #4\] ; \(a270 <_thumb\+0x44>\)
#------------------------------------------------------------------------------
@@ -748,15 +754,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a274: f7fe ef0a blx 908c <aaf1-0xf74>
+ a274: f7fe ef0a blx 908c <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a278: f7fe bf06 b\.w 9088 <aaf1-0xf78>
+ a278: f7fe bf06 b\.w 9088 <abf2@plt\+0x2c>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a27c: f43e af04 beq\.w 9088 <aaf1-0xf78>
+ a27c: f43e af04 beq\.w 9088 <abf2@plt\+0x2c>
a280: 4c00 ldr r4, \[pc, #0\] ; \(a284 <_thumb\+0x58>\)
a282: 4c01 ldr r4, \[pc, #4\] ; \(a288 <_thumb\+0x5c>\)
#------------------------------------------------------------------------------
@@ -770,15 +776,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a28c: f7fe ef14 blx 90b8 <aaf1-0xf48>
+ a28c: f7fe ef14 blx 90b8 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a290: f7fe bf10 b\.w 90b4 <aaf1-0xf4c>
+ a290: f7fe bf10 b\.w 90b4 <abf2@plt\+0x58>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a294: f43e af0e beq\.w 90b4 <aaf1-0xf4c>
+ a294: f43e af0e beq\.w 90b4 <abf2@plt\+0x58>
a298: 4c00 ldr r4, \[pc, #0\] ; \(a29c <_thumb\+0x70>\)
a29a: 4c01 ldr r4, \[pc, #4\] ; \(a2a0 <_thumb\+0x74>\)
#------------------------------------------------------------------------------
@@ -792,15 +798,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf2's .plt entry
#------------------------------------------------------------------------------
- a2a4: f7fe eeb8 blx 9018 <aaf1-0xfe8>
+ a2a4: f7fe eeb8 blx 9018 <atf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a2a8: f7fe beb4 b\.w 9014 <aaf1-0xfec>
+ a2a8: f7fe beb4 b\.w 9014 <atf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a2ac: f43e aeb2 beq\.w 9014 <aaf1-0xfec>
+ a2ac: f43e aeb2 beq\.w 9014 <atf2@plt>
a2b0: 4c00 ldr r4, \[pc, #0\] ; \(a2b4 <_thumb\+0x88>\)
a2b2: 4c01 ldr r4, \[pc, #4\] ; \(a2b8 <_thumb\+0x8c>\)
#------------------------------------------------------------------------------
@@ -814,15 +820,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf2's .plt entry
#------------------------------------------------------------------------------
- a2bc: f7fe eeb4 blx 9028 <aaf1-0xfd8>
+ a2bc: f7fe eeb4 blx 9028 <ttf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a2c0: f7fe beb0 b\.w 9024 <aaf1-0xfdc>
+ a2c0: f7fe beb0 b\.w 9024 <ttf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a2c4: f43e aeae beq\.w 9024 <aaf1-0xfdc>
+ a2c4: f43e aeae beq\.w 9024 <ttf2@plt>
a2c8: 4c00 ldr r4, \[pc, #0\] ; \(a2cc <_thumb\+0xa0>\)
a2ca: 4c01 ldr r4, \[pc, #4\] ; \(a2d0 <_thumb\+0xa4>\)
#------------------------------------------------------------------------------
@@ -836,15 +842,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a2d4: f7fe eec4 blx 9060 <aaf1-0xfa0>
+ a2d4: f7fe eec4 blx 9060 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2d8: f7fe bec0 b\.w 905c <aaf1-0xfa4>
+ a2d8: f7fe bec0 b\.w 905c <abf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2dc: f43e aebe beq\.w 905c <aaf1-0xfa4>
+ a2dc: f43e aebe beq\.w 905c <abf2@plt>
a2e0: 4c00 ldr r4, \[pc, #0\] ; \(a2e4 <_thumb\+0xb8>\)
a2e2: 4c01 ldr r4, \[pc, #4\] ; \(a2e8 <_thumb\+0xbc>\)
#------------------------------------------------------------------------------
@@ -858,15 +864,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a2ec: f7fe eea4 blx 9038 <aaf1-0xfc8>
+ a2ec: f7fe eea4 blx 9038 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2f0: f7fe bea0 b\.w 9034 <aaf1-0xfcc>
+ a2f0: f7fe bea0 b\.w 9034 <tbf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2f4: f43e ae9e beq\.w 9034 <aaf1-0xfcc>
+ a2f4: f43e ae9e beq\.w 9034 <tbf2@plt>
a2f8: 4c00 ldr r4, \[pc, #0\] ; \(a2fc <_thumb\+0xd0>\)
a2fa: 4c01 ldr r4, \[pc, #4\] ; \(a300 <_thumb\+0xd4>\)
#------------------------------------------------------------------------------
@@ -880,15 +886,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf3's .iplt entry
#------------------------------------------------------------------------------
- a304: f7fe eee6 blx 90d4 <aaf1-0xf2c>
+ a304: f7fe eee6 blx 90d4 <abf2@plt\+0x78>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a308: f7fe bee2 b\.w 90d0 <aaf1-0xf30>
+ a308: f7fe bee2 b\.w 90d0 <abf2@plt\+0x74>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a30c: f43e aee0 beq\.w 90d0 <aaf1-0xf30>
+ a30c: f43e aee0 beq\.w 90d0 <abf2@plt\+0x74>
a310: 4c00 ldr r4, \[pc, #0\] ; \(a314 <_thumb\+0xe8>\)
a312: 4c01 ldr r4, \[pc, #4\] ; \(a318 <_thumb\+0xec>\)
#------------------------------------------------------------------------------
@@ -902,15 +908,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf3's .iplt entry
#------------------------------------------------------------------------------
- a31c: f7fe eeea blx 90f4 <aaf1-0xf0c>
+ a31c: f7fe eeea blx 90f4 <abf2@plt\+0x98>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a320: f7fe bee6 b\.w 90f0 <aaf1-0xf10>
+ a320: f7fe bee6 b\.w 90f0 <abf2@plt\+0x94>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a324: f43e aee4 beq\.w 90f0 <aaf1-0xf10>
+ a324: f43e aee4 beq\.w 90f0 <abf2@plt\+0x94>
a328: 4c00 ldr r4, \[pc, #0\] ; \(a32c <_thumb\+0x100>\)
a32a: 4c01 ldr r4, \[pc, #4\] ; \(a330 <_thumb\+0x104>\)
#------------------------------------------------------------------------------
@@ -924,15 +930,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a334: f7fe eed6 blx 90e4 <aaf1-0xf1c>
+ a334: f7fe eed6 blx 90e4 <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a338: f7fe bed2 b\.w 90e0 <aaf1-0xf20>
+ a338: f7fe bed2 b\.w 90e0 <abf2@plt\+0x84>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a33c: f43e aed0 beq\.w 90e0 <aaf1-0xf20>
+ a33c: f43e aed0 beq\.w 90e0 <abf2@plt\+0x84>
a340: 4c00 ldr r4, \[pc, #0\] ; \(a344 <_thumb\+0x118>\)
a342: 4c01 ldr r4, \[pc, #4\] ; \(a348 <_thumb\+0x11c>\)
#------------------------------------------------------------------------------
@@ -946,15 +952,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a34c: f7fe eeda blx 9104 <aaf1-0xefc>
+ a34c: f7fe eeda blx 9104 <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a350: f7fe bed6 b\.w 9100 <aaf1-0xf00>
+ a350: f7fe bed6 b\.w 9100 <abf2@plt\+0xa4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a354: f43e aed4 beq\.w 9100 <aaf1-0xf00>
+ a354: f43e aed4 beq\.w 9100 <abf2@plt\+0xa4>
a358: 4c00 ldr r4, \[pc, #0\] ; \(a35c <_thumb\+0x130>\)
a35a: 4c01 ldr r4, \[pc, #4\] ; \(a360 <_thumb\+0x134>\)
#------------------------------------------------------------------------------
@@ -968,15 +974,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf4's .iplt entry
#------------------------------------------------------------------------------
- a364: f7fe eefa blx 915c <aaf1-0xea4>
+ a364: f7fe eefa blx 915c <abf2@plt\+0x100>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .iplt entry
#------------------------------------------------------------------------------
- a368: f7fe bef6 b\.w 9158 <aaf1-0xea8>
+ a368: f7fe bef6 b\.w 9158 <abf2@plt\+0xfc>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .iplt entry
#------------------------------------------------------------------------------
- a36c: f43e aef4 beq\.w 9158 <aaf1-0xea8>
+ a36c: f43e aef4 beq\.w 9158 <abf2@plt\+0xfc>
a370: 4c00 ldr r4, \[pc, #0\] ; \(a374 <_thumb\+0x148>\)
a372: 4c01 ldr r4, \[pc, #4\] ; \(a378 <_thumb\+0x14c>\)
#------------------------------------------------------------------------------
@@ -990,15 +996,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf4's .iplt entry
#------------------------------------------------------------------------------
- a37c: f7fe eee0 blx 9140 <aaf1-0xec0>
+ a37c: f7fe eee0 blx 9140 <abf2@plt\+0xe4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .iplt entry
#------------------------------------------------------------------------------
- a380: f7fe bedc b\.w 913c <aaf1-0xec4>
+ a380: f7fe bedc b\.w 913c <abf2@plt\+0xe0>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .iplt entry
#------------------------------------------------------------------------------
- a384: f43e aeda beq\.w 913c <aaf1-0xec4>
+ a384: f43e aeda beq\.w 913c <abf2@plt\+0xe0>
a388: 4c00 ldr r4, \[pc, #0\] ; \(a38c <_thumb\+0x160>\)
a38a: 4c01 ldr r4, \[pc, #4\] ; \(a390 <_thumb\+0x164>\)
#------------------------------------------------------------------------------
@@ -1012,15 +1018,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a394: f7fe eec4 blx 9120 <aaf1-0xee0>
+ a394: f7fe eec4 blx 9120 <abf2@plt\+0xc4>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .iplt entry
#------------------------------------------------------------------------------
- a398: f7fe bec0 b\.w 911c <aaf1-0xee4>
+ a398: f7fe bec0 b\.w 911c <abf2@plt\+0xc0>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .iplt entry
#------------------------------------------------------------------------------
- a39c: f43e aebe beq\.w 911c <aaf1-0xee4>
+ a39c: f43e aebe beq\.w 911c <abf2@plt\+0xc0>
a3a0: 4c00 ldr r4, \[pc, #0\] ; \(a3a4 <_thumb\+0x178>\)
a3a2: 4c01 ldr r4, \[pc, #4\] ; \(a3a8 <_thumb\+0x17c>\)
#------------------------------------------------------------------------------
@@ -1034,15 +1040,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a3ac: f7fe eec0 blx 9130 <aaf1-0xed0>
+ a3ac: f7fe eec0 blx 9130 <abf2@plt\+0xd4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .iplt entry
#------------------------------------------------------------------------------
- a3b0: f7fe bebc b\.w 912c <aaf1-0xed4>
+ a3b0: f7fe bebc b\.w 912c <abf2@plt\+0xd0>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .iplt entry
#------------------------------------------------------------------------------
- a3b4: f43e aeba beq\.w 912c <aaf1-0xed4>
+ a3b4: f43e aeba beq\.w 912c <abf2@plt\+0xd0>
a3b8: 4c00 ldr r4, \[pc, #0\] ; \(a3bc <_thumb\+0x190>\)
a3ba: 4c01 ldr r4, \[pc, #4\] ; \(a3c0 <_thumb\+0x194>\)
#------------------------------------------------------------------------------
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-4.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-4.gd
index f768c687..bb7a8d68 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-4.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-4.gd
@@ -8,28 +8,28 @@ Contents of section \.data:
#------ 00010008: contains PC-relative offset of aaf1's .iplt entry
#------ 0001000c: contains atf1 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10000 44332211 00a00000 6490ffff 04a00000 .*
+ 10000 (44332211 00a00000 6490ffff 04a00000|11223344 0000a000 ffff9064 0000a004) .*
#------------------------------------------------------------------------------
#------ 00010010: contains PC-relative offset of atf1's .iplt entry
#------ 00010014: contains abf1 [R_ARM_IRELATIVE]
#------ 00010018: contains PC-relative offset of abf1's .iplt entry
#------ 0001001c: contains taf1 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10010 6c90ffff 08a00000 7490ffff 0da00000 .*
+ 10010 (6c90ffff 08a00000 7490ffff 0da00000|ffff906c 0000a008 ffff9074 0000a00d) .*
#------------------------------------------------------------------------------
#------ 00010020: contains PC-relative offset of taf1's .iplt entry
#------ 00010024: contains ttf1 [R_ARM_IRELATIVE]
#------ 00010028: contains PC-relative offset of ttf1's .iplt entry
#------ 0001002c: contains tbf1 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10020 7890ffff 0fa00000 8090ffff 11a00000 .*
+ 10020 (7890ffff 0fa00000 8090ffff 11a00000|ffff9078 0000a00f ffff9080 0000a011) .*
#------------------------------------------------------------------------------
#------ 00010030: contains PC-relative offset of tbf1's .iplt entry
#------ 00010034: aaf2 [R_ARM_ABS32]
#------ 00010038: aaf2 [R_ARM_REL32]
#------ 0001003c: atf2 [R_ARM_ABS32]
#------------------------------------------------------------------------------
- 10030 8890ffff 00000000 00000000 00000000 .*
+ 10030 (8890ffff|ffff9088) 00000000 00000000 00000000 .*
#------------------------------------------------------------------------------
#------ 00010040: atf2 [R_ARM_REL32]
#------ 00010044: abf2 [R_ARM_ABS32]
@@ -50,46 +50,46 @@ Contents of section \.data:
#------ 00010068: contains PC-relative offset of aaf3's .iplt entry
#------ 0001006c: contains atf3 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10060 00000000 28a00000 e490ffff 2ca00000 .*
+ 10060 00000000 (28a00000 e490ffff 2ca00000|0000a028 ffff90e4 0000a02c) .*
#------------------------------------------------------------------------------
#------ 00010070: contains PC-relative offset of atf3's .iplt entry
#------ 00010074: contains abf3 [R_ARM_IRELATIVE]
#------ 00010078: contains PC-relative offset of abf3's .iplt entry
#------ 0001007c: contains taf3 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10070 6490ffff 30a00000 6c90ffff 35a00000 .*
+ 10070 (6490ffff 30a00000 6c90ffff 35a00000|ffff9064 0000a030 ffff906c 0000a035) .*
#------------------------------------------------------------------------------
#------ 00010080: contains PC-relative offset of taf3's .iplt entry
#------ 00010084: contains ttf3 [R_ARM_IRELATIVE]
#------ 00010088: contains PC-relative offset of ttf3's .iplt entry
#------ 0001008c: contains tbf3 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10080 9090ffff 37a00000 6c90ffff 39a00000 .*
+ 10080 (9090ffff 37a00000 6c90ffff 39a00000|ffff9090 0000a037 ffff906c 0000a039) .*
#------------------------------------------------------------------------------
#------ 00010090: contains PC-relative offset of tbf3's .iplt entry
#------ 00010094: aaf4 [R_ARM_ABS32]
#------ 00010098: contains PC-relative offset of aaf4's .iplt entry
#------ 0001009c: atf4 [R_ARM_ABS32]
#------------------------------------------------------------------------------
- 10090 7490ffff 00000000 2c90ffff 00000000 .*
+ 10090 (7490ffff 00000000 2c90ffff|ffff9074 00000000 ffff902c) 00000000 .*
#------------------------------------------------------------------------------
#------ 000100a0: contains PC-relative offset of atf4's .iplt entry
#------ 000100a4: abf4 [R_ARM_ABS32]
#------ 000100a8: contains PC-relative offset of abf4's .iplt entry
#------ 000100ac: taf4 [R_ARM_ABS32]
#------------------------------------------------------------------------------
- 100a0 bc90ffff 00000000 7890ffff 00000000 .*
+ 100a0 (bc90ffff 00000000 7890ffff|ffff90bc 00000000 ffff9078) 00000000 .*
#------------------------------------------------------------------------------
#------ 000100b0: contains PC-relative offset of taf4's .iplt entry
#------ 000100b4: ttf4 [R_ARM_ABS32]
#------ 000100b8: contains PC-relative offset of ttf4's .iplt entry
#------ 000100bc: tbf4 [R_ARM_ABS32]
#------------------------------------------------------------------------------
- 100b0 b890ffff 00000000 8890ffff 00000000 .*
+ 100b0 (b890ffff 00000000 8890ffff|ffff90b8 00000000 ffff9088) 00000000 .*
#------------------------------------------------------------------------------
#------ 000100c0: contains PC-relative offset of tbf4's .iplt entry
#------------------------------------------------------------------------------
- 100c0 7090ffff .*
+ 100c0 (7090ffff|ffff9070) .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -97,56 +97,56 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: atf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000 .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000) .*
#------------------------------------------------------------------------------
#------ 00011010: ttf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011014: tbf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011018: taf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 0001101c: aaf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------------------------------------------------------------------------------
- 11010 00900000 00900000 00900000 00900000 .*
+ 11010 (00900000 00900000 00900000 00900000|00009000 00009000 00009000 00009000) .*
#------------------------------------------------------------------------------
#------ 00011020: abf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011024: aaf1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011028: atf1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001102c: abf1's .igot.plt entry [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11020 00900000 00a00000 04a00000 08a00000 .*
+ 11020 (00900000 00a00000 04a00000 08a00000|00009000 0000a000 0000a004 0000a008) .*
#------------------------------------------------------------------------------
#------ 00011030: taf1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011034: ttf1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011038: tbf1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001103c: aaf4's .igot.plt entry [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11030 0da00000 0fa00000 11a00000 3ca00000 .*
+ 11030 (0da00000 0fa00000 11a00000 3ca00000|0000a00d 0000a00f 0000a011 0000a03c) .*
#------------------------------------------------------------------------------
#------ 00011040: atf3's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011044: abf3's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011048: ttf3's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001104c: tbf3's .igot.plt entry [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11040 2ca00000 30a00000 37a00000 39a00000 .*
+ 11040 (2ca00000 30a00000 37a00000 39a00000|0000a02c 0000a030 0000a037 0000a039) .*
#------------------------------------------------------------------------------
#------ 00011050: taf3's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011054: abf4's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011058: tbf4's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001105c: ttf4's .igot.plt entry [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11050 35a00000 44a00000 4da00000 4ba00000 .*
+ 11050 (35a00000 44a00000 4da00000 4ba00000|0000a035 0000a044 0000a04d 0000a04b) .*
#------------------------------------------------------------------------------
#------ 00011060: aaf3's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011064: atf4's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011068: taf4's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001106c: .got entry for foo [R_ARM_RELATIVE]
#------------------------------------------------------------------------------
- 11060 28a00000 40a00000 49a00000 00000100 .*
+ 11060 (28a00000 40a00000 49a00000 00000100|0000a028 0000a040 0000a049 00010000) .*
#------------------------------------------------------------------------------
#------ 00011070: .got entry for foo [R_ARM_RELATIVE]
#------ 00011074: .got entry for atf2 [R_ARM_GLOB_DAT]
#------ 00011078: .got entry for aaf4 [R_ARM_GLOB_DAT]
#------ 0001107c: .got entry for ttf2 [R_ARM_GLOB_DAT]
#------------------------------------------------------------------------------
- 11070 00000100 00000000 00000000 00000000 .*
+ 11070 (00000100|00010000) 00000000 00000000 00000000 .*
#------------------------------------------------------------------------------
#------ 00011080: .got entry for tbf2 [R_ARM_GLOB_DAT]
#------ 00011084: .got entry for taf2 [R_ARM_GLOB_DAT]
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-5.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-5.gd
index 8cd69df5..fba15123 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-5.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-5.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
#------------------------------------------------------------------------------
#------ 00010000: foo
#------------------------------------------------------------------------------
- 10000 44332211 00800000 18800000 .*
+ 10000 (44332211 00800000 18800000|11223344 00008000 00008018) .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -13,11 +13,11 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: f1's .igot.plt entry [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11000 00000000 00000000 00000000 00a00000 .*
+ 11000 00000000 00000000 00000000 (00a00000|0000a000) .*
#------------------------------------------------------------------------------
#------ 00011010: f3's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011014: f2's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011018: .got entry for foo
#------ 0001101c: .got entry for foo
#------------------------------------------------------------------------------
- 11010 08a00000 04a00000 00000100 00000100 .*
+ 11010 (08a00000 04a00000 00000100 00000100|0000a008 0000a004 00010000 00010000) .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-6.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-6.gd
index 45fd9142..649a57b9 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-6.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-6.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
#------------------------------------------------------------------------------
#------ 00010000: foo
#------------------------------------------------------------------------------
- 10000 44332211 00800000 20800000 .*
+ 10000 (44332211 00800000 20800000|11223344 00008000 00008020) .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -13,15 +13,15 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: f3's .igot.plt entry [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11000 00000000 00000000 00000000 08a00000 .*
+ 11000 00000000 00000000 00000000 (08a00000|0000a008) .*
#------------------------------------------------------------------------------
#------ 00011010: f2's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011014: f4's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011018: f1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001101c: .got entry for foo
#------------------------------------------------------------------------------
- 11010 05a00000 0da00000 00a00000 00000100 .*
+ 11010 (05a00000 0da00000 00a00000 00000100|0000a005 0000a00d 0000a000 00010000) .*
#------------------------------------------------------------------------------
#------ 00011020: .got entry for foo
#------------------------------------------------------------------------------
- 11020 00000100 .*
+ 11020 (00000100|00010000) .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-7.dd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-7.dd
index e9a96814..f82fd376 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-7.dd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-7.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,12 +16,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
#------------------------------------------------------------------------------
#------ f4's .plt entry
#------------------------------------------------------------------------------
+00009020 <f4@plt>:
9020: e28fc600 add ip, pc, #0, 12
9024: e28cca07 add ip, ip, #28672 ; 0x7000
9028: e5bcffe8 ldr pc, \[ip, #4072\]! ; 0xfe8
@@ -65,7 +67,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f1's .iplt entry
#------------------------------------------------------------------------------
- a01c: ebfffc02 bl 902c <f1-0xfd4>
+ a01c: ebfffc02 bl 902c <f4@plt\+0xc>
a020: e59f4000 ldr r4, \[pc\] ; a028 <arm\+0x20>
a024: e59f4000 ldr r4, \[pc\] ; a02c <arm\+0x24>
#------------------------------------------------------------------------------
@@ -79,7 +81,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
- a030: ebfffbf7 bl 9014 <f1-0xfec>
+ a030: ebfffbf7 bl 9014 <f2@plt>
a034: e59f4000 ldr r4, \[pc\] ; a03c <arm\+0x34>
a038: e59f4000 ldr r4, \[pc\] ; a040 <arm\+0x38>
#------------------------------------------------------------------------------
@@ -93,7 +95,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f3's .iplt entry
#------------------------------------------------------------------------------
- a044: ebfffbfb bl 9038 <f1-0xfc8>
+ a044: ebfffbfb bl 9038 <f4@plt\+0x18>
a048: e59f4000 ldr r4, \[pc\] ; a050 <arm\+0x48>
a04c: e59f4000 ldr r4, \[pc\] ; a054 <arm\+0x4c>
#------------------------------------------------------------------------------
@@ -107,7 +109,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f4's .plt entry
#------------------------------------------------------------------------------
- a058: ebfffbf0 bl 9020 <f1-0xfe0>
+ a058: ebfffbf0 bl 9020 <f4@plt>
a05c: e59f4000 ldr r4, \[pc\] ; a064 <arm\+0x5c>
a060: e59f4000 ldr r4, \[pc\] ; a068 <arm\+0x60>
#------------------------------------------------------------------------------
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-7.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-7.gd
index a116aafe..3251c459 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-7.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-7.gd
@@ -8,20 +8,20 @@ Contents of section \.data:
#------ 00010008: contains PC-relative offset of foo
#------ 0001000c: contains f1 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10000 44332211 00000100 f8ffffff 00a00000 .*
+ 10000 (44332211 00000100 f8ffffff 00a00000|11223344 00010000 fffffff8 0000a000) .*
#------------------------------------------------------------------------------
#------ 00010010: contains PC-relative offset of f1's .iplt entry
#------ 00010014: f2 [R_ARM_ABS32]
#------ 00010018: f2 [R_ARM_REL32]
#------ 0001001c: contains f3 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10010 1c90ffff 00000000 00000000 04a00000 .*
+ 10010 (1c90ffff 00000000 00000000 04a00000|ffff901c 00000000 00000000 0000a004) .*
#------------------------------------------------------------------------------
#------ 00010020: contains PC-relative offset of f3's .iplt entry
#------ 00010024: f4 [R_ARM_ABS32]
#------ 00010028: f4 [R_ARM_REL32]
#------------------------------------------------------------------------------
- 10020 1890ffff 00000000 00000000 .*
+ 10020 (1890ffff|ffff9018) 00000000 00000000 .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -29,17 +29,17 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: f2's .got.plt entry [R_ARM_JUMP_SLOT]
#------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000 .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000) .*
#------------------------------------------------------------------------------
#------ 00011010: f4's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011014: f1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011018: f3's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001101c: .got entry for foo [R_ARM_RELATIVE]
#------------------------------------------------------------------------------
- 11010 00900000 00a00000 04a00000 00000100 .*
+ 11010 (00900000 00a00000 04a00000 00000100|00009000 0000a000 0000a004 00010000) .*
#------------------------------------------------------------------------------
#------ 00011020: .got entry for foo [R_ARM_RELATIVE]
#------ 00011024: .got entry for f2 [R_ARM_GLOB_DAT]
#------ 00011028: .got entry for f4 [R_ARM_GLOB_DAT]
#------------------------------------------------------------------------------
- 11020 00000100 00000000 00000000 .*
+ 11020 (00000100|00010000) 00000000 00000000 .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-8.dd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-8.dd
index 5b255e2e..3cca17cf 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-8.dd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-8.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <atf2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <aaf1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
+00009014 <atf2@plt>:
9014: 4778 bx pc
9016: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -27,12 +28,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
+00009024 <aaf4@plt>:
9024: e28fc600 add ip, pc, #0, 12
9028: e28cca07 add ip, ip, #28672 ; 0x7000
902c: e5bcffe4 ldr pc, \[ip, #4068\]! ; 0xfe4
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
+00009030 <ttf2@plt>:
9030: 4778 bx pc
9032: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -44,6 +47,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
+00009040 <tbf2@plt>:
9040: 4778 bx pc
9042: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -55,18 +59,21 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
+00009050 <taf2@plt>:
9050: e28fc600 add ip, pc, #0, 12
9054: e28cca07 add ip, ip, #28672 ; 0x7000
9058: e5bcffc4 ldr pc, \[ip, #4036\]! ; 0xfc4
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
+0000905c <aaf2@plt>:
905c: e28fc600 add ip, pc, #0, 12
9060: e28cca07 add ip, ip, #28672 ; 0x7000
9064: e5bcffbc ldr pc, \[ip, #4028\]! ; 0xfbc
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
+00009068 <abf4@plt>:
9068: 4778 bx pc
906a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -78,6 +85,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
+00009078 <tbf4@plt>:
9078: 4778 bx pc
907a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -89,6 +97,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
+00009088 <ttf4@plt>:
9088: 4778 bx pc
908a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -100,6 +109,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
+00009098 <atf4@plt>:
9098: 4778 bx pc
909a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -111,12 +121,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
+000090a8 <taf4@plt>:
90a8: e28fc600 add ip, pc, #0, 12
90ac: e28cca07 add ip, ip, #28672 ; 0x7000
90b0: e5bcff84 ldr pc, \[ip, #3972\]! ; 0xf84
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
+000090b4 <abf2@plt>:
90b4: 4778 bx pc
90b6: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -299,15 +311,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a044: ebfffc1e bl 90c4 <aaf1-0xf3c>
+ a044: ebfffc1e bl 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a048: eafffc1d b 90c4 <aaf1-0xf3c>
+ a048: eafffc1d b 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a04c: 0afffc1c beq 90c4 <aaf1-0xf3c>
+ a04c: 0afffc1c beq 90c4 <abf2@plt\+0x10>
a050: e59f4000 ldr r4, \[pc\] ; a058 <arm\+0x30>
a054: e59f4000 ldr r4, \[pc\] ; a05c <arm\+0x34>
#------------------------------------------------------------------------------
@@ -321,15 +333,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a060: ebfffc22 bl 90f0 <aaf1-0xf10>
+ a060: ebfffc22 bl 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a064: eafffc21 b 90f0 <aaf1-0xf10>
+ a064: eafffc21 b 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a068: 0afffc20 beq 90f0 <aaf1-0xf10>
+ a068: 0afffc20 beq 90f0 <abf2@plt\+0x3c>
a06c: e59f4000 ldr r4, \[pc\] ; a074 <arm\+0x4c>
a070: e59f4000 ldr r4, \[pc\] ; a078 <arm\+0x50>
#------------------------------------------------------------------------------
@@ -343,15 +355,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a07c: ebfffc18 bl 90e4 <aaf1-0xf1c>
+ a07c: ebfffc18 bl 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a080: eafffc17 b 90e4 <aaf1-0xf1c>
+ a080: eafffc17 b 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a084: 0afffc16 beq 90e4 <aaf1-0xf1c>
+ a084: 0afffc16 beq 90e4 <abf2@plt\+0x30>
a088: e59f4000 ldr r4, \[pc\] ; a090 <arm\+0x68>
a08c: e59f4000 ldr r4, \[pc\] ; a094 <arm\+0x6c>
#------------------------------------------------------------------------------
@@ -365,15 +377,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a098: ebfffc1c bl 9110 <aaf1-0xef0>
+ a098: ebfffc1c bl 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a09c: eafffc1b b 9110 <aaf1-0xef0>
+ a09c: eafffc1b b 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0a0: 0afffc1a beq 9110 <aaf1-0xef0>
+ a0a0: 0afffc1a beq 9110 <abf2@plt\+0x5c>
a0a4: e59f4000 ldr r4, \[pc\] ; a0ac <arm\+0x84>
a0a8: e59f4000 ldr r4, \[pc\] ; a0b0 <arm\+0x88>
#------------------------------------------------------------------------------
@@ -387,15 +399,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b4: ebfffbe8 bl 905c <aaf1-0xfa4>
+ a0b4: ebfffbe8 bl 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b8: eafffbe7 b 905c <aaf1-0xfa4>
+ a0b8: eafffbe7 b 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0bc: 0afffbe6 beq 905c <aaf1-0xfa4>
+ a0bc: 0afffbe6 beq 905c <aaf2@plt>
a0c0: e59f4000 ldr r4, \[pc\] ; a0c8 <arm\+0xa0>
a0c4: e59f4000 ldr r4, \[pc\] ; a0cc <arm\+0xa4>
#------------------------------------------------------------------------------
@@ -409,15 +421,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d0: ebfffbde bl 9050 <aaf1-0xfb0>
+ a0d0: ebfffbde bl 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d4: eafffbdd b 9050 <aaf1-0xfb0>
+ a0d4: eafffbdd b 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d8: 0afffbdc beq 9050 <aaf1-0xfb0>
+ a0d8: 0afffbdc beq 9050 <taf2@plt>
a0dc: e59f4000 ldr r4, \[pc\] ; a0e4 <arm\+0xbc>
a0e0: e59f4000 ldr r4, \[pc\] ; a0e8 <arm\+0xc0>
#------------------------------------------------------------------------------
@@ -431,15 +443,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0ec: ebfffbf1 bl 90b8 <aaf1-0xf48>
+ a0ec: ebfffbf1 bl 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f0: eafffbf0 b 90b8 <aaf1-0xf48>
+ a0f0: eafffbf0 b 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f4: 0afffbef beq 90b8 <aaf1-0xf48>
+ a0f4: 0afffbef beq 90b8 <abf2@plt\+0x4>
a0f8: e59f4000 ldr r4, \[pc\] ; a100 <arm\+0xd8>
a0fc: e59f4000 ldr r4, \[pc\] ; a104 <arm\+0xdc>
#------------------------------------------------------------------------------
@@ -453,15 +465,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a108: ebfffbcd bl 9044 <aaf1-0xfbc>
+ a108: ebfffbcd bl 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a10c: eafffbcc b 9044 <aaf1-0xfbc>
+ a10c: eafffbcc b 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a110: 0afffbcb beq 9044 <aaf1-0xfbc>
+ a110: 0afffbcb beq 9044 <tbf2@plt\+0x4>
a114: e59f4000 ldr r4, \[pc\] ; a11c <arm\+0xf4>
a118: e59f4000 ldr r4, \[pc\] ; a120 <arm\+0xf8>
#------------------------------------------------------------------------------
@@ -475,15 +487,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a124: ebfffc0f bl 9168 <aaf1-0xe98>
+ a124: ebfffc0f bl 9168 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a128: eafffc0e b 9168 <aaf1-0xe98>
+ a128: eafffc0e b 9168 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a12c: 0afffc0d beq 9168 <aaf1-0xe98>
+ a12c: 0afffc0d beq 9168 <abf2@plt\+0xb4>
a130: e59f4000 ldr r4, \[pc\] ; a138 <arm\+0x110>
a134: e59f4000 ldr r4, \[pc\] ; a13c <arm\+0x114>
#------------------------------------------------------------------------------
@@ -497,15 +509,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a140: ebfffc05 bl 915c <aaf1-0xea4>
+ a140: ebfffc05 bl 915c <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a144: eafffc04 b 915c <aaf1-0xea4>
+ a144: eafffc04 b 915c <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a148: 0afffc03 beq 915c <aaf1-0xea4>
+ a148: 0afffc03 beq 915c <abf2@plt\+0xa8>
a14c: e59f4000 ldr r4, \[pc\] ; a154 <arm\+0x12c>
a150: e59f4000 ldr r4, \[pc\] ; a158 <arm\+0x130>
#------------------------------------------------------------------------------
@@ -519,15 +531,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a15c: ebfffbf3 bl 9130 <aaf1-0xed0>
+ a15c: ebfffbf3 bl 9130 <abf2@plt\+0x7c>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a160: eafffbf2 b 9130 <aaf1-0xed0>
+ a160: eafffbf2 b 9130 <abf2@plt\+0x7c>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a164: 0afffbf1 beq 9130 <aaf1-0xed0>
+ a164: 0afffbf1 beq 9130 <abf2@plt\+0x7c>
a168: e59f4000 ldr r4, \[pc\] ; a170 <arm\+0x148>
a16c: e59f4000 ldr r4, \[pc\] ; a174 <arm\+0x14c>
#------------------------------------------------------------------------------
@@ -541,15 +553,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a178: ebfffbf4 bl 9150 <aaf1-0xeb0>
+ a178: ebfffbf4 bl 9150 <abf2@plt\+0x9c>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a17c: eafffbf3 b 9150 <aaf1-0xeb0>
+ a17c: eafffbf3 b 9150 <abf2@plt\+0x9c>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a180: 0afffbf2 beq 9150 <aaf1-0xeb0>
+ a180: 0afffbf2 beq 9150 <abf2@plt\+0x9c>
a184: e59f4000 ldr r4, \[pc\] ; a18c <arm\+0x164>
a188: e59f4000 ldr r4, \[pc\] ; a190 <arm\+0x168>
#------------------------------------------------------------------------------
@@ -563,15 +575,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a194: ebfffba2 bl 9024 <aaf1-0xfdc>
+ a194: ebfffba2 bl 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a198: eafffba1 b 9024 <aaf1-0xfdc>
+ a198: eafffba1 b 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a19c: 0afffba0 beq 9024 <aaf1-0xfdc>
+ a19c: 0afffba0 beq 9024 <aaf4@plt>
a1a0: e59f4000 ldr r4, \[pc\] ; a1a8 <arm\+0x180>
a1a4: e59f4000 ldr r4, \[pc\] ; a1ac <arm\+0x184>
#------------------------------------------------------------------------------
@@ -585,15 +597,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b0: ebfffbbc bl 90a8 <aaf1-0xf58>
+ a1b0: ebfffbbc bl 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b4: eafffbbb b 90a8 <aaf1-0xf58>
+ a1b4: eafffbbb b 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b8: 0afffbba beq 90a8 <aaf1-0xf58>
+ a1b8: 0afffbba beq 90a8 <taf4@plt>
a1bc: e59f4000 ldr r4, \[pc\] ; a1c4 <arm\+0x19c>
a1c0: e59f4000 ldr r4, \[pc\] ; a1c8 <arm\+0x1a0>
#------------------------------------------------------------------------------
@@ -607,15 +619,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1cc: ebfffba6 bl 906c <aaf1-0xf94>
+ a1cc: ebfffba6 bl 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d0: eafffba5 b 906c <aaf1-0xf94>
+ a1d0: eafffba5 b 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d4: 0afffba4 beq 906c <aaf1-0xf94>
+ a1d4: 0afffba4 beq 906c <abf4@plt\+0x4>
a1d8: e59f4000 ldr r4, \[pc\] ; a1e0 <arm\+0x1b8>
a1dc: e59f4000 ldr r4, \[pc\] ; a1e4 <arm\+0x1bc>
#------------------------------------------------------------------------------
@@ -629,15 +641,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1e8: ebfffba3 bl 907c <aaf1-0xf84>
+ a1e8: ebfffba3 bl 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1ec: eafffba2 b 907c <aaf1-0xf84>
+ a1ec: eafffba2 b 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1f0: 0afffba1 beq 907c <aaf1-0xf84>
+ a1f0: 0afffba1 beq 907c <tbf4@plt\+0x4>
a1f4: e59f4000 ldr r4, \[pc\] ; a1fc <arm\+0x1d4>
a1f8: e59f4000 ldr r4, \[pc\] ; a200 <arm\+0x1d8>
#------------------------------------------------------------------------------
@@ -666,15 +678,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf1's .iplt entry
#------------------------------------------------------------------------------
- a21c: f7fe ef5a blx 90d4 <aaf1-0xf2c>
+ a21c: f7fe ef5a blx 90d4 <abf2@plt\+0x20>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a220: f7fe bf56 b\.w 90d0 <aaf1-0xf30>
+ a220: f7fe bf56 b\.w 90d0 <abf2@plt\+0x1c>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a224: f43e af54 beq\.w 90d0 <aaf1-0xf30>
+ a224: f43e af54 beq\.w 90d0 <abf2@plt\+0x1c>
a228: 4c00 ldr r4, \[pc, #0\] ; \(a22c <_thumb\+0x28>\)
a22a: 4c01 ldr r4, \[pc, #4\] ; \(a230 <_thumb\+0x2c>\)
#------------------------------------------------------------------------------
@@ -688,15 +700,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf1's .iplt entry
#------------------------------------------------------------------------------
- a234: f7fe ef64 blx 9100 <aaf1-0xf00>
+ a234: f7fe ef64 blx 9100 <abf2@plt\+0x4c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a238: f7fe bf60 b\.w 90fc <aaf1-0xf04>
+ a238: f7fe bf60 b\.w 90fc <abf2@plt\+0x48>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a23c: f43e af5e beq\.w 90fc <aaf1-0xf04>
+ a23c: f43e af5e beq\.w 90fc <abf2@plt\+0x48>
a240: 4c00 ldr r4, \[pc, #0\] ; \(a244 <_thumb\+0x40>\)
a242: 4c01 ldr r4, \[pc, #4\] ; \(a248 <_thumb\+0x44>\)
#------------------------------------------------------------------------------
@@ -710,15 +722,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a24c: f7fe ef4a blx 90e4 <aaf1-0xf1c>
+ a24c: f7fe ef4a blx 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a250: f7fe bf46 b\.w 90e0 <aaf1-0xf20>
+ a250: f7fe bf46 b\.w 90e0 <abf2@plt\+0x2c>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a254: f43e af44 beq\.w 90e0 <aaf1-0xf20>
+ a254: f43e af44 beq\.w 90e0 <abf2@plt\+0x2c>
a258: 4c00 ldr r4, \[pc, #0\] ; \(a25c <_thumb\+0x58>\)
a25a: 4c01 ldr r4, \[pc, #4\] ; \(a260 <_thumb\+0x5c>\)
#------------------------------------------------------------------------------
@@ -732,15 +744,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a264: f7fe ef54 blx 9110 <aaf1-0xef0>
+ a264: f7fe ef54 blx 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a268: f7fe bf50 b\.w 910c <aaf1-0xef4>
+ a268: f7fe bf50 b\.w 910c <abf2@plt\+0x58>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a26c: f43e af4e beq\.w 910c <aaf1-0xef4>
+ a26c: f43e af4e beq\.w 910c <abf2@plt\+0x58>
a270: 4c00 ldr r4, \[pc, #0\] ; \(a274 <_thumb\+0x70>\)
a272: 4c01 ldr r4, \[pc, #4\] ; \(a278 <_thumb\+0x74>\)
#------------------------------------------------------------------------------
@@ -754,15 +766,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf2's .plt entry
#------------------------------------------------------------------------------
- a27c: f7fe eecc blx 9018 <aaf1-0xfe8>
+ a27c: f7fe eecc blx 9018 <atf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a280: f7fe bec8 b\.w 9014 <aaf1-0xfec>
+ a280: f7fe bec8 b\.w 9014 <atf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a284: f43e aec6 beq\.w 9014 <aaf1-0xfec>
+ a284: f43e aec6 beq\.w 9014 <atf2@plt>
a288: 4c00 ldr r4, \[pc, #0\] ; \(a28c <_thumb\+0x88>\)
a28a: 4c01 ldr r4, \[pc, #4\] ; \(a290 <_thumb\+0x8c>\)
#------------------------------------------------------------------------------
@@ -776,15 +788,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf2's .plt entry
#------------------------------------------------------------------------------
- a294: f7fe eece blx 9034 <aaf1-0xfcc>
+ a294: f7fe eece blx 9034 <ttf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a298: f7fe beca b\.w 9030 <aaf1-0xfd0>
+ a298: f7fe beca b\.w 9030 <ttf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a29c: f43e aec8 beq\.w 9030 <aaf1-0xfd0>
+ a29c: f43e aec8 beq\.w 9030 <ttf2@plt>
a2a0: 4c00 ldr r4, \[pc, #0\] ; \(a2a4 <_thumb\+0xa0>\)
a2a2: 4c01 ldr r4, \[pc, #4\] ; \(a2a8 <_thumb\+0xa4>\)
#------------------------------------------------------------------------------
@@ -798,15 +810,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a2ac: f7fe ef04 blx 90b8 <aaf1-0xf48>
+ a2ac: f7fe ef04 blx 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b0: f7fe bf00 b\.w 90b4 <aaf1-0xf4c>
+ a2b0: f7fe bf00 b\.w 90b4 <abf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b4: f43e aefe beq\.w 90b4 <aaf1-0xf4c>
+ a2b4: f43e aefe beq\.w 90b4 <abf2@plt>
a2b8: 4c00 ldr r4, \[pc, #0\] ; \(a2bc <_thumb\+0xb8>\)
a2ba: 4c01 ldr r4, \[pc, #4\] ; \(a2c0 <_thumb\+0xbc>\)
#------------------------------------------------------------------------------
@@ -820,15 +832,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c4: f7fe eebe blx 9044 <aaf1-0xfbc>
+ a2c4: f7fe eebe blx 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c8: f7fe beba b\.w 9040 <aaf1-0xfc0>
+ a2c8: f7fe beba b\.w 9040 <tbf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2cc: f43e aeb8 beq\.w 9040 <aaf1-0xfc0>
+ a2cc: f43e aeb8 beq\.w 9040 <tbf2@plt>
a2d0: 4c00 ldr r4, \[pc, #0\] ; \(a2d4 <_thumb\+0xd0>\)
a2d2: 4c01 ldr r4, \[pc, #4\] ; \(a2d8 <_thumb\+0xd4>\)
#------------------------------------------------------------------------------
@@ -842,15 +854,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf3's .iplt entry
#------------------------------------------------------------------------------
- a2dc: f7fe ef20 blx 9120 <aaf1-0xee0>
+ a2dc: f7fe ef20 blx 9120 <abf2@plt\+0x6c>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a2e0: f7fe bf1c b\.w 911c <aaf1-0xee4>
+ a2e0: f7fe bf1c b\.w 911c <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a2e4: f43e af1a beq\.w 911c <aaf1-0xee4>
+ a2e4: f43e af1a beq\.w 911c <abf2@plt\+0x68>
a2e8: 4c00 ldr r4, \[pc, #0\] ; \(a2ec <_thumb\+0xe8>\)
a2ea: 4c01 ldr r4, \[pc, #4\] ; \(a2f0 <_thumb\+0xec>\)
#------------------------------------------------------------------------------
@@ -864,15 +876,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf3's .iplt entry
#------------------------------------------------------------------------------
- a2f4: f7fe ef24 blx 9140 <aaf1-0xec0>
+ a2f4: f7fe ef24 blx 9140 <abf2@plt\+0x8c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a2f8: f7fe bf20 b\.w 913c <aaf1-0xec4>
+ a2f8: f7fe bf20 b\.w 913c <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a2fc: f43e af1e beq\.w 913c <aaf1-0xec4>
+ a2fc: f43e af1e beq\.w 913c <abf2@plt\+0x88>
a300: 4c00 ldr r4, \[pc, #0\] ; \(a304 <_thumb\+0x100>\)
a302: 4c01 ldr r4, \[pc, #4\] ; \(a308 <_thumb\+0x104>\)
#------------------------------------------------------------------------------
@@ -886,15 +898,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a30c: f7fe ef10 blx 9130 <aaf1-0xed0>
+ a30c: f7fe ef10 blx 9130 <abf2@plt\+0x7c>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a310: f7fe bf0c b\.w 912c <aaf1-0xed4>
+ a310: f7fe bf0c b\.w 912c <abf2@plt\+0x78>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a314: f43e af0a beq\.w 912c <aaf1-0xed4>
+ a314: f43e af0a beq\.w 912c <abf2@plt\+0x78>
a318: 4c00 ldr r4, \[pc, #0\] ; \(a31c <_thumb\+0x118>\)
a31a: 4c01 ldr r4, \[pc, #4\] ; \(a320 <_thumb\+0x11c>\)
#------------------------------------------------------------------------------
@@ -908,15 +920,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a324: f7fe ef14 blx 9150 <aaf1-0xeb0>
+ a324: f7fe ef14 blx 9150 <abf2@plt\+0x9c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a328: f7fe bf10 b\.w 914c <aaf1-0xeb4>
+ a328: f7fe bf10 b\.w 914c <abf2@plt\+0x98>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a32c: f43e af0e beq\.w 914c <aaf1-0xeb4>
+ a32c: f43e af0e beq\.w 914c <abf2@plt\+0x98>
a330: 4c00 ldr r4, \[pc, #0\] ; \(a334 <_thumb\+0x130>\)
a332: 4c01 ldr r4, \[pc, #4\] ; \(a338 <_thumb\+0x134>\)
#------------------------------------------------------------------------------
@@ -930,15 +942,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf4's .plt entry
#------------------------------------------------------------------------------
- a33c: f7fe eeae blx 909c <aaf1-0xf64>
+ a33c: f7fe eeae blx 909c <atf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a340: f7fe beaa b\.w 9098 <aaf1-0xf68>
+ a340: f7fe beaa b\.w 9098 <atf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a344: f43e aea8 beq\.w 9098 <aaf1-0xf68>
+ a344: f43e aea8 beq\.w 9098 <atf4@plt>
a348: 4c00 ldr r4, \[pc, #0\] ; \(a34c <_thumb\+0x148>\)
a34a: 4c01 ldr r4, \[pc, #4\] ; \(a350 <_thumb\+0x14c>\)
#------------------------------------------------------------------------------
@@ -952,15 +964,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf4's .plt entry
#------------------------------------------------------------------------------
- a354: f7fe ee9a blx 908c <aaf1-0xf74>
+ a354: f7fe ee9a blx 908c <ttf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a358: f7fe be96 b\.w 9088 <aaf1-0xf78>
+ a358: f7fe be96 b\.w 9088 <ttf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a35c: f43e ae94 beq\.w 9088 <aaf1-0xf78>
+ a35c: f43e ae94 beq\.w 9088 <ttf4@plt>
a360: 4c00 ldr r4, \[pc, #0\] ; \(a364 <_thumb\+0x160>\)
a362: 4c01 ldr r4, \[pc, #4\] ; \(a368 <_thumb\+0x164>\)
#------------------------------------------------------------------------------
@@ -974,15 +986,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a36c: f7fe ee7e blx 906c <aaf1-0xf94>
+ a36c: f7fe ee7e blx 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a370: f7fe be7a b\.w 9068 <aaf1-0xf98>
+ a370: f7fe be7a b\.w 9068 <abf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a374: f43e ae78 beq\.w 9068 <aaf1-0xf98>
+ a374: f43e ae78 beq\.w 9068 <abf4@plt>
a378: 4c00 ldr r4, \[pc, #0\] ; \(a37c <_thumb\+0x178>\)
a37a: 4c01 ldr r4, \[pc, #4\] ; \(a380 <_thumb\+0x17c>\)
#------------------------------------------------------------------------------
@@ -996,15 +1008,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a384: f7fe ee7a blx 907c <aaf1-0xf84>
+ a384: f7fe ee7a blx 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a388: f7fe be76 b\.w 9078 <aaf1-0xf88>
+ a388: f7fe be76 b\.w 9078 <tbf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a38c: f43e ae74 beq\.w 9078 <aaf1-0xf88>
+ a38c: f43e ae74 beq\.w 9078 <tbf4@plt>
a390: 4c00 ldr r4, \[pc, #0\] ; \(a394 <_thumb\+0x190>\)
a392: 4c01 ldr r4, \[pc, #4\] ; \(a398 <_thumb\+0x194>\)
#------------------------------------------------------------------------------
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-8.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-8.gd
index 7efefa06..356f0422 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-8.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-8.gd
@@ -8,28 +8,28 @@ Contents of section \.data:
#------ 00010008: contains PC-relative offset of aaf1's .iplt entry
#------ 0001000c: contains atf1 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10000 44332211 00a00000 bc90ffff 04a00000 .*
+ 10000 (44332211 00a00000 bc90ffff 04a00000|11223344 0000a000 ffff90bc 0000a004) .*
#------------------------------------------------------------------------------
#------ 00010010: contains PC-relative offset of atf1's .iplt entry
#------ 00010014: contains abf1 [R_ARM_IRELATIVE]
#------ 00010018: contains PC-relative offset of abf1's .iplt entry
#------ 0001001c: contains taf1 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10010 c490ffff 08a00000 cc90ffff 0da00000 .*
+ 10010 (c490ffff 08a00000 cc90ffff 0da00000|ffff90c4 0000a008 ffff90cc 0000a00d) .*
#------------------------------------------------------------------------------
#------ 00010020: contains PC-relative offset of taf1's .iplt entry
#------ 00010024: contains ttf1 [R_ARM_IRELATIVE]
#------ 00010028: contains PC-relative offset of ttf1's .iplt entry
#------ 0001002c: contains tbf1 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10020 d090ffff 0fa00000 d890ffff 11a00000 .*
+ 10020 (d090ffff 0fa00000 d890ffff 11a00000|ffff90d0 0000a00f ffff90d8 0000a011) .*
#------------------------------------------------------------------------------
#------ 00010030: contains PC-relative offset of tbf1's .iplt entry
#------ 00010034: aaf2 [R_ARM_ABS32]
#------ 00010038: aaf2 [R_ARM_REL32]
#------ 0001003c: atf2 [R_ARM_ABS32]
#------------------------------------------------------------------------------
- 10030 e090ffff 00000000 00000000 00000000 .*
+ 10030 (e090ffff|ffff90e0) 00000000 00000000 00000000 .*
#------------------------------------------------------------------------------
#------ 00010040: atf2 [R_ARM_REL32]
#------ 00010044: abf2 [R_ARM_ABS32]
@@ -50,28 +50,28 @@ Contents of section \.data:
#------ 00010068: contains PC-relative offset of aaf3's .iplt entry
#------ 0001006c: contains atf3 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10060 00000000 14a00000 0091ffff 18a00000 .*
+ 10060 00000000 (14a00000 0091ffff 18a00000|0000a014 ffff9100 0000a018) .*
#------------------------------------------------------------------------------
#------ 00010070: contains PC-relative offset of atf3's .iplt entry
#------ 00010074: contains abf3 [R_ARM_IRELATIVE]
#------ 00010078: contains PC-relative offset of abf3's .iplt entry
#------ 0001007c: contains taf3 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10070 b090ffff 1ca00000 b890ffff 21a00000 .*
+ 10070 (b090ffff 1ca00000 b890ffff 21a00000|ffff90b0 0000a01c ffff90b8 0000a021) .*
#------------------------------------------------------------------------------
#------ 00010080: contains PC-relative offset of taf3's .iplt entry
#------ 00010084: contains ttf3 [R_ARM_IRELATIVE]
#------ 00010088: contains PC-relative offset of ttf3's .iplt entry
#------ 0001008c: contains tbf3 [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 10080 dc90ffff 23a00000 b890ffff 25a00000 .*
+ 10080 (dc90ffff 23a00000 b890ffff 25a00000|ffff90dc 0000a023 ffff90b8 0000a025) .*
#------------------------------------------------------------------------------
#------ 00010090: contains PC-relative offset of tbf3's .iplt entry
#------ 00010094: aaf4 [R_ARM_ABS32]
#------ 00010098: aaf4 [R_ARM_REL32]
#------ 0001009c: atf4 [R_ARM_ABS32]
#------------------------------------------------------------------------------
- 10090 c090ffff 00000000 00000000 00000000 .*
+ 10090 (c090ffff|ffff90c0) 00000000 00000000 00000000 .*
#------------------------------------------------------------------------------
#------ 000100a0: atf4 [R_ARM_REL32]
#------ 000100a4: abf4 [R_ARM_ABS32]
@@ -97,56 +97,56 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: atf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000 .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000) .*
#------------------------------------------------------------------------------
#------ 00011010: aaf4's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011014: ttf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011018: tbf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 0001101c: taf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------------------------------------------------------------------------------
- 11010 00900000 00900000 00900000 00900000 .*
+ 11010 (00900000 00900000 00900000 00900000|00009000 00009000 00009000 00009000) .*
#------------------------------------------------------------------------------
#------ 00011020: aaf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011024: abf4's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011028: tbf4's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 0001102c: ttf4's .got.plt entry [R_ARM_JUMP_SLOT]
#------------------------------------------------------------------------------
- 11020 00900000 00900000 00900000 00900000 .*
+ 11020 (00900000 00900000 00900000 00900000|00009000 00009000 00009000 00009000) .*
#------------------------------------------------------------------------------
#------ 00011030: atf4's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011034: taf4's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 00011038: abf2's .got.plt entry [R_ARM_JUMP_SLOT]
#------ 0001103c: aaf1's .igot.plt entry [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11030 00900000 00900000 00900000 00a00000 .*
+ 11030 (00900000 00900000 00900000 00a00000|00009000 00009000 00009000 0000a000) .*
#------------------------------------------------------------------------------
#------ 00011040: atf1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011044: abf1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011048: taf1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001104c: ttf1's .igot.plt entry [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11040 04a00000 08a00000 0da00000 0fa00000 .*
+ 11040 (04a00000 08a00000 0da00000 0fa00000|0000a004 0000a008 0000a00d 0000a00f) .*
#------------------------------------------------------------------------------
#------ 00011050: tbf1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011054: atf3's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011058: abf3's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001105c: ttf3's .igot.plt entry [R_ARM_IRELATIVE]
#------------------------------------------------------------------------------
- 11050 11a00000 18a00000 1ca00000 23a00000 .*
+ 11050 (11a00000 18a00000 1ca00000 23a00000|0000a011 0000a018 0000a01c 0000a023) .*
#------------------------------------------------------------------------------
#------ 00011060: tbf3's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011064: taf3's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011068: aaf3's .igot.plt entry [R_ARM_IRELATIVE]
#------ 0001106c: .got entry for foo [R_ARM_RELATIVE]
#------------------------------------------------------------------------------
- 11060 25a00000 21a00000 14a00000 00000100 .*
+ 11060 (25a00000 21a00000 14a00000 00000100|0000a025 0000a021 0000a014 00010000) .*
#------------------------------------------------------------------------------
#------ 00011070: .got entry for foo [R_ARM_RELATIVE]
#------ 00011074: .got entry for atf2 [R_ARM_GLOB_DAT]
#------ 00011078: .got entry for aaf4 [R_ARM_GLOB_DAT]
#------ 0001107c: .got entry for ttf2 [R_ARM_GLOB_DAT]
#------------------------------------------------------------------------------
- 11070 00000100 00000000 00000000 00000000 .*
+ 11070 (00000100|00010000) 00000000 00000000 00000000 .*
#------------------------------------------------------------------------------
#------ 00011080: .got entry for tbf2 [R_ARM_GLOB_DAT]
#------ 00011084: .got entry for taf2 [R_ARM_GLOB_DAT]
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-9.dd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-9.dd
index 36139d9c..af7ec4b0 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-9.dd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-9.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f3-0x1c>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
@@ -71,7 +72,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f1's .iplt entry
#------------------------------------------------------------------------------
- a034: ebfffbf9 bl 9020 <f3-0xc>
+ a034: ebfffbf9 bl 9020 <f2@plt\+0xc>
a038: e59f400c ldr r4, \[pc, #12\] ; a04c <_start\+0x44>
a03c: e59f400c ldr r4, \[pc, #12\] ; a050 <_start\+0x48>
a040: e59f400c ldr r4, \[pc, #12\] ; a054 <_start\+0x4c>
@@ -100,7 +101,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
- a060: ebfffbeb bl 9014 <f3-0x18>
+ a060: ebfffbeb bl 9014 <f2@plt>
a064: e59f400c ldr r4, \[pc, #12\] ; a078 <_start\+0x70>
a068: e59f400c ldr r4, \[pc, #12\] ; a07c <_start\+0x74>
a06c: e59f400c ldr r4, \[pc, #12\] ; a080 <_start\+0x78>
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-9.gd b/binutils-2.25/ld/testsuite/ld-arm/ifunc-9.gd
index 6f220d1c..54cd830f 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/ifunc-9.gd
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-9.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
#------------------------------------------------------------------------------
#------ 00010000: foo
#------------------------------------------------------------------------------
- 10000 44332211 .*
+ 10000 (44332211|11223344) .*
Contents of section \.got:
#------------------------------------------------------------------------------
#------ 00011000: .got.plt
@@ -13,17 +13,17 @@ Contents of section \.got:
#------ 00011008: reserved .got.plt entry
#------ 0001100c: f2's .got.plt entry [R_ARM_JUMP_SLOT]
#------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000 .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000) .*
#------------------------------------------------------------------------------
#------ 00011010: f1's .igot.plt entry [R_ARM_IRELATIVE]
#------ 00011014: f3's .igot.plt pointer to 0xa004 [R_ARM_IRELATIVE]
#------ 00011018: .got entry for foo
#------ 0001101c: .got entry for f1's .iplt entry
#------------------------------------------------------------------------------
- 11010 00a00000 04a00000 00000100 20900000 .*
+ 11010 (00a00000 04a00000 00000100 20900000|0000a000 0000a004 00010000 00009020) .*
#------------------------------------------------------------------------------
#------ 00011020: .got entry for foo
#------ 00011024: .got entry for f3
#------ 00011028: .got entry for f2 [R_ARM_GLOB_DAT]
#------------------------------------------------------------------------------
- 11020 00000100 2c900000 00000000 .*
+ 11020 (00000100 2c900000|00010000 0000902c) 00000000 .*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-gdesc.r b/binutils-2.25/ld/testsuite/ld-arm/ifunc-gdesc.r
new file mode 100644
index 00000000..20f5ccc3
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-gdesc.r
@@ -0,0 +1,6 @@
+tmpdir/ifunc-gdesc.so: file format elf32-(big|little)arm
+DYNAMIC RELOCATION RECORDS
+OFFSET TYPE VALUE
+0001025c R_ARM_IRELATIVE \*ABS\*
+00010248 R_ARM_TLS_DESC \*ABS\*
+00010250 R_ARM_TLS_DESC \*ABS\*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-gdesc.s b/binutils-2.25/ld/testsuite/ld-arm/ifunc-gdesc.s
new file mode 100644
index 00000000..a07a5d51
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-gdesc.s
@@ -0,0 +1,29 @@
+
+ .arm
+
+foo:
+ bl ifunc1(PLT)
+ ldr r0,1f
+2: bl loc1(tlscall)
+ nop
+1: .word loc1(tlsdesc) + (. - 2b)
+
+ ldr r0,1f
+2: bl loc2(tlscall)
+ nop
+1: .word loc2(tlsdesc) + (. - 2b)
+
+ .type ifunc1,%gnu_indirect_function
+ .global ifunc1
+ifunc1:
+ mov pc,lr
+ .size ifunc1,.-ifunc1
+
+
+ .section .tdata,"awT",%progbits
+ .space 8
+ .type loc1, %object
+loc1: .space 4
+ .type loc2, %object
+loc2: .space 4
+
diff --git a/binutils-2.25/ld/testsuite/ld-arm/ifunc-gdesc.ver b/binutils-2.25/ld/testsuite/ld-arm/ifunc-gdesc.ver
new file mode 100644
index 00000000..a82ffc4e
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/ifunc-gdesc.ver
@@ -0,0 +1,4 @@
+{
+global: foo;
+local: *;
+}; \ No newline at end of file
diff --git a/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long-backward.d b/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long-backward.d
new file mode 100644
index 00000000..ee0709ad
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long-backward.d
@@ -0,0 +1,24 @@
+
+.*: file format.*
+
+
+Disassembly of section destsect:
+
+00008002 <[^>]*>:
+ 8002: f7ff fffe bl 8002 <dest>
+
+Disassembly of section .text:
+
+001080.. <[^>]*>:
+ 1080..: f040 8002 bne.w 108008 <__dest_veneer>
+ 1080..: 0000 movs r0, r0
+ ...
+
+001080.. <[^>]*>:
+ 1080..: b401 push {r0}
+ 1080..: 4802 ldr r0, \[pc, #8\] ; \(108014 <__dest_veneer\+0xc>\)
+ 1080..: 4684 mov ip, r0
+ 1080..: bc01 pop {r0}
+ 1080..: 4760 bx ip
+ 1080..: bf00 nop
+ 1080..: 00008003 .word 0x00008003
diff --git a/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long.d b/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long.d
new file mode 100644
index 00000000..276a24e4
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long.d
@@ -0,0 +1,24 @@
+
+.*: file format.*
+
+
+Disassembly of section destsect:
+
+00108004 <[^>]*>:
+ 108004: f7ff fffe bl 108004 <dest>
+
+Disassembly of section .text:
+
+000080.. <[^>]*>:
+ 80..: (8002f040|f0408002) .word 0x(8002f040|f0408002)
+ 80..: 0000 movs r0, r0
+ ...
+
+000080.. <[^>]*>:
+ 80..: b401 push {r0}
+ 80..: 4802 ldr r0, \[pc, #8\] ; \(80.. <__dest_veneer\+0xc>\)
+ 80..: 4684 mov ip, r0
+ 80..: bc01 pop {r0}
+ 80..: 4760 bx ip
+ 80..: bf00 nop
+ 80..: 00108005 .word 0x00108005
diff --git a/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-short-backward.d b/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-short-backward.d
new file mode 100644
index 00000000..d05425b1
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-short-backward.d
@@ -0,0 +1,13 @@
+
+.*: file format.*
+
+
+Disassembly of section destsect:
+
+00008004 <[^>]*>:
+ 8004: f7ff fffe bl 8004 <dest>
+
+Disassembly of section .text:
+
+001080.. <_start>:
+ 1080..: f440 8000 bne.w 8004 <dest>
diff --git a/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-short.d b/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-short.d
new file mode 100644
index 00000000..08c22122
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond-short.d
@@ -0,0 +1,13 @@
+
+.*: file format.*
+
+
+Disassembly of section destsect:
+
+00108002 <[^>]*>:
+ 108002: f7ff fffe bl 108002 <dest>
+
+Disassembly of section .text:
+
+000080.. <[^>]*>:
+ 80..: f07f afff bne.w 108002 <dest>
diff --git a/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond.s b/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond.s
new file mode 100644
index 00000000..83f969cd
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-cond.s
@@ -0,0 +1,12 @@
+ .text
+ .syntax unified
+ .thumb_func
+ .global _start
+ .type _start,%function
+_start:
+ bne dest
+
+ .section destsect, "x"
+ .thumb_func
+dest:
+ bl dest
diff --git a/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-long.d b/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-long.d
index c69e6883..6bd5652d 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-long.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/jump-reloc-veneers-long.d
@@ -10,7 +10,7 @@ Disassembly of section destsect:
Disassembly of section .text:
000080.. <[^>]*>:
- 80..: b802f000 .word 0xb802f000
+ 80..: (b802f000|f000b802) .word 0x(b802f000|f000b802)
80..: 00000000 andeq r0, r0, r0
000080.. <[^>]*>:
diff --git a/binutils-2.25/ld/testsuite/ld-arm/long-plt-format.d b/binutils-2.25/ld/testsuite/ld-arm/long-plt-format.d
new file mode 100644
index 00000000..b0a1abc2
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/long-plt-format.d
@@ -0,0 +1,16 @@
+.*: file format elf32-.*
+
+
+Disassembly of section .plt:
+
+.* <foo@plt-0x14>:
+ .*: .*
+ .*: .*
+ .*: .*
+ .*: .*
+ .*: .* .word .*
+.* <foo@plt>:
+ .*: .* add ip, pc, #-268435456 ; 0xf0000000
+ .*: .* add ip, ip, #0, 12
+ .*: .* add ip, ip, #0, 20
+ .*: .* ldr pc, [ip, #[0-9]*]! ; 0x.*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/long-plt-format.s b/binutils-2.25/ld/testsuite/ld-arm/long-plt-format.s
new file mode 100644
index 00000000..bb0c3a22
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/long-plt-format.s
@@ -0,0 +1,7 @@
+ .globl _start
+ .type _start,%function
+ .globl foo
+_start:
+ bl foo(PLT)
+ .size _start,.-_start
+
diff --git a/binutils-2.25/ld/testsuite/ld-arm/mixed-app-v5.d b/binutils-2.25/ld/testsuite/ld-arm/mixed-app-v5.d
index 82013f38..1091a800 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/mixed-app-v5.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/mixed-app-v5.d
@@ -1,20 +1,22 @@
tmpdir/mixed-app-v5: file format elf32-(little|big)arm
-architecture: armv4t, flags 0x00000112:
+architecture: arm.*, flags 0x00000112:
EXEC_P, HAS_SYMS, D_PAGED
start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -48,7 +50,7 @@ Disassembly of section .text:
.* <app_tfunc>:
.*: b500 push {lr}
- .*: f7ff efc. blx .* <_start-0x..>
+ .*: f7ff efc. blx .* <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/binutils-2.25/ld/testsuite/ld-arm/mixed-app.d b/binutils-2.25/ld/testsuite/ld-arm/mixed-app.d
index 4de8e57c..5fdd9f42 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/mixed-app.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/mixed-app.d
@@ -1,22 +1,24 @@
tmpdir/mixed-app: file format elf32-(little|big)arm
-architecture: armv4t, flags 0x00000112:
+architecture: arm.*, flags 0x00000112:
EXEC_P, HAS_SYMS, D_PAGED
start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -50,7 +52,7 @@ Disassembly of section .text:
.* <app_tfunc>:
.*: b500 push {lr}
- .*: f7ff ffc. bl .* <_start-0x..>
+ .*: f7ff ffc. bl .* <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/binutils-2.25/ld/testsuite/ld-arm/mixed-lib.d b/binutils-2.25/ld/testsuite/ld-arm/mixed-lib.d
index d3a9ff96..29d29e98 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/mixed-lib.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/mixed-lib.d
@@ -1,17 +1,18 @@
tmpdir/mixed-lib.so: file format elf32-(little|big)arm
-architecture: armv4t, flags 0x00000150:
+architecture: arm.*, flags 0x00000150:
HAS_SYMS, DYNAMIC, D_PAGED
start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x.*>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff. bl .* <lib_func1-0x..?>
+ .*: ebfffff. bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
diff --git a/binutils-2.25/ld/testsuite/ld-arm/pcrel-shared.rd b/binutils-2.25/ld/testsuite/ld-arm/pcrel-shared.rd
new file mode 100644
index 00000000..f371664b
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/pcrel-shared.rd
@@ -0,0 +1,16 @@
+Dynamic section at offset 0x[0-9a-f]+ contains \d+ entries:
+\s+Tag\s+Type\s+Name/Value
+\s*0x[0-9a-f]+ \(HASH\).*
+\s*0x[0-9a-f]+ \(STRTAB\).*
+\s*0x[0-9a-f]+ \(SYMTAB\).*
+\s*0x[0-9a-f]+ \(STRSZ\).*
+\s*0x[0-9a-f]+ \(SYMENT\).*
+# Specifically want *not* to see here:
+# (REL)
+# (RELSZ)
+# (RELENT)
+# (TEXTREL)
+#...
+\s*0x[0-9a-f]+ \(NULL\).*
+
+There are no relocations in this file\.
diff --git a/binutils-2.25/ld/testsuite/ld-arm/pcrel-shared.s b/binutils-2.25/ld/testsuite/ld-arm/pcrel-shared.s
new file mode 100644
index 00000000..a2ad0b23
--- /dev/null
+++ b/binutils-2.25/ld/testsuite/ld-arm/pcrel-shared.s
@@ -0,0 +1,25 @@
+# This tests PR ld/17277, wherein ld -shared for cross-section PC-relative
+# relocs (other than plain R_ARM_REL32, as in data) produce bogus dynamic
+# relocs and TEXTREL markers.
+
+ .syntax unified
+ .arm
+ .arch armv7-a
+
+ .text
+ .globl foo
+ .type foo,%function
+foo: movw r0, #:lower16:symbol - 1f - 8
+ movt r0, #:upper16:symbol - 1f - 8
+1: add r0, pc
+ @ And now a case with a local symbol.
+ movw r0, #:lower16:3f - 2f - 8
+ movt r0, #:upper16:3f - 2f - 8
+2: add r0, pc
+ bx lr
+
+.data
+ .globl symbol
+ .hidden symbol
+symbol: .long 23
+3: .long 17
diff --git a/binutils-2.25/ld/testsuite/ld-arm/reloc-boundaries.d b/binutils-2.25/ld/testsuite/ld-arm/reloc-boundaries.d
index 4bfaf0a5..e71c5aee 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/reloc-boundaries.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/reloc-boundaries.d
@@ -2,5 +2,5 @@
[^:]*: file format elf32-(little|big)arm.*
Contents of section .text:
- [0-9a-f]+ 80ff0080 ffff ......
+ [0-9a-f]+ (80ff0080|80ff8000) ffff ......
#...
diff --git a/binutils-2.25/ld/testsuite/ld-arm/script-type.sym b/binutils-2.25/ld/testsuite/ld-arm/script-type.sym
index 4b54dd63..1623c03d 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/script-type.sym
+++ b/binutils-2.25/ld/testsuite/ld-arm/script-type.sym
@@ -9,7 +9,6 @@ Symbol table '.symtab' contains [0-9]+ entries:
.* 0+10 +0 NOTYPE +LOCAL +DEFAULT +1 \$d
.* 0+14 +0 NOTYPE +LOCAL +DEFAULT +1 \$a
.* 0+20 +0 NOTYPE +LOCAL +DEFAULT +1 \$t
-.* 0+ +0 FILE +LOCAL +DEFAULT +ABS .*
.* 0+10 +0 OBJECT +GLOBAL DEFAULT +1 bar_o
.* 0+21 +0 FUNC +GLOBAL DEFAULT +1 bar_t
.* 0+ +0 FUNC +GLOBAL DEFAULT +1 foo_a
diff --git a/binutils-2.25/ld/testsuite/ld-arm/thumb2-bl-undefweak.d b/binutils-2.25/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
index 5c286bee..c501aa2c 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
@@ -6,4 +6,4 @@
Disassembly of section .text:
.* <foo>:
- +[0-9a-f]+: .... .... bl. [0-9a-f]+ <foo-0x[0-9a-f]+>
+ +[0-9a-f]+: .... .... bl. [0-9a-f]+ <bar@plt>
diff --git a/binutils-2.25/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d b/binutils-2.25/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
index a6907f5e..806f66c6 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
@@ -6,4 +6,4 @@
Disassembly of section .text:
.* <foo>:
- +[0-9a-f]+: ........ bl [0-9a-f]+ <foo-0x[0-9a-f]+>
+ +[0-9a-f]+: ........ bl [0-9a-f]+ <bar@plt>
diff --git a/binutils-2.25/ld/testsuite/ld-arm/tls-app.d b/binutils-2.25/ld/testsuite/ld-arm/tls-app.d
index a88ca7f8..de0cbab9 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/tls-app.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/tls-app.d
@@ -1,6 +1,6 @@
.*: file format elf32-.*arm.*
-architecture: armv4, flags 0x00000112:
+architecture: arm.*, flags 0x00000112:
EXEC_P, HAS_SYMS, D_PAGED
start address 0x000081c8
diff --git a/binutils-2.25/ld/testsuite/ld-arm/tls-descrelax-be32.d b/binutils-2.25/ld/testsuite/ld-arm/tls-descrelax-be32.d
index c1c7fcdc..096723d8 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/tls-descrelax-be32.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/tls-descrelax-be32.d
@@ -1,5 +1,5 @@
.*: file format elf32-.*
-architecture: armv5te, flags 0x[0-9a-f]+:
+architecture: arm.*, flags 0x[0-9a-f]+:
EXEC_P, HAS_SYMS, D_PAGED
start address 0x[0-9a-f]+
diff --git a/binutils-2.25/ld/testsuite/ld-arm/tls-descrelax.d b/binutils-2.25/ld/testsuite/ld-arm/tls-descrelax.d
index 97cbe003..c15c6ee9 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/tls-descrelax.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/tls-descrelax.d
@@ -1,5 +1,5 @@
.*: file format elf32-.*
-architecture: armv5t, flags 0x[0-9a-f]+:
+architecture: arm.*, flags 0x[0-9a-f]+:
EXEC_P, HAS_SYMS, D_PAGED
start address 0x[0-9a-f]+
diff --git a/binutils-2.25/ld/testsuite/ld-arm/tls-descseq.d b/binutils-2.25/ld/testsuite/ld-arm/tls-descseq.d
index d39a891d..85e8150e 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/tls-descseq.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/tls-descseq.d
@@ -1,6 +1,6 @@
tmpdir/tls-lib2inline.so: file format elf32-.*arm
-architecture: armv5t, flags 0x[0-9a-f]+:
+architecture: arm.*, flags 0x[0-9a-f]+:
HAS_SYMS, DYNAMIC, D_PAGED
start address 0x[0-9a-f]+
diff --git a/binutils-2.25/ld/testsuite/ld-arm/tls-gdesc-got.d b/binutils-2.25/ld/testsuite/ld-arm/tls-gdesc-got.d
index 4d7777a3..8f64e417 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/tls-gdesc-got.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/tls-gdesc-got.d
@@ -1,6 +1,6 @@
.*/tls-lib2-got.so: file format elf32-.*arm.*
-architecture: armv4, flags 0x00000150:
+architecture: arm.*, flags 0x00000150:
HAS_SYMS, DYNAMIC, D_PAGED
start address 0x000082.0
diff --git a/binutils-2.25/ld/testsuite/ld-arm/tls-gdesc.d b/binutils-2.25/ld/testsuite/ld-arm/tls-gdesc.d
index 43ad7066..84ba48f7 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/tls-gdesc.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/tls-gdesc.d
@@ -1,6 +1,6 @@
tmpdir/tls-lib2.so: file format elf32-.*arm
-architecture: armv.t, flags 0x[0-9a-f]+:
+architecture: arm.*, flags 0x[0-9a-f]+:
HAS_SYMS, DYNAMIC, D_PAGED
start address 0x[0-9a-f]+
diff --git a/binutils-2.25/ld/testsuite/ld-arm/tls-gdierelax.d b/binutils-2.25/ld/testsuite/ld-arm/tls-gdierelax.d
index bb450ab6..6f79c809 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/tls-gdierelax.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/tls-gdierelax.d
@@ -1,6 +1,6 @@
tmpdir/tls-app-rel-ie: file format elf32-.*arm.*
-architecture: armv5t, flags 0x[0-9a-f]+:
+architecture: arm.*, flags 0x[0-9a-f]+:
EXEC_P, HAS_SYMS, D_PAGED
start address 0x[0-9a-f]+
diff --git a/binutils-2.25/ld/testsuite/ld-arm/tls-gdierelax2.d b/binutils-2.25/ld/testsuite/ld-arm/tls-gdierelax2.d
index 3a800944..565f191e 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/tls-gdierelax2.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/tls-gdierelax2.d
@@ -1,6 +1,6 @@
tmpdir/tls-app-rel-ie2: file format elf32-.*arm.*
-architecture: armv5t, flags 0x[0-9a-f]+:
+architecture: arm.*, flags 0x[0-9a-f]+:
HAS_SYMS, DYNAMIC, D_PAGED
start address 0x[0-9a-f]+
@@ -11,13 +11,13 @@ Disassembly of section .text:
[0-9a-f]+: e59f0004 ldr r0, \[pc, #4\] ; .*
[0-9a-f]+: e79f0000 ldr r0, \[pc, r0\]
[0-9a-f]+: e1a00000 nop ; .*
- [0-9a-f]+: 00008098 .word 0x00008098
- [0-9a-f]+: 0000809c .word 0x0000809c
+ [0-9a-f]+: 000080a0 .word 0x000080a0
+ [0-9a-f]+: 000080a4 .word 0x000080a4
[0-9a-f]+ <bar>:
[0-9a-f]+: 4801 ldr r0, \[pc, #4\] ; .*
[0-9a-f]+: 4478 add r0, pc
[0-9a-f]+: 6800 ldr r0, \[r0, #0\]
[0-9a-f]+: 46c0 nop ; .*
- [0-9a-f]+: 0000808a .word 0x0000808a
- [0-9a-f]+: 0000808c .word 0x0000808c
+ [0-9a-f]+: 00008092 .word 0x00008092
+ [0-9a-f]+: 00008094 .word 0x00008094
diff --git a/binutils-2.25/ld/testsuite/ld-arm/tls-gdlerelax.d b/binutils-2.25/ld/testsuite/ld-arm/tls-gdlerelax.d
index 02bddada..da3891e7 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/tls-gdlerelax.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/tls-gdlerelax.d
@@ -1,6 +1,6 @@
tmpdir/tls-app-rel-le: file format elf32-.*arm.*
-architecture: armv5t, flags 0x[0-9a-f]+:
+architecture: arm.*, flags 0x[0-9a-f]+:
EXEC_P, HAS_SYMS, D_PAGED
start address 0x[0-9a-f]+
diff --git a/binutils-2.25/ld/testsuite/ld-arm/tls-lib-loc.d b/binutils-2.25/ld/testsuite/ld-arm/tls-lib-loc.d
index 8dc4d713..27789b4a 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/tls-lib-loc.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/tls-lib-loc.d
@@ -1,6 +1,6 @@
.*: file format elf32-.*arm
-architecture: armv5t, flags 0x00000150:
+architecture: arm.*, flags 0x00000150:
HAS_SYMS, DYNAMIC, D_PAGED
start address 0x.*
diff --git a/binutils-2.25/ld/testsuite/ld-arm/tls-lib.d b/binutils-2.25/ld/testsuite/ld-arm/tls-lib.d
index a299fbac..e72267fc 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/tls-lib.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/tls-lib.d
@@ -1,6 +1,6 @@
.*: file format elf32-.*arm.*
-architecture: armv4, flags 0x00000150:
+architecture: arm.*, flags 0x00000150:
HAS_SYMS, DYNAMIC, D_PAGED
start address 0x.*
@@ -10,6 +10,6 @@ Disassembly of section .text:
.*: e1a00000 nop ; \(mov r0, r0\)
.*: e1a00000 nop ; \(mov r0, r0\)
.*: e1a0f00e mov pc, lr
- .*: 00008098 .word 0x00008098
- .*: 0000808c .word 0x0000808c
+ .*: 00010098 .word 0x00010098
+ .*: 0001008c .word 0x0001008c
.*: 00000004 .word 0x00000004
diff --git a/binutils-2.25/ld/testsuite/ld-arm/tls-thumb1.d b/binutils-2.25/ld/testsuite/ld-arm/tls-thumb1.d
index 86c59a4f..731afa9b 100644
--- a/binutils-2.25/ld/testsuite/ld-arm/tls-thumb1.d
+++ b/binutils-2.25/ld/testsuite/ld-arm/tls-thumb1.d
@@ -1,5 +1,5 @@
.*: file format elf32-.*arm
-architecture: armv4t, flags 0x00000150:
+architecture: arm.*, flags 0x00000150:
HAS_SYMS, DYNAMIC, D_PAGED
start address 0x.*