diff options
| author | Andrew Burgess <aburgess@redhat.com> | 2022-09-02 18:15:30 +0100 |
|---|---|---|
| committer | Andrew Burgess <aburgess@redhat.com> | 2022-11-01 09:32:13 +0000 |
| commit | 8cb6e17571f3fb66ccd4fa19f881602542cd06fc (patch) | |
| tree | e55c7d09de4ee64ed49f0c9b8b345b2f666ce0de /ld/testsuite | |
| parent | 1751ca43fdae8d19e13ae55430700a60eb0f30d3 (diff) | |
| download | fsf-binutils-gdb-8cb6e17571f3fb66ccd4fa19f881602542cd06fc.zip fsf-binutils-gdb-8cb6e17571f3fb66ccd4fa19f881602542cd06fc.tar.gz fsf-binutils-gdb-8cb6e17571f3fb66ccd4fa19f881602542cd06fc.tar.bz2 | |
opcodes/arm: use '@' consistently for the comment character
Looking at the ARM disassembler output, every comment seems to start
with a ';' character, so I assumed this was the correct character to
start an assembler comment.
I then spotted a couple of places where there was no ';', but instead,
just a '@' character. I thought that this was a case of a missing
';', and proposed a patch to add the missing ';' characters.
Turns out I was wrong, '@' is actually the ARM assembler comment
character, while ';' is the statement separator. Thus this:
nop ;@ comment
is two statements, the first is the 'nop' instruction, while the
second contains no instructions, just the '@ comment' comment text.
This:
nop @ comment
is a single 'nop' instruction followed by a comment. And finally,
this:
nop ; comment
is two statements, the first contains the 'nop' instruction, while the
second contains the instruction 'comment', which obviously isn't
actually an instruction at all.
Why this matters is that, in the next commit, I would like to add
libopcodes syntax styling support for ARM.
The question then is how should the disassembler style the three cases
above?
As '@' is the actual comment start character then clearly the '@' and
anything after it can be styled as a comment. But what about ';' in
the second example? Style as text? Style as a comment?
And the third example is even harder, what about the 'comment' text?
Style as an instruction mnemonic? Style as text? Style as a comment?
I think the only sensible answer is to move the disassembler to use
'@' consistently as its comment character, and remove all the uses of
';'.
Then, in the next commit, it's obvious what to do.
There's obviously a *lot* of tests that get updated by this commit,
the only actual code changes are in opcodes/arm-dis.c.
Diffstat (limited to 'ld/testsuite')
115 files changed, 1209 insertions, 1209 deletions
diff --git a/ld/testsuite/ld-arm/arm-app-abs32.d b/ld/testsuite/ld-arm/arm-app-abs32.d index d888929..916f90c 100644 --- a/ld/testsuite/ld-arm/arm-app-abs32.d +++ b/ld/testsuite/ld-arm/arm-app-abs32.d @@ -7,21 +7,21 @@ start address .* Disassembly of section .plt: .* <.plt>: - +.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - +.*: e59fe004 ldr lr, \[pc, #4\] ; .* <.*> + +.*: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + +.*: e59fe004 ldr lr, \[pc, #4\] @ .* <.*> +.*: e08fe00e add lr, pc, lr +.*: e5bef008 ldr pc, \[lr, #8\]! +.*: .* .* .* <lib_func1@plt>: +.*: e28fc6.* add ip, pc, #.* - +.*: e28cca.* add ip, ip, #.* ; .* + +.*: e28cca.* add ip, ip, #.* @ .* +.*: e5bcf.* ldr pc, \[ip, #.*\]!.* Disassembly of section .text: .* <_start>: +.*: e1a0c00d mov ip, sp +.*: e92dd800 push {fp, ip, lr, pc} - +.*: e59f0004 ldr r0, \[pc, #4\] ; .* <_start\+0x14> + +.*: e59f0004 ldr r0, \[pc, #4\] @ .* <_start\+0x14> +.*: e89d6800 ldm sp, {fp, sp, lr} +.*: e12fff1e bx lr +.*: .* .* diff --git a/ld/testsuite/ld-arm/arm-app.d b/ld/testsuite/ld-arm/arm-app.d index dd4cf81..a9bd7ed 100644 --- a/ld/testsuite/ld-arm/arm-app.d +++ b/ld/testsuite/ld-arm/arm-app.d @@ -7,14 +7,14 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <.*> + .*: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + .*: e59fe004 ldr lr, \[pc, #4\] @ .* <.*> .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* .* <lib_func1@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* Disassembly of section .text: diff --git a/ld/testsuite/ld-arm/arm-be8.d b/ld/testsuite/ld-arm/arm-be8.d index 16090b3..072cc7c 100644 --- a/ld/testsuite/ld-arm/arm-be8.d +++ b/ld/testsuite/ld-arm/arm-be8.d @@ -8,7 +8,7 @@ Disassembly of section .text: 8004: e12fff1e bx lr 00008008 <thumb>: - 8008: 46c0 nop ; \(mov r8, r8\) + 8008: 46c0 nop @ \(mov r8, r8\) 800a: 4770 bx lr 800c: f7ff fffc bl 8008 <thumb> diff --git a/ld/testsuite/ld-arm/arm-call.d b/ld/testsuite/ld-arm/arm-call.d index a320743..4ae3438 100644 --- a/ld/testsuite/ld-arm/arm-call.d +++ b/ld/testsuite/ld-arm/arm-call.d @@ -26,7 +26,7 @@ Disassembly of section .text: 00008038 <t4>: 8038: 4770 bx lr - 803a: 46c0 nop ; \(mov r8, r8\) + 803a: 46c0 nop @ \(mov r8, r8\) 0000803c <arm>: 803c: e12fff1e bx lr @@ -40,7 +40,7 @@ Disassembly of section .text: 0000804a <t5>: 804a: f000 f801 bl 8050 <local_thumb> - 804e: 46c0 nop ; \(mov r8, r8\) + 804e: 46c0 nop @ \(mov r8, r8\) 00008050 <local_thumb>: 8050: f7ff fff1 bl 8036 <t3> @@ -50,9 +50,9 @@ Disassembly of section .text: ... 00008060 <__t1_from_arm>: - 8060: e51ff004 ldr pc, \[pc, #-4\] ; 8064 <__t1_from_arm\+0x4> + 8060: e51ff004 ldr pc, \[pc, #-4\] @ 8064 <__t1_from_arm\+0x4> 8064: 00008041 .word 0x00008041 00008068 <__t2_from_arm>: - 8068: e51ff004 ldr pc, \[pc, #-4\] ; 806c <__t2_from_arm\+0x4> + 8068: e51ff004 ldr pc, \[pc, #-4\] @ 806c <__t2_from_arm\+0x4> 806c: 00008043 .word 0x00008043 diff --git a/ld/testsuite/ld-arm/arm-lib-plt32.d b/ld/testsuite/ld-arm/arm-lib-plt32.d index 2eaf89a..7a9a3ab 100644 --- a/ld/testsuite/ld-arm/arm-lib-plt32.d +++ b/ld/testsuite/ld-arm/arm-lib-plt32.d @@ -7,14 +7,14 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <.*> + .*: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + .*: e59fe004 ldr lr, \[pc, #4\] @ .* <.*> .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* .* <app_func2@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* Disassembly of section .text: diff --git a/ld/testsuite/ld-arm/arm-lib.d b/ld/testsuite/ld-arm/arm-lib.d index ac439ea..8f56477 100644 --- a/ld/testsuite/ld-arm/arm-lib.d +++ b/ld/testsuite/ld-arm/arm-lib.d @@ -7,14 +7,14 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <.*> + .*: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + .*: e59fe004 ldr lr, \[pc, #4\] @ .* <.*> .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* .* <app_func2@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* Disassembly of section .text: diff --git a/ld/testsuite/ld-arm/arm-movwt.d b/ld/testsuite/ld-arm/arm-movwt.d index 7d558b7..64f4fde 100644 --- a/ld/testsuite/ld-arm/arm-movwt.d +++ b/ld/testsuite/ld-arm/arm-movwt.d @@ -5,35 +5,35 @@ Disassembly of section .text: 00008000 <[^>]*>: 8000: e3000000 movw r0, #0 - 8004: e3411234 movt r1, #4660 ; 0x1234 - 8008: e3082000 movw r2, #32768 ; 0x8000 - 800c: e3413233 movt r3, #4659 ; 0x1233 + 8004: e3411234 movt r1, #4660 @ 0x1234 + 8008: e3082000 movw r2, #32768 @ 0x8000 + 800c: e3413233 movt r3, #4659 @ 0x1233 8010: e3004011 movw r4, #17 - 8014: e3415234 movt r5, #4660 ; 0x1234 - 8018: e3086011 movw r6, #32785 ; 0x8011 - 801c: e3417233 movt r7, #4659 ; 0x1233 + 8014: e3415234 movt r5, #4660 @ 0x1234 + 8018: e3086011 movw r6, #32785 @ 0x8011 + 801c: e3417233 movt r7, #4659 @ 0x1233 00008020 <[^>]*>: 8020: f240 0700 movw r7, #0 - 8024: f2c1 2634 movt r6, #4660 ; 0x1234 - 8028: f248 0500 movw r5, #32768 ; 0x8000 - 802c: f2c1 2433 movt r4, #4659 ; 0x1233 + 8024: f2c1 2634 movt r6, #4660 @ 0x1234 + 8028: f248 0500 movw r5, #32768 @ 0x8000 + 802c: f2c1 2433 movt r4, #4659 @ 0x1233 8030: f240 0311 movw r3, #17 - 8034: f2c1 2234 movt r2, #4660 ; 0x1234 - 8038: f248 0111 movw r1, #32785 ; 0x8011 - 803c: f2c1 2033 movt r0, #4659 ; 0x1233 + 8034: f2c1 2234 movt r2, #4660 @ 0x1234 + 8038: f248 0111 movw r1, #32785 @ 0x8011 + 803c: f2c1 2033 movt r0, #4659 @ 0x1233 Disassembly of section .far: 12340000 <[^>]*>: -12340000: e3080000 movw r0, #32768 ; 0x8000 -12340004: e34e0dcc movt r0, #60876 ; 0xedcc -12340008: e3080021 movw r0, #32801 ; 0x8021 -1234000c: e34e0dcc movt r0, #60876 ; 0xedcc +12340000: e3080000 movw r0, #32768 @ 0x8000 +12340004: e34e0dcc movt r0, #60876 @ 0xedcc +12340008: e3080021 movw r0, #32801 @ 0x8021 +1234000c: e34e0dcc movt r0, #60876 @ 0xedcc 12340010 <[^>]*>: -12340010: f248 0000 movw r0, #32768 ; 0x8000 -12340014: f6ce 50cc movt r0, #60876 ; 0xedcc -12340018: f248 0021 movw r0, #32801 ; 0x8021 -1234001c: f6ce 50cc movt r0, #60876 ; 0xedcc +12340010: f248 0000 movw r0, #32768 @ 0x8000 +12340014: f6ce 50cc movt r0, #60876 @ 0xedcc +12340018: f248 0021 movw r0, #32801 @ 0x8021 +1234001c: f6ce 50cc movt r0, #60876 @ 0xedcc diff --git a/ld/testsuite/ld-arm/arm-pic-veneer.d b/ld/testsuite/ld-arm/arm-pic-veneer.d index 08e107b..b80f30f 100644 --- a/ld/testsuite/ld-arm/arm-pic-veneer.d +++ b/ld/testsuite/ld-arm/arm-pic-veneer.d @@ -7,11 +7,11 @@ Disassembly of section .text: 8000: ea...... b 800. <.*> 00008004 <foo>: - 8004: 46c0 nop ; \(mov r8, r8\) + 8004: 46c0 nop @ \(mov r8, r8\) 8006: 4770 bx lr 00008008 <__foo_from_arm>: - 8008: e59fc004 ldr ip, \[pc, #4\] ; 8014 <__foo_from_arm\+0xc> + 8008: e59fc004 ldr ip, \[pc, #4\] @ 8014 <__foo_from_arm\+0xc> 800c: e08fc00c add ip, pc, ip 8010: e12fff1c bx ip 8014: fffffff1 .word 0xfffffff1 diff --git a/ld/testsuite/ld-arm/armthumb-lib.d b/ld/testsuite/ld-arm/armthumb-lib.d index 4f43b8e..fd9cd95 100644 --- a/ld/testsuite/ld-arm/armthumb-lib.d +++ b/ld/testsuite/ld-arm/armthumb-lib.d @@ -7,14 +7,14 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <.*> + .*: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + .*: e59fe004 ldr lr, \[pc, #4\] @ .* <.*> .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* .* <app_func2@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* Disassembly of section .text: @@ -24,16 +24,16 @@ Disassembly of section .text: .*: ebfffff. bl .* <app_func2@plt> .*: e89d6800 ldm sp, {fp, sp, lr} .*: e12fff1e bx lr - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .* <__real_lib_func2>: .*: 4770 bx lr - .*: 46c0 nop ; \(mov r8, r8\) + .*: 46c0 nop @ \(mov r8, r8\) .* <lib_func2>: - .*: e59fc004 ldr ip, \[pc, #4\] ; .* <lib_func2\+0xc> + .*: e59fc004 ldr ip, \[pc, #4\] @ .* <lib_func2\+0xc> .*: e08cc00f add ip, ip, pc .*: e12fff1c bx ip .*: fffffff1 .* diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-24.d b/ld/testsuite/ld-arm/attr-merge-wchar-24.d index 46d6c66..92a26ab 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-24.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-24.d @@ -2,4 +2,4 @@ #source: attr-merge-wchar-4.s #as: #ld: -r -#warning: warning: .* uses 4-byte wchar_t yet the output is to use 2-byte wchar_t; use of wchar_t values across objects may fail +#warning: warning: .* uses 4-byte wchar_t yet the output is to use 2-byte wchar_t@ use of wchar_t values across objects may fail diff --git a/ld/testsuite/ld-arm/attr-merge-wchar-42.d b/ld/testsuite/ld-arm/attr-merge-wchar-42.d index c2aca5e..274cdc8 100644 --- a/ld/testsuite/ld-arm/attr-merge-wchar-42.d +++ b/ld/testsuite/ld-arm/attr-merge-wchar-42.d @@ -2,4 +2,4 @@ #source: attr-merge-wchar-2.s #as: #ld: -r -#warning: warning: .* uses 2-byte wchar_t yet the output is to use 4-byte wchar_t; use of wchar_t values across objects may fail +#warning: warning: .* uses 2-byte wchar_t yet the output is to use 4-byte wchar_t@ use of wchar_t values across objects may fail diff --git a/ld/testsuite/ld-arm/callweak.d b/ld/testsuite/ld-arm/callweak.d index 89cb4a5..698942f 100644 --- a/ld/testsuite/ld-arm/callweak.d +++ b/ld/testsuite/ld-arm/callweak.d @@ -4,7 +4,7 @@ Disassembly of section .far: 12340000 <[^>]*>: -12340000: e1a00000 nop ; \(mov r0, r0\) +12340000: e1a00000 nop @ \(mov r0, r0\) 12340004: 01a00000 moveq r0, r0 12340008 <[^>]*>: diff --git a/ld/testsuite/ld-arm/cortex-a8-far.d b/ld/testsuite/ld-arm/cortex-a8-far.d index 9b10659..a87cd5d 100644 --- a/ld/testsuite/ld-arm/cortex-a8-far.d +++ b/ld/testsuite/ld-arm/cortex-a8-far.d @@ -10,7 +10,7 @@ Disassembly of section \.text: ... #... 00800008 <__far_fn_from_thumb>: - 800008: e51ff004 ldr pc, \[pc, #-4\] ; 80000c <__far_fn_from_thumb\+0x4> + 800008: e51ff004 ldr pc, \[pc, #-4\] @ 80000c <__far_fn_from_thumb\+0x4> 80000c: 7fff0000 .word 0x7fff0000 00800010 <three>: @@ -30,11 +30,11 @@ Disassembly of section \.text: ... 00801018 <__far_fn2_from_thumb>: - 801018: e51ff004 ldr pc, \[pc, #-4\] ; 80101c <__far_fn2_from_thumb\+0x4> + 801018: e51ff004 ldr pc, \[pc, #-4\] @ 80101c <__far_fn2_from_thumb\+0x4> 80101c: 80000004 .word 0x80000004 00801020 <__far_fn1_from_thumb>: - 801020: e51ff004 ldr pc, \[pc, #-4\] ; 801024 <__far_fn1_from_thumb\+0x4> + 801020: e51ff004 ldr pc, \[pc, #-4\] @ 801024 <__far_fn1_from_thumb\+0x4> 801024: 80000000 .word 0x80000000 801028: d001 beq.n 80102e <__far_fn1_from_thumb\+0xe> 80102a: f7ff bfea b.w 801002 <label1\+0x8> diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d index 54f56e4..d524c8c 100644 --- a/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d +++ b/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d @@ -5,8 +5,8 @@ Disassembly of section \.plt: 00008000 <.*>: - 8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <.*> + 8000: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + 8004: e59fe004 ldr lr, \[pc, #4\] @ 8010 <.*> 8008: e08fe00e add lr, pc, lr 800c: e5bef008 ldr pc, \[lr, #8\]! 8010: 00000ffc \.word 0x00000ffc @@ -15,12 +15,12 @@ Disassembly of section \.plt: 8016: e7fd b.n .+ <.+> 8018: e28fc600 add ip, pc, #0, 12 801c: e28cca00 add ip, ip, #0, 20 - 8020: e5bcfff8 ldr pc, \[ip, #4088\]! ; 0xff8 + 8020: e5bcfff8 ldr pc, \[ip, #4088\]! @ 0xff8 Disassembly of section \.text: 00008ff0 <foo>: - 8ff0: 46c0 nop ; \(mov r8, r8\) + 8ff0: 46c0 nop @ \(mov r8, r8\) 8ff2: f240 0000 movw r0, #0 8ff6: f240 0000 movw r0, #0 8ffa: f240 0000 movw r0, #0 diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d index 425c102..4abb6f4 100644 --- a/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d +++ b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d @@ -5,8 +5,8 @@ Disassembly of section \.plt: 00008000 <.plt>: - 8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <.*> + 8000: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + 8004: e59fe004 ldr lr, \[pc, #4\] @ 8010 <.*> 8008: e08fe00e add lr, pc, lr 800c: e5bef008 ldr pc, \[lr, #8\]! 8010: 00001004 \.word 0x00001004 @@ -14,13 +14,13 @@ Disassembly of section \.plt: 8014: 4778 bx pc 8016: e7fd b.n .+ <.+> 8018: e28fc600 add ip, pc, #0, 12 - 801c: e28cca01 add ip, ip, #4096 ; 0x1000 + 801c: e28cca01 add ip, ip, #4096 @ 0x1000 8020: e5bcf000 ldr pc, \[ip, #0\]! Disassembly of section \.text: 00008ff0 <foo>: - 8ff0: 46c0 nop ; \(mov r8, r8\) + 8ff0: 46c0 nop @ \(mov r8, r8\) 8ff2: f240 0000 movw r0, #0 8ff6: f240 0000 movw r0, #0 8ffa: f240 0000 movw r0, #0 diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d index e4e6760..275a877 100644 --- a/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d +++ b/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d @@ -5,20 +5,20 @@ Disassembly of section \.plt: 00008000 <.plt>: - 8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <.*> + 8000: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + 8004: e59fe004 ldr lr, \[pc, #4\] @ 8010 <.*> 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 + 801c: e5bcfffc ldr pc, \[ip, #4092\]! @ 0xffc Disassembly of section \.text: 00008ff0 <foo>: - 8ff0: 46c0 nop ; \(mov r8, r8\) + 8ff0: 46c0 nop @ \(mov r8, r8\) 8ff2: f240 0000 movw r0, #0 8ff6: f240 0000 movw r0, #0 8ffa: f240 0000 movw r0, #0 diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d index 4a5be27..5605a71 100644 --- a/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d +++ b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d @@ -5,15 +5,15 @@ Disassembly of section \.plt: 00008e00 <.plt>: - 8e00: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 8e04: e59fe004 ldr lr, \[pc, #4\] ; 8e10 <.*> + 8e00: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + 8e04: e59fe004 ldr lr, \[pc, #4\] @ 8e10 <.*> 8e08: e08fe00e add lr, pc, lr 8e0c: e5bef008 ldr pc, \[lr, #8\]! 8e10: 0001027c \.word 0x0001027c 00008e14 <targetfn@plt>: 8e14: e28fc600 add ip, pc, #0, 12 - 8e18: e28cca10 add ip, ip, #16, 20 ; 0x10000 - 8e1c: e5bcf27c ldr pc, \[ip, #636\]! ; 0x27c + 8e18: e28cca10 add ip, ip, #16, 20 @ 0x10000 + 8e1c: e5bcf27c ldr pc, \[ip, #636\]! @ 0x27c Disassembly of section \.text: diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d index e4e6760..275a877 100644 --- a/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d +++ b/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d @@ -5,20 +5,20 @@ Disassembly of section \.plt: 00008000 <.plt>: - 8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <.*> + 8000: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + 8004: e59fe004 ldr lr, \[pc, #4\] @ 8010 <.*> 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 + 801c: e5bcfffc ldr pc, \[ip, #4092\]! @ 0xffc Disassembly of section \.text: 00008ff0 <foo>: - 8ff0: 46c0 nop ; \(mov r8, r8\) + 8ff0: 46c0 nop @ \(mov r8, r8\) 8ff2: f240 0000 movw r0, #0 8ff6: f240 0000 movw r0, #0 8ffa: f240 0000 movw r0, #0 diff --git a/ld/testsuite/ld-arm/farcall-arm-arm-pic-veneer.d b/ld/testsuite/ld-arm/farcall-arm-arm-pic-veneer.d index 881a0ae..844880a 100644 --- a/ld/testsuite/ld-arm/farcall-arm-arm-pic-veneer.d +++ b/ld/testsuite/ld-arm/farcall-arm-arm-pic-veneer.d @@ -7,7 +7,7 @@ Disassembly of section .text: 1004: 00000000 andeq r0, r0, r0 00001008 <__bar_veneer>: - 1008: e59fc000 ldr ip, \[pc\] ; 1010 <__bar_veneer\+0x8> + 1008: e59fc000 ldr ip, \[pc\] @ 1010 <__bar_veneer\+0x8> 100c: e08ff00c add pc, pc, ip 1010: 0200000c .word 0x0200000c 1014: 00000000 .word 0x00000000 diff --git a/ld/testsuite/ld-arm/farcall-arm-arm.d b/ld/testsuite/ld-arm/farcall-arm-arm.d index 7ee6d66..76a1335 100644 --- a/ld/testsuite/ld-arm/farcall-arm-arm.d +++ b/ld/testsuite/ld-arm/farcall-arm-arm.d @@ -7,7 +7,7 @@ Disassembly of section .text: 1004: 00000000 andeq r0, r0, r0 00001008 <__bar_veneer>: - 1008: e51ff004 ldr pc, \[pc, #-4\] ; 100c <__bar_veneer\+0x4> + 1008: e51ff004 ldr pc, \[pc, #-4\] @ 100c <__bar_veneer\+0x4> 100c: 02001020 .word 0x02001020 Disassembly of section .foo: diff --git a/ld/testsuite/ld-arm/farcall-arm-nacl-pic.d b/ld/testsuite/ld-arm/farcall-arm-nacl-pic.d index 62d3421..a39a468 100644 --- a/ld/testsuite/ld-arm/farcall-arm-nacl-pic.d +++ b/ld/testsuite/ld-arm/farcall-arm-nacl-pic.d @@ -7,9 +7,9 @@ Disassembly of section \.text: #... 0+1010 <__bar_veneer>: -\s*1010:\s+e59fc00c\s+ldr\s+ip, \[pc, #12\]\s+; 1024 <__bar_veneer\+0x14> +\s*1010:\s+e59fc00c\s+ldr\s+ip, \[pc, #12\]\s+@ 1024 <__bar_veneer\+0x14> \s*1014:\s+e08cc00f\s+add\s+ip, ip, pc -\s*1018:\s+e3ccc13f\s+bic\s+ip, ip, #-1073741809\s+; 0xc000000f +\s*1018:\s+e3ccc13f\s+bic\s+ip, ip, #-1073741809\s+@ 0xc000000f \s*101c:\s+e12fff1c\s+bx\s+ip \s*1020:\s+e125be70\s+bkpt\s+0x5be0 \s*1024:\s+02000004\s+.word\s+0x02000004 diff --git a/ld/testsuite/ld-arm/farcall-arm-nacl.d b/ld/testsuite/ld-arm/farcall-arm-nacl.d index 58f2a58..0431f4a 100644 --- a/ld/testsuite/ld-arm/farcall-arm-nacl.d +++ b/ld/testsuite/ld-arm/farcall-arm-nacl.d @@ -7,8 +7,8 @@ Disassembly of section \.text: #... 0+1010 <__bar_veneer>: -\s*1010:\s+e59fc00c\s+ldr\s+ip, \[pc, #12\]\s+; 1024 <__bar_veneer\+0x14> -\s*1014:\s+e3ccc13f\s+bic\s+ip, ip, #-1073741809\s+; 0xc000000f +\s*1010:\s+e59fc00c\s+ldr\s+ip, \[pc, #12\]\s+@ 1024 <__bar_veneer\+0x14> +\s*1014:\s+e3ccc13f\s+bic\s+ip, ip, #-1073741809\s+@ 0xc000000f \s*1018:\s+e12fff1c\s+bx\s+ip \s*101c:\s+e320f000\s+nop\s+\{0\} \s*1020:\s+e125be70\s+bkpt\s+0x5be0 diff --git a/ld/testsuite/ld-arm/farcall-arm-thumb-blx-pic-veneer.d b/ld/testsuite/ld-arm/farcall-arm-thumb-blx-pic-veneer.d index 45bc01c..92480b9 100644 --- a/ld/testsuite/ld-arm/farcall-arm-thumb-blx-pic-veneer.d +++ b/ld/testsuite/ld-arm/farcall-arm-thumb-blx-pic-veneer.d @@ -7,7 +7,7 @@ Disassembly of section .text: 1004: 00000000 andeq r0, r0, r0 00001008 <__bar_from_arm>: - 1008: e59fc004 ldr ip, \[pc, #4\] ; 1014 <__bar_from_arm\+0xc> + 1008: e59fc004 ldr ip, \[pc, #4\] @ 1014 <__bar_from_arm\+0xc> 100c: e08fc00c add ip, pc, ip 1010: e12fff1c bx ip 1014: 02000001 .word 0x02000001 diff --git a/ld/testsuite/ld-arm/farcall-arm-thumb-blx.d b/ld/testsuite/ld-arm/farcall-arm-thumb-blx.d index 993a028..b47bfe0 100644 --- a/ld/testsuite/ld-arm/farcall-arm-thumb-blx.d +++ b/ld/testsuite/ld-arm/farcall-arm-thumb-blx.d @@ -7,7 +7,7 @@ Disassembly of section .text: 1004: 00000000 andeq r0, r0, r0 00001008 <__bar_from_arm>: - 1008: e51ff004 ldr pc, \[pc, #-4\] ; 100c <__bar_from_arm\+0x4> + 1008: e51ff004 ldr pc, \[pc, #-4\] @ 100c <__bar_from_arm\+0x4> 100c: 02001015 .word 0x02001015 Disassembly of section .foo: diff --git a/ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d b/ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d index 45bc01c..92480b9 100644 --- a/ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d +++ b/ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d @@ -7,7 +7,7 @@ Disassembly of section .text: 1004: 00000000 andeq r0, r0, r0 00001008 <__bar_from_arm>: - 1008: e59fc004 ldr ip, \[pc, #4\] ; 1014 <__bar_from_arm\+0xc> + 1008: e59fc004 ldr ip, \[pc, #4\] @ 1014 <__bar_from_arm\+0xc> 100c: e08fc00c add ip, pc, ip 1010: e12fff1c bx ip 1014: 02000001 .word 0x02000001 diff --git a/ld/testsuite/ld-arm/farcall-arm-thumb.d b/ld/testsuite/ld-arm/farcall-arm-thumb.d index 3fc02e3..0344996 100644 --- a/ld/testsuite/ld-arm/farcall-arm-thumb.d +++ b/ld/testsuite/ld-arm/farcall-arm-thumb.d @@ -7,7 +7,7 @@ Disassembly of section .text: 1004: 00000000 andeq r0, r0, r0 00001008 <__bar_from_arm>: - 1008: e59fc000 ldr ip, \[pc\] ; 1010 <__bar_from_arm\+0x8> + 1008: e59fc000 ldr ip, \[pc\] @ 1010 <__bar_from_arm\+0x8> 100c: e12fff1c bx ip 1010: 02001015 .word 0x02001015 1014: 00000000 .word 0x00000000 diff --git a/ld/testsuite/ld-arm/farcall-data-nacl.d b/ld/testsuite/ld-arm/farcall-data-nacl.d index 1524fa6..2c51fe8 100644 --- a/ld/testsuite/ld-arm/farcall-data-nacl.d +++ b/ld/testsuite/ld-arm/farcall-data-nacl.d @@ -7,8 +7,8 @@ Disassembly of section .text: #... 0+8010 <__far_veneer>: -\s*8010:\s+e59fc00c\s+ldr\s+ip, \[pc, #12\]\s+; 8024 <__far_veneer\+0x14> -\s*8014:\s+e3ccc13f\s+bic\s+ip, ip, #-1073741809\s+; 0xc000000f +\s*8010:\s+e59fc00c\s+ldr\s+ip, \[pc, #12\]\s+@ 8024 <__far_veneer\+0x14> +\s*8014:\s+e3ccc13f\s+bic\s+ip, ip, #-1073741809\s+@ 0xc000000f \s*8018:\s+e12fff1c\s+bx\s+ip \s*801c:\s+e320f000\s+nop\s+\{0\} \s*8020:\s+e125be70\s+bkpt\s+0x5be0 diff --git a/ld/testsuite/ld-arm/farcall-data.d b/ld/testsuite/ld-arm/farcall-data.d index a8b231c..b431613 100644 --- a/ld/testsuite/ld-arm/farcall-data.d +++ b/ld/testsuite/ld-arm/farcall-data.d @@ -7,7 +7,7 @@ Disassembly of section .text: 8004: 00000000 andeq r0, r0, r0 00008008 <__far_veneer>: - 8008: e51ff004 ldr pc, \[pc, #-4\] ; 800c <__far_veneer\+0x4> + 8008: e51ff004 ldr pc, \[pc, #-4\] @ 800c <__far_veneer\+0x4> 800c: 12340000 \.word 0x12340000 00008010 <after>: diff --git a/ld/testsuite/ld-arm/farcall-group-limit.d b/ld/testsuite/ld-arm/farcall-group-limit.d index 204dcd8..143896f 100644 --- a/ld/testsuite/ld-arm/farcall-group-limit.d +++ b/ld/testsuite/ld-arm/farcall-group-limit.d @@ -8,7 +8,7 @@ Disassembly of section .text: 1004: 00000000 andeq r0, r0, r0 00001008 <__bar_veneer>: - 1008: e51ff004 ldr pc, \[pc, #-4\] ; 100c <__bar_veneer\+0x4> + 1008: e51ff004 ldr pc, \[pc, #-4\] @ 100c <__bar_veneer\+0x4> 100c: 02003020 .word 0x02003020 00001010 <myfunc>: diff --git a/ld/testsuite/ld-arm/farcall-group-size2.d b/ld/testsuite/ld-arm/farcall-group-size2.d index 2628334..17bab09 100644 --- a/ld/testsuite/ld-arm/farcall-group-size2.d +++ b/ld/testsuite/ld-arm/farcall-group-size2.d @@ -8,12 +8,12 @@ Disassembly of section .text: 1004: eb000002 bl 1014 <__bar2_veneer> 00001008 <__bar_from_arm>: - 1008: e59fc000 ldr ip, \[pc\] ; 1010 <__bar_from_arm\+0x8> + 1008: e59fc000 ldr ip, \[pc\] @ 1010 <__bar_from_arm\+0x8> 100c: e12fff1c bx ip 1010: 02003021 .word 0x02003021 00001014 <__bar2_veneer>: - 1014: e51ff004 ldr pc, \[pc, #-4\] ; 1018 <__bar2_veneer\+0x4> + 1014: e51ff004 ldr pc, \[pc, #-4\] @ 1018 <__bar2_veneer\+0x4> 1018: 02003024 .word 0x02003024 101c: 00000000 .word 0x00000000 @@ -24,17 +24,17 @@ Disassembly of section .text: 102c: 00000000 andeq r0, r0, r0 00001030 <__bar4_from_arm>: - 1030: e59fc000 ldr ip, \[pc\] ; 1038 <__bar4_from_arm\+0x8> + 1030: e59fc000 ldr ip, \[pc\] @ 1038 <__bar4_from_arm\+0x8> 1034: e12fff1c bx ip 1038: 0200302d .word 0x0200302d 0000103c <__bar5_from_arm>: - 103c: e59fc000 ldr ip, \[pc\] ; 1044 <__bar5_from_arm\+0x8> + 103c: e59fc000 ldr ip, \[pc\] @ 1044 <__bar5_from_arm\+0x8> 1040: e12fff1c bx ip 1044: 0200302f .word 0x0200302f 00001048 <__bar3_veneer>: - 1048: e51ff004 ldr pc, \[pc, #-4\] ; 104c <__bar3_veneer\+0x4> + 1048: e51ff004 ldr pc, \[pc, #-4\] @ 104c <__bar3_veneer\+0x4> 104c: 02003028 .word 0x02003028 ... diff --git a/ld/testsuite/ld-arm/farcall-group.d b/ld/testsuite/ld-arm/farcall-group.d index 2d76e1b..accc091 100644 --- a/ld/testsuite/ld-arm/farcall-group.d +++ b/ld/testsuite/ld-arm/farcall-group.d @@ -14,26 +14,26 @@ Disassembly of section .text: +[0-9a-f]+: 00000000 andeq r0, r0, r0 [0-9a-f]+ <__bar4_from_arm>: - +[0-9a-f]+: e59fc000 ldr ip, \[pc\] ; [0-9a-f]+ <__bar4_from_arm\+0x8> + +[0-9a-f]+: e59fc000 ldr ip, \[pc\] @ [0-9a-f]+ <__bar4_from_arm\+0x8> +[0-9a-f]+: e12fff1c bx ip +[0-9a-f]+: 0200302d .word 0x0200302d [0-9a-f]+ <__bar2_veneer>: - +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] ; [0-9a-f]+ <__bar2_veneer\+0x4> + +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] @ [0-9a-f]+ <__bar2_veneer\+0x4> +[0-9a-f]+: 02003024 .word 0x02003024 [0-9a-f]+ <__bar_from_arm>: - +[0-9a-f]+: e59fc000 ldr ip, \[pc\] ; [0-9a-f]+ <__bar_from_arm\+0x8> + +[0-9a-f]+: e59fc000 ldr ip, \[pc\] @ [0-9a-f]+ <__bar_from_arm\+0x8> +[0-9a-f]+: e12fff1c bx ip +[0-9a-f]+: 02003021 .word 0x02003021 [0-9a-f]+ <__bar5_from_arm>: - +[0-9a-f]+: e59fc000 ldr ip, \[pc\] ; [0-9a-f]+ <__bar5_from_arm\+0x8> + +[0-9a-f]+: e59fc000 ldr ip, \[pc\] @ [0-9a-f]+ <__bar5_from_arm\+0x8> +[0-9a-f]+: e12fff1c bx ip +[0-9a-f]+: 0200302f .word 0x0200302f [0-9a-f]+ <__bar3_veneer>: - +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] ; [0-9a-f]+ <__bar3_veneer\+0x4> + +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] @ [0-9a-f]+ <__bar3_veneer\+0x4> +[0-9a-f]+: 02003028 .word 0x02003028 ... diff --git a/ld/testsuite/ld-arm/farcall-mix.d b/ld/testsuite/ld-arm/farcall-mix.d index ffeffb9..3fb6eb2 100644 --- a/ld/testsuite/ld-arm/farcall-mix.d +++ b/ld/testsuite/ld-arm/farcall-mix.d @@ -12,23 +12,23 @@ Disassembly of section .text: +[0-9a-f]+: 00000000 andeq r0, r0, r0 [0-9a-f]+ <__bar_from_arm>: - +[0-9a-f]+: e59fc000 ldr ip, \[pc\] ; [0-9a-f]+ <__bar_from_arm\+0x8> + +[0-9a-f]+: e59fc000 ldr ip, \[pc\] @ [0-9a-f]+ <__bar_from_arm\+0x8> +[0-9a-f]+: e12fff1c bx ip +[0-9a-f]+: 02002021 .word 0x02002021 [0-9a-f]+ <__bar3_veneer>: - +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] ; [0-9a-f]+ <__bar3_veneer\+0x4> + +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] @ [0-9a-f]+ <__bar3_veneer\+0x4> +[0-9a-f]+: 02002028 .word 0x02002028 [0-9a-f]+ <__bar5_from_arm>: - +[0-9a-f]+: e59fc000 ldr ip, \[pc\] ; [0-9a-f]+ <__bar5_from_arm\+0x8> + +[0-9a-f]+: e59fc000 ldr ip, \[pc\] @ [0-9a-f]+ <__bar5_from_arm\+0x8> +[0-9a-f]+: e12fff1c bx ip +[0-9a-f]+: 0200202f .word 0x0200202f [0-9a-f]+ <__bar4_from_arm>: - +[0-9a-f]+: e59fc000 ldr ip, \[pc\] ; [0-9a-f]+ <__bar4_from_arm\+0x8> + +[0-9a-f]+: e59fc000 ldr ip, \[pc\] @ [0-9a-f]+ <__bar4_from_arm\+0x8> +[0-9a-f]+: e12fff1c bx ip +[0-9a-f]+: 0200202d .word 0x0200202d [0-9a-f]+ <__bar2_veneer>: - +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] ; [0-9a-f]+ <__bar2_veneer\+0x4> + +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] @ [0-9a-f]+ <__bar2_veneer\+0x4> +[0-9a-f]+: 02002024 .word 0x02002024 ... diff --git a/ld/testsuite/ld-arm/farcall-mix2.d b/ld/testsuite/ld-arm/farcall-mix2.d index 192a2a0..bd5510e 100644 --- a/ld/testsuite/ld-arm/farcall-mix2.d +++ b/ld/testsuite/ld-arm/farcall-mix2.d @@ -8,11 +8,11 @@ Disassembly of section .text: +[0-9a-f]+: eb000002 bl [0-9a-f]+ <__bar2_veneer> [0-9a-f]+ <__bar_from_arm>: - +[0-9a-f]+: e59fc000 ldr ip, \[pc\] ; [0-9a-f]+ <__bar_from_arm\+0x8> + +[0-9a-f]+: e59fc000 ldr ip, \[pc\] @ [0-9a-f]+ <__bar_from_arm\+0x8> +[0-9a-f]+: e12fff1c bx ip +[0-9a-f]+: 02003021 .word 0x02003021 [0-9a-f]+ <__bar2_veneer>: - +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] ; [0-9a-f]+ <__bar2_veneer\+0x4> + +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] @ [0-9a-f]+ <__bar2_veneer\+0x4> +[0-9a-f]+: 02003024 .word 0x02003024 +[0-9a-f]+: 00000000 .word 0x00000000 Disassembly of section .mytext: @@ -24,16 +24,16 @@ Disassembly of section .mytext: +[0-9a-f]+: 00000000 andeq r0, r0, r0 [0-9a-f]+ <__bar3_veneer>: - +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] ; [0-9a-f]+ <__bar3_veneer\+0x4> + +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] @ [0-9a-f]+ <__bar3_veneer\+0x4> +[0-9a-f]+: 02003028 .word 0x02003028 [0-9a-f]+ <__bar4_from_arm>: - +[0-9a-f]+: e59fc000 ldr ip, \[pc\] ; [0-9a-f]+ <__bar4_from_arm\+0x8> + +[0-9a-f]+: e59fc000 ldr ip, \[pc\] @ [0-9a-f]+ <__bar4_from_arm\+0x8> +[0-9a-f]+: e12fff1c bx ip +[0-9a-f]+: 0200302d .word 0x0200302d [0-9a-f]+ <__bar5_from_arm>: - +[0-9a-f]+: e59fc000 ldr ip, \[pc\] ; [0-9a-f]+ <__bar5_from_arm\+0x8> + +[0-9a-f]+: e59fc000 ldr ip, \[pc\] @ [0-9a-f]+ <__bar5_from_arm\+0x8> +[0-9a-f]+: e12fff1c bx ip +[0-9a-f]+: 0200302f .word 0x0200302f ... diff --git a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d index af44198..ca83b24 100644 --- a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d +++ b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d @@ -7,18 +7,18 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <.*> + .*: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + .*: e59fe004 ldr lr, \[pc, #4\] @ .* <.*> .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* .* <lib_func2@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* .* <lib_func1@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* Disassembly of section .text: @@ -31,18 +31,18 @@ Disassembly of section .text: .*: ebfffff1 bl .* <lib_func2@plt> .*: e89d6800 ldm sp, {fp, sp, lr} .*: e12fff1e bx lr - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .* <app_tfunc_close>: .*: b500 push {lr} .*: f7ff efdc blx .* <lib_func2@plt> .*: bd00 pop {pc} .*: 4770 bx lr - .*: 46c0 nop ; \(mov r8, r8\) + .*: 46c0 nop @ \(mov r8, r8\) #... .* <__app_func_veneer>: - .*: e51ff004 ldr pc, \[pc, #-4\] ; .* <__app_func_veneer\+0x4> + .*: e51ff004 ldr pc, \[pc, #-4\] @ .* <__app_func_veneer\+0x4> .*: 02100000 .word 0x02100000 Disassembly of section .far_arm: @@ -54,18 +54,18 @@ Disassembly of section .far_arm: .*: eb00000(7|5) bl .* <__lib_func2_veneer> .*: e89d6800 ldm sp, {fp, sp, lr} .*: e12fff1e bx lr - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .* <app_func2>: .*: e12fff1e bx lr #... .* <__lib_func(1|2)_veneer>: - .*: e51ff004 ldr pc, \[pc, #-4\] ; .* <__lib_func(1|2)_veneer\+0x4> + .*: e51ff004 ldr pc, \[pc, #-4\] @ .* <__lib_func(1|2)_veneer\+0x4> .*: 000081(e8|dc) .word 0x000081(e8|dc) .* <__lib_func(2|1)_veneer>: - .*: e51ff004 ldr pc, \[pc, #-4\] ; .* <__lib_func(2|1)_veneer\+0x4> + .*: e51ff004 ldr pc, \[pc, #-4\] @ .* <__lib_func(2|1)_veneer\+0x4> .*: 000081(dc|e8) .word 0x000081(dc|e8) Disassembly of section .far_thumb: @@ -75,9 +75,9 @@ Disassembly of section .far_thumb: .*: f000 e806 blx .* <__lib_func2_from_thumb> .*: bd00 pop {pc} .*: 4770 bx lr - .*: 46c0 nop ; \(mov r8, r8\) + .*: 46c0 nop @ \(mov r8, r8\) #... .* <__lib_func2_from_thumb>: - .*: e51ff004 ldr pc, \[pc, #-4\] ; 2200014 <__lib_func2_from_thumb\+0x4> + .*: e51ff004 ldr pc, \[pc, #-4\] @ 2200014 <__lib_func2_from_thumb\+0x4> .*: 000081dc .word 0x000081dc diff --git a/ld/testsuite/ld-arm/farcall-mixed-app.d b/ld/testsuite/ld-arm/farcall-mixed-app.d index 0160f46..7070dcb 100644 --- a/ld/testsuite/ld-arm/farcall-mixed-app.d +++ b/ld/testsuite/ld-arm/farcall-mixed-app.d @@ -7,8 +7,8 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <.*> + .*: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + .*: e59fe004 ldr lr, \[pc, #4\] @ .* <.*> .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* @@ -16,11 +16,11 @@ Disassembly of section .plt: .*: 4778 bx pc .*: e7fd b.n .+ <.+> .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* .* <lib_func1@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* Disassembly of section .text: @@ -33,18 +33,18 @@ Disassembly of section .text: .*: ebfffff2 bl .* <lib_func2@plt\+0x4> .*: e89d6800 ldm sp, {fp, sp, lr} .*: e12fff1e bx lr - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .* <app_tfunc_close>: .*: b500 push {lr} .*: f7ff ffdb bl 81dc <lib_func2@plt> .*: bd00 pop {pc} .*: 4770 bx lr - .*: 46c0 nop ; \(mov r8, r8\) + .*: 46c0 nop @ \(mov r8, r8\) #... .* <__app_func_veneer>: - .*: e51ff004 ldr pc, \[pc, #-4\] ; 8234 <__app_func_veneer\+0x4> + .*: e51ff004 ldr pc, \[pc, #-4\] @ 8234 <__app_func_veneer\+0x4> .*: 02100000 .word 0x02100000 Disassembly of section .far_arm: @@ -56,18 +56,18 @@ Disassembly of section .far_arm: .*: eb00000(7|5) bl .* <__lib_func2_veneer> .*: e89d6800 ldm sp, {fp, sp, lr} .*: e12fff1e bx lr - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .* <app_func2>: .*: e12fff1e bx lr #... .* <__lib_func(1|2)_veneer>: - .*: e51ff004 ldr pc, \[pc, #-4\] ; .* <__lib_func(1|2)_veneer\+0x4> + .*: e51ff004 ldr pc, \[pc, #-4\] @ .* <__lib_func(1|2)_veneer\+0x4> .*: 000081e(c|0) .word 0x000081e(c|0) .* <__lib_func(2|1)_veneer>: - .*: e51ff004 ldr pc, \[pc, #-4\] ; .* <__lib_func(2|1)_veneer\+0x4> + .*: e51ff004 ldr pc, \[pc, #-4\] @ .* <__lib_func(2|1)_veneer\+0x4> .*: 000081e(0|c) .word 0x000081e(0|c) Disassembly of section .far_thumb: @@ -77,12 +77,12 @@ Disassembly of section .far_thumb: .*: f000 f805 bl .* <__lib_func2_from_thumb> .*: bd00 pop {pc} .*: 4770 bx lr - .*: 46c0 nop ; \(mov r8, r8\) + .*: 46c0 nop @ \(mov r8, r8\) #... .* <__lib_func2_from_thumb>: .*: 4778 bx pc .*: e7fd b.n .+ <.+> - .*: e51ff004 ldr pc, \[pc, #-4\] ; 2200018 <__lib_func2_from_thumb\+0x8> + .*: e51ff004 ldr pc, \[pc, #-4\] @ 2200018 <__lib_func2_from_thumb\+0x8> .*: 000081e0 .word 0x000081e0 .*: 00000000 .word 0x00000000 diff --git a/ld/testsuite/ld-arm/farcall-mixed-app2.d b/ld/testsuite/ld-arm/farcall-mixed-app2.d index 0c70148..ff6bc27 100644 --- a/ld/testsuite/ld-arm/farcall-mixed-app2.d +++ b/ld/testsuite/ld-arm/farcall-mixed-app2.d @@ -7,8 +7,8 @@ start address 0x.* Disassembly of section .plt: .* <.*>: - .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <.*> + .*: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + .*: e59fe004 ldr lr, \[pc, #4\] @ .* <.*> .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* @@ -16,11 +16,11 @@ Disassembly of section .plt: .*: 4778 bx pc .*: e7fd b.n .+ <.+> .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* .* <lib_func1@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* Disassembly of section .text: @@ -33,18 +33,18 @@ Disassembly of section .text: .*: ebfffff2 bl .* <lib_func2@plt\+0x4> .*: e89d6800 ldm sp, {fp, sp, lr} .*: e12fff1e bx lr - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .* <app_tfunc_close>: .*: b500 push {lr} .*: f7ff efde blx 81e0 <lib_func2@plt\+0x4> .*: bd00 pop {pc} .*: 4770 bx lr - .*: 46c0 nop ; \(mov r8, r8\) + .*: 46c0 nop @ \(mov r8, r8\) #... .* <__app_func_veneer>: - .*: e51ff004 ldr pc, \[pc, #-4\] ; 8234 <__app_func_veneer\+0x4> + .*: e51ff004 ldr pc, \[pc, #-4\] @ 8234 <__app_func_veneer\+0x4> .*: 02100000 .word 0x02100000 Disassembly of section .mid_thumb: @@ -57,7 +57,7 @@ Disassembly of section .mid_thumb: .* <__lib_func2_from_thumb>: .*: 4778 bx pc .*: e7fd b.n .+ <.+> - .*: e51ff004 ldr pc, \[pc, #-4\] ; 10081e8 <__lib_func2_from_thumb\+0x8> + .*: e51ff004 ldr pc, \[pc, #-4\] @ 10081e8 <__lib_func2_from_thumb\+0x8> .*: 000081e0 .word 0x000081e0 .*: 00000000 .word 0x00000000 @@ -70,18 +70,18 @@ Disassembly of section .far_arm: .*: eb000007 bl .* <__lib_func2_veneer> .*: e89d6800 ldm sp, {fp, sp, lr} .*: e12fff1e bx lr - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .* <app_func2>: .*: e12fff1e bx lr #... .* <__lib_func1_veneer>: - .*: e51ff004 ldr pc, \[pc, #-4\] ; .* <__lib_func1_veneer\+0x4> + .*: e51ff004 ldr pc, \[pc, #-4\] @ .* <__lib_func1_veneer\+0x4> .*: 000081ec .word 0x000081ec .* <__lib_func2_veneer>: - .*: e51ff004 ldr pc, \[pc, #-4\] ; .* <__lib_func2_veneer\+0x4> + .*: e51ff004 ldr pc, \[pc, #-4\] @ .* <__lib_func2_veneer\+0x4> .*: 000081e0 .word 0x000081e0 Disassembly of section .far_thumb: @@ -91,9 +91,9 @@ Disassembly of section .far_thumb: .*: f000 e806 blx .* <__lib_func2_from_thumb> .*: bd00 pop {pc} .*: 4770 bx lr - .*: 46c0 nop ; \(mov r8, r8\) + .*: 46c0 nop @ \(mov r8, r8\) #... .* <__lib_func2_from_thumb>: - .*: e51ff004 ldr pc, \[pc, #-4\] ; 2200014 <__lib_func2_from_thumb\+0x4> + .*: e51ff004 ldr pc, \[pc, #-4\] @ 2200014 <__lib_func2_from_thumb\+0x4> .*: 000081e0 .word 0x000081e0 diff --git a/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d b/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d index 1b15879..6e2fbc9 100644 --- a/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d +++ b/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d @@ -6,8 +6,8 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <.*> + .*: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + .*: e59fe004 ldr lr, \[pc, #4\] @ .* <.*> .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* .word .* @@ -15,26 +15,26 @@ Disassembly of section .plt: .*: 4778 bx pc .*: e7fd b.n .+ <.+> .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* - .*: e5bcf.* ldr pc, \[ip, #.*\]! ; .* + .*: e28cca.* add ip, ip, #.* @ 0x.* + .*: e5bcf.* ldr pc, \[ip, #.*\]! @ .* .* <app_func_weak@plt>: .*: 4778 bx pc .*: e7fd b.n .+ <.+> .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* - .*: e5bcf.* ldr pc, \[ip, #.*\]! ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* + .*: e5bcf.* ldr pc, \[ip, #.*\]! @ 0x.* .* <lib_func3@plt>: .*: 4778 bx pc .*: e7fd b.n .+ <.+> .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* - .*: e5bcf.* ldr pc, \[ip, #.*\]! ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* + .*: e5bcf.* ldr pc, \[ip, #.*\]! @ 0x.* .* <lib_func4@plt>: .*: 4778 bx pc .*: e7fd b.n .+ <.+> .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* - .*: e5bcf.* ldr pc, \[ip, #.*\]! ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* + .*: e5bcf.* ldr pc, \[ip, #.*\]! @ 0x.* Disassembly of section .text: @@ -60,28 +60,28 @@ Disassembly of section .text: .* <__app_func_from_thumb>: .*: 4778 bx pc .*: e7fd b.n .+ <.+> - .*: e59fc000 ldr ip, \[pc\] ; .* <__app_func_from_thumb\+0xc> + .*: e59fc000 ldr ip, \[pc\] @ .* <__app_func_from_thumb\+0xc> .*: e08cf00f add pc, ip, pc .*: feffff.. .word 0xfeffff.. .* <__lib_func4_from_thumb>: .*: 4778 bx pc .*: e7fd b.n .+ <.+> - .*: e59fc000 ldr ip, \[pc\] ; .* <__lib_func4_from_thumb\+0xc> + .*: e59fc000 ldr ip, \[pc\] @ .* <__lib_func4_from_thumb\+0xc> .*: e08cf00f add pc, ip, pc .*: feffff.. .word 0xfeffff.. .* <__app_func_weak_from_thumb>: .*: 4778 bx pc .*: e7fd b.n .+ <.+> - .*: e59fc000 ldr ip, \[pc\] ; .* <__app_func_weak_from_thumb\+0xc> + .*: e59fc000 ldr ip, \[pc\] @ .* <__app_func_weak_from_thumb\+0xc> .*: e08cf00f add pc, ip, pc .*: feffff.. .word 0xfeffff.. .* <__lib_func3_from_thumb>: .*: 4778 bx pc .*: e7fd b.n .+ <.+> - .*: e59fc000 ldr ip, \[pc\] ; .* <__lib_func3_from_thumb\+0xc> + .*: e59fc000 ldr ip, \[pc\] @ .* <__lib_func3_from_thumb\+0xc> .*: e08cf00f add pc, ip, pc .*: feffff.. .word 0xfeffff.. ... @@ -95,25 +95,25 @@ Disassembly of section .text: .* <__app_func_weak_from_thumb>: .*: 4778 bx pc .*: e7fd b.n .+ <.+> - .*: e59fc000 ldr ip, \[pc\] ; .* <__app_func_weak_from_thumb\+0xc> + .*: e59fc000 ldr ip, \[pc\] @ .* <__app_func_weak_from_thumb\+0xc> .*: e08cf00f add pc, ip, pc .*: fdffff34 .word 0xfdffff34 .* <__app_func_from_thumb>: .*: 4778 bx pc .*: e7fd b.n .+ <.+> - .*: e59fc000 ldr ip, \[pc\] ; .* <__app_func_from_thumb\+0xc> + .*: e59fc000 ldr ip, \[pc\] @ .* <__app_func_from_thumb\+0xc> .*: e08cf00f add pc, ip, pc .*: fdffff14 .word 0xfdffff14 .* <lib_func3>: - .*: e59fc004 ldr ip, \[pc, #4\] ; .* <lib_func3\+0xc> + .*: e59fc004 ldr ip, \[pc, #4\] @ .* <lib_func3\+0xc> .*: e08cc00f add ip, ip, pc .*: e12fff1c bx ip .*: ffffffc5 .word 0xffffffc5 .* <lib_func2>: - .*: e59fc004 ldr ip, \[pc, #4\] ; .* <lib_func2\+0xc> + .*: e59fc004 ldr ip, \[pc, #4\] @ .* <lib_func2\+0xc> .*: e08cc00f add ip, ip, pc .*: e12fff1c bx ip .*: feffff55 .word 0xfeffff55 diff --git a/ld/testsuite/ld-arm/farcall-mixed-lib.d b/ld/testsuite/ld-arm/farcall-mixed-lib.d index ef21428..3925e7d 100644 --- a/ld/testsuite/ld-arm/farcall-mixed-lib.d +++ b/ld/testsuite/ld-arm/farcall-mixed-lib.d @@ -6,26 +6,26 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <.*> + .*: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + .*: e59fe004 ldr lr, \[pc, #4\] @ .* <.*> .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* .* <app_func@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* .* <app_func_weak@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* .* <lib_func3@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* .* <lib_func4@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* Disassembly of section .text: @@ -51,22 +51,22 @@ Disassembly of section .text: #... .* <__lib_func3_from_thumb>: - .*: e59fc000 ldr ip, \[pc\] ; .* <__lib_func3_from_thumb\+0x8> + .*: e59fc000 ldr ip, \[pc\] @ .* <__lib_func3_from_thumb\+0x8> .*: e08ff00c add pc, pc, ip .*: feffff.. .word 0xfeffff.. .* <__app_func_weak_from_thumb>: - .*: e59fc000 ldr ip, \[pc\] ; .* <__app_func_weak_from_thumb\+0x8> + .*: e59fc000 ldr ip, \[pc\] @ .* <__app_func_weak_from_thumb\+0x8> .*: e08ff00c add pc, pc, ip .*: feffff.. .word 0xfeffff.. .* <__lib_func4_from_thumb>: - .*: e59fc000 ldr ip, \[pc\] ; .* <__lib_func4_from_thumb\+0x8> + .*: e59fc000 ldr ip, \[pc\] @ .* <__lib_func4_from_thumb\+0x8> .*: e08ff00c add pc, pc, ip .*: feffff.. .word 0xfeffff.. .* <__app_func_from_thumb>: - .*: e59fc000 ldr ip, \[pc\] ; .* <__app_func_from_thumb\+0x8> + .*: e59fc000 ldr ip, \[pc\] @ .* <__app_func_from_thumb\+0x8> .*: e08ff00c add pc, pc, ip .*: feffff.. .word 0xfeffff.. ... @@ -78,12 +78,12 @@ Disassembly of section .text: #... .* <__app_func_weak_from_thumb>: - .*: e59fc000 ldr ip, \[pc\] ; .* <__app_func_weak_from_thumb\+0x8> + .*: e59fc000 ldr ip, \[pc\] @ .* <__app_func_weak_from_thumb\+0x8> .*: e08ff00c add pc, pc, ip .*: fdffff40 .word 0xfdffff40 .* <__app_func_from_thumb>: - .*: e59fc000 ldr ip, \[pc\] ; .* <__app_func_from_thumb\+0x8> + .*: e59fc000 ldr ip, \[pc\] @ .* <__app_func_from_thumb\+0x8> .*: e08ff00c add pc, pc, ip .*: fdffff28 .word 0xfdffff28 ... diff --git a/ld/testsuite/ld-arm/farcall-thumb-arm-blx-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-arm-blx-pic-veneer.d index ba10356..fec5447 100644 --- a/ld/testsuite/ld-arm/farcall-thumb-arm-blx-pic-veneer.d +++ b/ld/testsuite/ld-arm/farcall-thumb-arm-blx-pic-veneer.d @@ -8,7 +8,7 @@ Disassembly of section .text: 1f01014: f0ff effe blx 2001014 <bar> 01f01018 <__bar_from_thumb>: - 1f01018: e59fc000 ldr ip, \[pc\] ; 1f01020 <__bar_from_thumb\+0x8> + 1f01018: e59fc000 ldr ip, \[pc\] @ 1f01020 <__bar_from_thumb\+0x8> 1f0101c: e08ff00c add pc, pc, ip 1f01020: 000ffff0 .word 0x000ffff0 1f01024: 00000000 .word 0x00000000 diff --git a/ld/testsuite/ld-arm/farcall-thumb-arm-blx.d b/ld/testsuite/ld-arm/farcall-thumb-arm-blx.d index 4a2b36a..e369354 100644 --- a/ld/testsuite/ld-arm/farcall-thumb-arm-blx.d +++ b/ld/testsuite/ld-arm/farcall-thumb-arm-blx.d @@ -8,7 +8,7 @@ Disassembly of section .text: 1f01014: f0ff effe blx 2001014 <bar> 01f01018 <__bar_from_thumb>: - 1f01018: e51ff004 ldr pc, \[pc, #-4\] ; 1f0101c <__bar_from_thumb\+0x4> + 1f01018: e51ff004 ldr pc, \[pc, #-4\] @ 1f0101c <__bar_from_thumb\+0x4> 1f0101c: 02001014 .word 0x02001014 Disassembly of section .foo: diff --git a/ld/testsuite/ld-arm/farcall-thumb-arm-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-arm-pic-veneer.d index f96d467..d3fa40b 100644 --- a/ld/testsuite/ld-arm/farcall-thumb-arm-pic-veneer.d +++ b/ld/testsuite/ld-arm/farcall-thumb-arm-pic-veneer.d @@ -10,7 +10,7 @@ Disassembly of section .text: 01f01018 <__bar_from_thumb>: 1f01018: 4778 bx pc 1f0101a: e7fd b.n .+ <.+> - 1f0101c: e59fc000 ldr ip, \[pc\] ; 1f01024 <__bar_from_thumb\+0xc> + 1f0101c: e59fc000 ldr ip, \[pc\] @ 1f01024 <__bar_from_thumb\+0xc> 1f01020: e08cf00f add pc, ip, pc 1f01024: 000fffec .word 0x000fffec diff --git a/ld/testsuite/ld-arm/farcall-thumb-arm.d b/ld/testsuite/ld-arm/farcall-thumb-arm.d index d62649d..84ec1af 100644 --- a/ld/testsuite/ld-arm/farcall-thumb-arm.d +++ b/ld/testsuite/ld-arm/farcall-thumb-arm.d @@ -10,7 +10,7 @@ Disassembly of section .text: 01f01018 <__bar_from_thumb>: 1f01018: 4778 bx pc 1f0101a: e7fd b.n .+ <.+> - 1f0101c: e51ff004 ldr pc, \[pc, #-4\] ; 1f01020 <__bar_from_thumb\+0x8> + 1f0101c: e51ff004 ldr pc, \[pc, #-4\] @ 1f01020 <__bar_from_thumb\+0x8> 1f01020: 02001014 .word 0x02001014 01f01024 <__bar_from_thumb>: diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d index 27b208e..c3bf1da 100644 --- a/ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d +++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d @@ -8,7 +8,7 @@ Disassembly of section .text: \.\.\. 00001008 <__bar_veneer>: - 1008: e59fc004 ldr ip, \[pc, #4\] ; 1014 <__bar_veneer\+0xc> + 1008: e59fc004 ldr ip, \[pc, #4\] @ 1014 <__bar_veneer\+0xc> 100c: e08fc00c add ip, pc, ip 1010: e12fff1c bx ip 1014: 02000001 .word 0x02000001 diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d index 7998746..5661c4c 100644 --- a/ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d +++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-blx.d @@ -8,7 +8,7 @@ Disassembly of section .text: \.\.\. 00001008 <__bar_veneer>: - 1008: e51ff004 ldr pc, \[pc, #-4\] ; 100c <__bar_veneer\+0x4> + 1008: e51ff004 ldr pc, \[pc, #-4\] @ 100c <__bar_veneer\+0x4> 100c: 02001015 .word 0x02001015 Disassembly of section .foo: diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-m-no-profile.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-m-no-profile.d index 7d89b52..ee412a1 100644 --- a/ld/testsuite/ld-arm/farcall-thumb-thumb-m-no-profile.d +++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-m-no-profile.d @@ -9,7 +9,7 @@ Disassembly of section .text: 00001008 <__myfunc_veneer>: 1008: b401 push {r0} - 100a: 4802 ldr r0, \[pc, #8\] ; \(1014 <__myfunc_veneer\+0xc>\) + 100a: 4802 ldr r0, \[pc, #8\] @ \(1014 <__myfunc_veneer\+0xc>\) 100c: 4684 mov ip, r0 100e: bc01 pop {r0} 1010: 4760 bx ip diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d index 974c1e9..40c2511 100644 --- a/ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d +++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-m-pic-veneer.d @@ -9,7 +9,7 @@ Disassembly of section .text: 00001008 <__bar_veneer>: 1008: b401 push {r0} - 100a: 4802 ldr r0, \[pc, #8\] ; \(1014 <__bar_veneer\+0xc>\) + 100a: 4802 ldr r0, \[pc, #8\] @ \(1014 <__bar_veneer\+0xc>\) 100c: 46fc mov ip, pc 100e: 4484 add ip, r0 1010: bc01 pop {r0} diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-m.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-m.d index e63b3f8..9316075 100644 --- a/ld/testsuite/ld-arm/farcall-thumb-thumb-m.d +++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-m.d @@ -9,7 +9,7 @@ Disassembly of section .text: 00001008 <__bar_veneer>: 1008: b401 push {r0} - 100a: 4802 ldr r0, \[pc, #8\] ; \(1014 <__bar_veneer\+0xc>\) + 100a: 4802 ldr r0, \[pc, #8\] @ \(1014 <__bar_veneer\+0xc>\) 100c: 4684 mov ip, r0 100e: bc01 pop {r0} 1010: 4760 bx ip diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d b/ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d index 0b7184b..6174c64 100644 --- a/ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d +++ b/ld/testsuite/ld-arm/farcall-thumb-thumb-pic-veneer.d @@ -10,7 +10,7 @@ Disassembly of section .text: 00001008 <__bar_veneer>: 1008: 4778 bx pc 100a: e7fd b.n .+ <.+> - 100c: e59fc004 ldr ip, \[pc, #4\] ; 1018 <__bar_veneer\+0x10> + 100c: e59fc004 ldr ip, \[pc, #4\] @ 1018 <__bar_veneer\+0x10> 1010: e08fc00c add ip, pc, ip 1014: e12fff1c bx ip 1018: 01fffffd .word 0x01fffffd diff --git a/ld/testsuite/ld-arm/farcall-thumb-thumb.d b/ld/testsuite/ld-arm/farcall-thumb-thumb.d index 0d9a898..7680ce2 100644 --- a/ld/testsuite/ld-arm/farcall-thumb-thumb.d +++ b/ld/testsuite/ld-arm/farcall-thumb-thumb.d @@ -10,7 +10,7 @@ Disassembly of section .text: 00001008 <__bar_veneer>: 1008: 4778 bx pc 100a: e7fd b.n .+ <.+> - 100c: e59fc000 ldr ip, \[pc\] ; 1014 <__bar_veneer\+0xc> + 100c: e59fc000 ldr ip, \[pc\] @ 1014 <__bar_veneer\+0xc> 1010: e12fff1c bx ip 1014: 02001015 .word 0x02001015 Disassembly of section .foo: diff --git a/ld/testsuite/ld-arm/farcall-thumb2-purecode.d b/ld/testsuite/ld-arm/farcall-thumb2-purecode.d index 2a62fe4..4518326 100644 --- a/ld/testsuite/ld-arm/farcall-thumb2-purecode.d +++ b/ld/testsuite/ld-arm/farcall-thumb2-purecode.d @@ -13,7 +13,7 @@ Disassembly of section .foo: \.\.\. 02001028 <__bar_veneer>: - 2001028: f241 0c01 movw ip, #4097 ; 0x1001 + 2001028: f241 0c01 movw ip, #4097 @ 0x1001 200102c: f2c0 0c00 movt ip, #0 2001030: 4760 bx ip 2001032: 0000 movs r0, r0 diff --git a/ld/testsuite/ld-arm/farcall-thumb2-thumb2-m.d b/ld/testsuite/ld-arm/farcall-thumb2-thumb2-m.d index 5809941..45133ec 100644 --- a/ld/testsuite/ld-arm/farcall-thumb2-thumb2-m.d +++ b/ld/testsuite/ld-arm/farcall-thumb2-thumb2-m.d @@ -8,7 +8,7 @@ Disassembly of section .text: \.\.\. 00001008 <__bar_veneer>: - 1008: f85f f000 ldr.w pc, \[pc\] ; 100c <__bar_veneer\+0x4> + 1008: f85f f000 ldr.w pc, \[pc\] @ 100c <__bar_veneer\+0x4> 100c: 02001015 .word 0x02001015 Disassembly of section .foo: diff --git a/ld/testsuite/ld-arm/fdpic-main-m.d b/ld/testsuite/ld-arm/fdpic-main-m.d index ed0f41a..ada628b 100644 --- a/ld/testsuite/ld-arm/fdpic-main-m.d +++ b/ld/testsuite/ld-arm/fdpic-main-m.d @@ -7,23 +7,23 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: f8df c00c ldr.w ip, \[pc, #12\] ; .* <.plt\+0x10> + .*: f8df c00c ldr.w ip, \[pc, #12\] @ .* <.plt\+0x10> .*: eb0c 0c09 add.w ip, ip, r9 .*: f8dc 9004 ldr.w r9, \[ip, #4\] .*: f8dc f000 ldr.w pc, \[ip\] .*: 0000000c .word 0x0000000c .*: 00000000 .word 0x00000000 - .*: f85f c008 ldr.w ip, \[pc, #-8\] ; .* <.plt\+0x14> + .*: f85f c008 ldr.w ip, \[pc, #-8\] @ .* <.plt\+0x14> .*: f84d cd04 str.w ip, \[sp, #-4\]! .*: f8d9 c004 ldr.w ip, \[r9, #4\] .*: f8d9 f000 ldr.w pc, \[r9\] - .*: f8df c00c ldr.w ip, \[pc, #12\] ; .* <.plt\+0x38> + .*: f8df c00c ldr.w ip, \[pc, #12\] @ .* <.plt\+0x38> .*: eb0c 0c09 add.w ip, ip, r9 .*: f8dc 9004 ldr.w r9, \[ip, #4\] .*: f8dc f000 ldr.w pc, \[ip] .*: 00000014 .word 0x00000014 .*: 00000008 .word 0x00000008 - .*: f85f c008 ldr.w ip, \[pc, #-8\] ; .* <.plt\+0x3c> + .*: f85f c008 ldr.w ip, \[pc, #-8\] @ .* <.plt\+0x3c> .*: f84d cd04 str.w ip, \[sp, #-4\]! .*: f8d9 c004 ldr.w ip, \[r9, #4\] .*: f8d9 f000 ldr.w pc, \[r9\] @@ -34,8 +34,8 @@ Disassembly of section .text: .*: f000 b800 b.w .* <main> .* <main>: - .*: 4a11 ldr r2, \[pc, #68\] ; .* <main\+0x48>.* - .*: 4b12 ldr r3, \[pc, #72\] ; .* <main\+0x4c>.* + .*: 4a11 ldr r2, \[pc, #68\] @ .* <main\+0x48>.* + .*: 4b12 ldr r3, \[pc, #72\] @ .* <main\+0x4c>.* .*: b570 push {r4, r5, r6, lr} .*: f859 5002 ldr.w r5, \[r9, r2\] .*: 464c mov r4, r9 @@ -47,14 +47,14 @@ Disassembly of section .text: .*: 6828 ldr r0, \[r5, #0\] .*: 46a1 mov r9, r4 .*: f7ff ffd9 bl .* <.plt\+0x28> - .*: 4b0b ldr r3, \[pc, #44\] ; .* <main\+0x50>.* + .*: 4b0b ldr r3, \[pc, #44\] @ .* <main\+0x50>.* .*: 46a1 mov r9, r4 .*: 444b add r3, r9 .*: 4618 mov r0, r3 .*: 602b str r3, \[r5, #0\] .*: 46a1 mov r9, r4 .*: f7ff ffd1 bl .* <.plt\+0x28> - .*: 4b08 ldr r3, \[pc, #32\] ; .* <main\+0x54>.* + .*: 4b08 ldr r3, \[pc, #32\] @ .* <main\+0x54>.* .*: 46a1 mov r9, r4 .*: f859 3003 ldr.w r3, \[r9, r3\] .*: 6818 ldr r0, \[r3, #0\] diff --git a/ld/testsuite/ld-arm/fdpic-main.d b/ld/testsuite/ld-arm/fdpic-main.d index cc129c3..9311af1 100644 --- a/ld/testsuite/ld-arm/fdpic-main.d +++ b/ld/testsuite/ld-arm/fdpic-main.d @@ -7,23 +7,23 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: e59fc008 ldr ip, \[pc, #8\] ; .* <.plt\+0x10> + .*: e59fc008 ldr ip, \[pc, #8\] @ .* <.plt\+0x10> .*: e08cc009 add ip, ip, r9 .*: e59c9004 ldr r9, \[ip, #4\] .*: e59cf000 ldr pc, \[ip\] .*: 0000000c .word 0x0000000c .*: 00000000 .word 0x00000000 - .*: e51fc00c ldr ip, \[pc, #-12\] ; .* <.plt\+0x14> + .*: e51fc00c ldr ip, \[pc, #-12\] @ .* <.plt\+0x14> .*: e92d1000 stmfd sp!, {ip} .*: e599c004 ldr ip, \[r9, #4\] .*: e599f000 ldr pc, \[r9\] - .*: e59fc008 ldr ip, \[pc, #8\] ; .* <.plt\+0x38> + .*: e59fc008 ldr ip, \[pc, #8\] @ .* <.plt\+0x38> .*: e08cc009 add ip, ip, r9 .*: e59c9004 ldr r9, \[ip, #4\] .*: e59cf000 ldr pc, \[ip] .*: 00000014 .word 0x00000014 .*: 00000008 .word 0x00000008 - .*: e51fc00c ldr ip, \[pc, #-12\] ; .* <.plt\+0x3c> + .*: e51fc00c ldr ip, \[pc, #-12\] @ .* <.plt\+0x3c> .*: e92d1000 stmfd sp!, {ip} .*: e599c004 ldr ip, \[r9, #4\] .*: e599f000 ldr pc, \[r9\] @@ -34,8 +34,8 @@ Disassembly of section .text: .*: eaffffff b .* <main> .* <main>: - .*: e59f206c ldr r2, \[pc, #108\] ; .* <main\+0x74> - .*: e59f306c ldr r3, \[pc, #108\] ; .* <main\+0x78> + .*: e59f206c ldr r2, \[pc, #108\] @ .* <main\+0x74> + .*: e59f306c ldr r3, \[pc, #108\] @ .* <main\+0x78> .*: e92d4070 push {r4, r5, r6, lr} .*: e7995002 ldr r5, \[r9, r2\] .*: e1a04009 mov r4, r9 @@ -47,14 +47,14 @@ Disassembly of section .text: .*: e5950000 ldr r0, \[r5\] .*: e1a09004 mov r9, r4 .*: ebffffe7 bl .* <.plt\+0x28> - .*: e59f3040 ldr r3, \[pc, #64\] ; .* <main\+0x7c> + .*: e59f3040 ldr r3, \[pc, #64\] @ .* <main\+0x7c> .*: e1a09004 mov r9, r4 .*: e0833009 add r3, r3, r9 .*: e1a00003 mov r0, r3 .*: e5853000 str r3, \[r5\] .*: e1a09004 mov r9, r4 .*: ebffffe0 bl .* <.plt\+0x28> - .*: e59f3028 ldr r3, \[pc, #40\] ; .* <main\+0x80> + .*: e59f3028 ldr r3, \[pc, #40\] @ .* <main\+0x80> .*: e1a09004 mov r9, r4 .*: e7993003 ldr r3, \[r9, r3\] .*: e5930000 ldr r0, \[r3\] diff --git a/ld/testsuite/ld-arm/fdpic-shared-m.d b/ld/testsuite/ld-arm/fdpic-shared-m.d index 49e4d2c..3ff2892 100644 --- a/ld/testsuite/ld-arm/fdpic-shared-m.d +++ b/ld/testsuite/ld-arm/fdpic-shared-m.d @@ -7,13 +7,13 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: f8df c00c ldr.w ip, \[pc, #12\] ; .* <.plt\+0x10> + .*: f8df c00c ldr.w ip, \[pc, #12\] @ .* <.plt\+0x10> .*: eb0c 0c09 add.w ip, ip, r9 .*: f8dc 9004 ldr.w r9, \[ip, #4\] .*: f8dc f000 ldr.w pc, \[ip\] .*: 0000000c .word 0x0000000c .*: 00000000 .word 0x00000000 - .*: f85f c008 ldr.w ip, \[pc, #-8\] ; .* <.plt\+0x14> + .*: f85f c008 ldr.w ip, \[pc, #-8\] @ .* <.plt\+0x14> .*: f84d cd04 str.w ip, \[sp, #-4\]! .*: f8d9 c004 ldr.w ip, \[r9, #4\] .*: f8d9 f000 ldr.w pc, \[r9\] diff --git a/ld/testsuite/ld-arm/fdpic-shared.d b/ld/testsuite/ld-arm/fdpic-shared.d index 438c0e9..4b65bd9 100644 --- a/ld/testsuite/ld-arm/fdpic-shared.d +++ b/ld/testsuite/ld-arm/fdpic-shared.d @@ -7,13 +7,13 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: e59fc008 ldr ip, \[pc, #8\] ; .* <.plt\+0x10> + .*: e59fc008 ldr ip, \[pc, #8\] @ .* <.plt\+0x10> .*: e08cc009 add ip, ip, r9 .*: e59c9004 ldr r9, \[ip, #4\] .*: e59cf000 ldr pc, \[ip\] .*: 0000000c .word 0x0000000c .*: 00000000 .word 0x00000000 - .*: e51fc00c ldr ip, \[pc, #-12\] ; .* <.plt\+0x14> + .*: e51fc00c ldr ip, \[pc, #-12\] @ .* <.plt\+0x14> .*: e92d1000 stmfd sp!, {ip} .*: e599c004 ldr ip, \[r9, #4\] .*: e599f000 ldr pc, \[r9\] diff --git a/ld/testsuite/ld-arm/fix-arm1176-off.d b/ld/testsuite/ld-arm/fix-arm1176-off.d index 2693873..b769906 100644 --- a/ld/testsuite/ld-arm/fix-arm1176-off.d +++ b/ld/testsuite/ld-arm/fix-arm1176-off.d @@ -8,7 +8,7 @@ Disassembly of section .foo: +[0-9a-f]+: f000 e800 blx 2001018 <__func_to_branch_to_veneer> [0-9a-f]+ <__func_to_branch_to_veneer>: - +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] ; 200101c <__func_to_branch_to_veneer\+0x4> + +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] @ 200101c <__func_to_branch_to_veneer\+0x4> +[0-9a-f]+: ........ .word 0x........ Disassembly of section .text: diff --git a/ld/testsuite/ld-arm/fix-arm1176-on.d b/ld/testsuite/ld-arm/fix-arm1176-on.d index 46510dc..8bf72a8 100644 --- a/ld/testsuite/ld-arm/fix-arm1176-on.d +++ b/ld/testsuite/ld-arm/fix-arm1176-on.d @@ -10,7 +10,7 @@ Disassembly of section .foo: [0-9a-f]+ <__func_to_branch_to_veneer>: +[0-9a-f]+: 4778 bx pc +[0-9a-f]+: e7fd b.n .+ <.+> - +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] ; 2001020 <__func_to_branch_to_veneer\+0x8> + +[0-9a-f]+: e51ff004 ldr pc, \[pc, #-4\] @ 2001020 <__func_to_branch_to_veneer\+0x8> +[0-9a-f]+: ........ .word 0x........ +[0-9a-f]+: 00000000 .word 0x00000000 diff --git a/ld/testsuite/ld-arm/gc-hidden-1.d b/ld/testsuite/ld-arm/gc-hidden-1.d index 9e20d43..6fd1eaa 100644 --- a/ld/testsuite/ld-arm/gc-hidden-1.d +++ b/ld/testsuite/ld-arm/gc-hidden-1.d @@ -18,7 +18,7 @@ DYNAMIC SYMBOL TABLE: Disassembly of section .text: 0+[0-9a-f]+ <_start>: -\s*[0-9a-f]+:\s+e52de004\s+push {lr} ; \(str lr, \[sp, #-4\]!\) +\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} diff --git a/ld/testsuite/ld-arm/group-relocs.d b/ld/testsuite/ld-arm/group-relocs.d index d928261..1bfd5cf 100644 --- a/ld/testsuite/ld-arm/group-relocs.d +++ b/ld/testsuite/ld-arm/group-relocs.d @@ -4,52 +4,52 @@ tmpdir/group-relocs: file format elf32-(little|big)arm.* Disassembly of section .text: 00008000 <_start>: - 8000: e28f00bc add r0, pc, #188 ; 0xbc - 8004: e28f0c6e add r0, pc, #28160 ; 0x6e00 - 8008: e28000ec add r0, r0, #236 ; 0xec - 800c: e28f08ff add r0, pc, #16711680 ; 0xff0000 - 8010: e2800c6e add r0, r0, #28160 ; 0x6e00 - 8014: e28000e4 add r0, r0, #228 ; 0xe4 + 8000: e28f00bc add r0, pc, #188 @ 0xbc + 8004: e28f0c6e add r0, pc, #28160 @ 0x6e00 + 8008: e28000ec add r0, r0, #236 @ 0xec + 800c: e28f08ff add r0, pc, #16711680 @ 0xff0000 + 8010: e2800c6e add r0, r0, #28160 @ 0x6e00 + 8014: e28000e4 add r0, r0, #228 @ 0xe4 8018: e280000c add r0, r0, #12 - 801c: e2800cee add r0, r0, #60928 ; 0xee00 - 8020: e28000f0 add r0, r0, #240 ; 0xf0 - 8024: e28008ff add r0, r0, #16711680 ; 0xff0000 - 8028: e2800cee add r0, r0, #60928 ; 0xee00 - 802c: e28000f0 add r0, r0, #240 ; 0xf0 - 8030: e28f0c6e add r0, pc, #28160 ; 0x6e00 + 801c: e2800cee add r0, r0, #60928 @ 0xee00 + 8020: e28000f0 add r0, r0, #240 @ 0xf0 + 8024: e28008ff add r0, r0, #16711680 @ 0xff0000 + 8028: e2800cee add r0, r0, #60928 @ 0xee00 + 802c: e28000f0 add r0, r0, #240 @ 0xf0 + 8030: e28f0c6e add r0, pc, #28160 @ 0x6e00 8034: e59010c0 ldr r1, \[r0, #192\].* - 8038: e28f08ff add r0, pc, #16711680 ; 0xff0000 - 803c: e2800c6e add r0, r0, #28160 ; 0x6e00 + 8038: e28f08ff add r0, pc, #16711680 @ 0xff0000 + 803c: e2800c6e add r0, r0, #28160 @ 0x6e00 8040: e59010b8 ldr r1, \[r0, #184\].* 8044: e590100c ldr r1, \[r0, #12\] - 8048: e2800cee add r0, r0, #60928 ; 0xee00 + 8048: e2800cee add r0, r0, #60928 @ 0xee00 804c: e59010f0 ldr r1, \[r0, #240\].* - 8050: e28008ff add r0, r0, #16711680 ; 0xff0000 - 8054: e2800cee add r0, r0, #60928 ; 0xee00 + 8050: e28008ff add r0, r0, #16711680 @ 0xff0000 + 8054: e2800cee add r0, r0, #60928 @ 0xee00 8058: e59010f0 ldr r1, \[r0, #240\].* 805c: e1cf26d0 ldrd r2, \[pc, #96\].* - 8060: e28f0c6e add r0, pc, #28160 ; 0x6e00 + 8060: e28f0c6e add r0, pc, #28160 @ 0x6e00 8064: e1c029d0 ldrd r2, \[r0, #144\].* - 8068: e28f08ff add r0, pc, #16711680 ; 0xff0000 - 806c: e2800c6e add r0, r0, #28160 ; 0x6e00 + 8068: e28f08ff add r0, pc, #16711680 @ 0xff0000 + 806c: e2800c6e add r0, r0, #28160 @ 0x6e00 8070: e1c028d8 ldrd r2, \[r0, #136\].* 8074: e1c020dc ldrd r2, \[r0, #12\] - 8078: e2800cee add r0, r0, #60928 ; 0xee00 + 8078: e2800cee add r0, r0, #60928 @ 0xee00 807c: e1c02fd0 ldrd r2, \[r0, #240\].* - 8080: e28008ff add r0, r0, #16711680 ; 0xff0000 - 8084: e2800cee add r0, r0, #60928 ; 0xee00 + 8080: e28008ff add r0, r0, #16711680 @ 0xff0000 + 8084: e2800cee add r0, r0, #60928 @ 0xee00 8088: e1c02fd0 ldrd r2, \[r0, #240\].* 808c: ed9f000c ldc 0, cr0, \[pc, #48\].* - 8090: e28f0c6e add r0, pc, #28160 ; 0x6e00 + 8090: e28f0c6e add r0, pc, #28160 @ 0x6e00 8094: ed900018 ldc 0, cr0, \[r0, #96\].* - 8098: e28f08ff add r0, pc, #16711680 ; 0xff0000 - 809c: e2800c6e add r0, r0, #28160 ; 0x6e00 + 8098: e28f08ff add r0, pc, #16711680 @ 0xff0000 + 809c: e2800c6e add r0, r0, #28160 @ 0x6e00 80a0: ed900016 ldc 0, cr0, \[r0, #88\].* 80a4: ed900003 ldc 0, cr0, \[r0, #12\] - 80a8: e2800cee add r0, r0, #60928 ; 0xee00 + 80a8: e2800cee add r0, r0, #60928 @ 0xee00 80ac: ed90003c ldc 0, cr0, \[r0, #240\].* - 80b0: e28008ff add r0, r0, #16711680 ; 0xff0000 - 80b4: e2800cee add r0, r0, #60928 ; 0xee00 + 80b0: e28008ff add r0, r0, #16711680 @ 0xff0000 + 80b4: e2800cee add r0, r0, #60928 @ 0xee00 80b8: ed90003c ldc 0, cr0, \[r0, #240\].* 000080bc <one_group_needed_alu_pc>: diff --git a/ld/testsuite/ld-arm/ifunc-1.dd b/ld/testsuite/ld-arm/ifunc-1.dd index 14b1482..72b7af5 100644 --- a/ld/testsuite/ld-arm/ifunc-1.dd +++ b/ld/testsuite/ld-arm/ifunc-1.dd @@ -9,18 +9,18 @@ Disassembly of section \.iplt: #------ f1's .iplt entry #------------------------------------------------------------------------------ 9000: e28fc600 add ip, pc, #0, 12 - 9004: e28cca08 add ip, ip, #8, 20 ; 0x8000 + 9004: e28cca08 add ip, ip, #8, 20 @ 0x8000 9008: e5bcf004 ldr pc, \[ip, #4\]! 0000900c <f3>: 900c: e28fc600 add ip, pc, #0, 12 - 9010: e28cca07 add ip, ip, #28672 ; 0x7000 - 9014: e5bcfffc ldr pc, \[ip, #4092\]! ; 0xffc + 9010: e28cca07 add ip, ip, #28672 @ 0x7000 + 9014: e5bcfffc ldr pc, \[ip, #4092\]! @ 0xffc 00009018 <f2>: 9018: e28fc600 add ip, pc, #0, 12 - 901c: e28cca07 add ip, ip, #28672 ; 0x7000 - 9020: e5bcfff4 ldr pc, \[ip, #4084\]! ; 0xff4 + 901c: e28cca07 add ip, ip, #28672 @ 0x7000 + 9020: e5bcfff4 ldr pc, \[ip, #4084\]! @ 0xff4 Disassembly of section \.text: @@ -31,11 +31,11 @@ Disassembly of section \.text: 0000a00c <_start>: a00c: eb0017fb bl 10000 <foo> - a010: e59f400c ldr r4, \[pc, #12\] ; a024 <_start\+0x18> - a014: e59f400c ldr r4, \[pc, #12\] ; a028 <_start\+0x1c> - a018: e59f400c ldr r4, \[pc, #12\] ; a02c <_start\+0x20> - a01c: e59f400c ldr r4, \[pc, #12\] ; a030 <_start\+0x24> - a020: e59f500c ldr r5, \[pc, #12\] ; a034 <_start\+0x28> + a010: e59f400c ldr r4, \[pc, #12\] @ a024 <_start\+0x18> + a014: e59f400c ldr r4, \[pc, #12\] @ a028 <_start\+0x1c> + a018: e59f400c ldr r4, \[pc, #12\] @ a02c <_start\+0x20> + a01c: e59f400c ldr r4, \[pc, #12\] @ a030 <_start\+0x24> + a020: e59f500c ldr r5, \[pc, #12\] @ a034 <_start\+0x28> #------------------------------------------------------------------------------ #------ foo #------------------------------------------------------------------------------ @@ -60,11 +60,11 @@ Disassembly of section \.text: #------ f1's .iplt entry #------------------------------------------------------------------------------ a038: ebfffbf0 bl 9000 <__irel_end\+0xfe8> - a03c: e59f400c ldr r4, \[pc, #12\] ; a050 <_start\+0x44> - a040: e59f400c ldr r4, \[pc, #12\] ; a054 <_start\+0x48> - a044: e59f400c ldr r4, \[pc, #12\] ; a058 <_start\+0x4c> - a048: e59f400c ldr r4, \[pc, #12\] ; a05c <_start\+0x50> - a04c: e59f500c ldr r5, \[pc, #12\] ; a060 <_start\+0x54> + a03c: e59f400c ldr r4, \[pc, #12\] @ a050 <_start\+0x44> + a040: e59f400c ldr r4, \[pc, #12\] @ a054 <_start\+0x48> + a044: e59f400c ldr r4, \[pc, #12\] @ a058 <_start\+0x4c> + a048: e59f400c ldr r4, \[pc, #12\] @ a05c <_start\+0x50> + a04c: e59f500c ldr r5, \[pc, #12\] @ a060 <_start\+0x54> #------------------------------------------------------------------------------ #------ f1's .iplt entry #------------------------------------------------------------------------------ @@ -86,11 +86,11 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ a060: 00006fbc \.word 0x00006fbc a064: ebfffbeb bl 9018 <f2> - a068: e59f400c ldr r4, \[pc, #12\] ; a07c <_start\+0x70> - a06c: e59f400c ldr r4, \[pc, #12\] ; a080 <_start\+0x74> - a070: e59f400c ldr r4, \[pc, #12\] ; a084 <_start\+0x78> - a074: e59f400c ldr r4, \[pc, #12\] ; a088 <_start\+0x7c> - a078: e59f500c ldr r5, \[pc, #12\] ; a08c <_start\+0x80> + a068: e59f400c ldr r4, \[pc, #12\] @ a07c <_start\+0x70> + a06c: e59f400c ldr r4, \[pc, #12\] @ a080 <_start\+0x74> + a070: e59f400c ldr r4, \[pc, #12\] @ a084 <_start\+0x78> + a074: e59f400c ldr r4, \[pc, #12\] @ a088 <_start\+0x7c> + a078: e59f500c ldr r5, \[pc, #12\] @ a08c <_start\+0x80> #------------------------------------------------------------------------------ #------ f2 #------------------------------------------------------------------------------ @@ -112,11 +112,11 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ a08c: 00006f9c \.word 0x00006f9c a090: ebfffbdd bl 900c <f3> - a094: e59f400c ldr r4, \[pc, #12\] ; a0a8 <_start\+0x9c> - a098: e59f400c ldr r4, \[pc, #12\] ; a0ac <_start\+0xa0> - a09c: e59f400c ldr r4, \[pc, #12\] ; a0b0 <_start\+0xa4> - a0a0: e59f400c ldr r4, \[pc, #12\] ; a0b4 <_start\+0xa8> - a0a4: e59f500c ldr r5, \[pc, #12\] ; a0b8 <_start\+0xac> + a094: e59f400c ldr r4, \[pc, #12\] @ a0a8 <_start\+0x9c> + a098: e59f400c ldr r4, \[pc, #12\] @ a0ac <_start\+0xa0> + a09c: e59f400c ldr r4, \[pc, #12\] @ a0b0 <_start\+0xa4> + a0a0: e59f400c ldr r4, \[pc, #12\] @ a0b4 <_start\+0xa8> + a0a4: e59f500c ldr r5, \[pc, #12\] @ a0b8 <_start\+0xac> #------------------------------------------------------------------------------ #------ f3 #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-10.dd b/ld/testsuite/ld-arm/ifunc-10.dd index 6b9771f..ba0bb65 100644 --- a/ld/testsuite/ld-arm/ifunc-10.dd +++ b/ld/testsuite/ld-arm/ifunc-10.dd @@ -5,8 +5,8 @@ Disassembly of section \.plt: 00009000 <.plt>: - 9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <.*> + 9000: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + 9004: e59fe004 ldr lr, \[pc, #4\] @ 9010 <.*> 9008: e08fe00e add lr, pc, lr 900c: e5bef008 ldr pc, \[lr, #8\]! #------------------------------------------------------------------------------ @@ -23,15 +23,15 @@ Disassembly of section \.plt: #------ atf2's .plt entry #------------------------------------------------------------------------------ 9018: e28fc600 add ip, pc, #0, 12 - 901c: e28cca07 add ip, ip, #28672 ; 0x7000 - 9020: e5bcffec ldr pc, \[ip, #4076\]! ; 0xfec + 901c: e28cca07 add ip, ip, #28672 @ 0x7000 + 9020: e5bcffec ldr pc, \[ip, #4076\]! @ 0xfec #------------------------------------------------------------------------------ #------ 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 + 9028: e28cca07 add ip, ip, #28672 @ 0x7000 + 902c: e5bcffe4 ldr pc, \[ip, #4068\]! @ 0xfe4 #------------------------------------------------------------------------------ #------ thumb entry to ttf2's .plt entry #------------------------------------------------------------------------------ @@ -42,8 +42,8 @@ Disassembly of section \.plt: #------ ttf2's .plt entry #------------------------------------------------------------------------------ 9034: e28fc600 add ip, pc, #0, 12 - 9038: e28cca07 add ip, ip, #28672 ; 0x7000 - 903c: e5bcffd8 ldr pc, \[ip, #4056\]! ; 0xfd8 + 9038: e28cca07 add ip, ip, #28672 @ 0x7000 + 903c: e5bcffd8 ldr pc, \[ip, #4056\]! @ 0xfd8 #------------------------------------------------------------------------------ #------ thumb entry to tbf2's .plt entry #------------------------------------------------------------------------------ @@ -54,22 +54,22 @@ Disassembly of section \.plt: #------ tbf2's .plt entry #------------------------------------------------------------------------------ 9044: e28fc600 add ip, pc, #0, 12 - 9048: e28cca07 add ip, ip, #28672 ; 0x7000 - 904c: e5bcffcc ldr pc, \[ip, #4044\]! ; 0xfcc + 9048: e28cca07 add ip, ip, #28672 @ 0x7000 + 904c: e5bcffcc ldr pc, \[ip, #4044\]! @ 0xfcc #------------------------------------------------------------------------------ #------ 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 + 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 + 9060: e28cca07 add ip, ip, #28672 @ 0x7000 + 9064: e5bcffbc ldr pc, \[ip, #4028\]! @ 0xfbc #------------------------------------------------------------------------------ #------ thumb entry to abf4's .plt entry #------------------------------------------------------------------------------ @@ -80,8 +80,8 @@ Disassembly of section \.plt: #------ abf4's .plt entry #------------------------------------------------------------------------------ 906c: e28fc600 add ip, pc, #0, 12 - 9070: e28cca07 add ip, ip, #28672 ; 0x7000 - 9074: e5bcffb0 ldr pc, \[ip, #4016\]! ; 0xfb0 + 9070: e28cca07 add ip, ip, #28672 @ 0x7000 + 9074: e5bcffb0 ldr pc, \[ip, #4016\]! @ 0xfb0 #------------------------------------------------------------------------------ #------ thumb entry to tbf4's .plt entry #------------------------------------------------------------------------------ @@ -92,8 +92,8 @@ Disassembly of section \.plt: #------ tbf4's .plt entry #------------------------------------------------------------------------------ 907c: e28fc600 add ip, pc, #0, 12 - 9080: e28cca07 add ip, ip, #28672 ; 0x7000 - 9084: e5bcffa4 ldr pc, \[ip, #4004\]! ; 0xfa4 + 9080: e28cca07 add ip, ip, #28672 @ 0x7000 + 9084: e5bcffa4 ldr pc, \[ip, #4004\]! @ 0xfa4 #------------------------------------------------------------------------------ #------ thumb entry to ttf4's .plt entry #------------------------------------------------------------------------------ @@ -104,8 +104,8 @@ Disassembly of section \.plt: #------ ttf4's .plt entry #------------------------------------------------------------------------------ 908c: e28fc600 add ip, pc, #0, 12 - 9090: e28cca07 add ip, ip, #28672 ; 0x7000 - 9094: e5bcff98 ldr pc, \[ip, #3992\]! ; 0xf98 + 9090: e28cca07 add ip, ip, #28672 @ 0x7000 + 9094: e5bcff98 ldr pc, \[ip, #3992\]! @ 0xf98 #------------------------------------------------------------------------------ #------ thumb entry to atf4's .plt entry #------------------------------------------------------------------------------ @@ -116,15 +116,15 @@ Disassembly of section \.plt: #------ atf4's .plt entry #------------------------------------------------------------------------------ 909c: e28fc600 add ip, pc, #0, 12 - 90a0: e28cca07 add ip, ip, #28672 ; 0x7000 - 90a4: e5bcff8c ldr pc, \[ip, #3980\]! ; 0xf8c + 90a0: e28cca07 add ip, ip, #28672 @ 0x7000 + 90a4: e5bcff8c ldr pc, \[ip, #3980\]! @ 0xf8c #------------------------------------------------------------------------------ #------ 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 + 90ac: e28cca07 add ip, ip, #28672 @ 0x7000 + 90b0: e5bcff84 ldr pc, \[ip, #3972\]! @ 0xf84 #------------------------------------------------------------------------------ #------ thumb entry to abf2's .plt entry #------------------------------------------------------------------------------ @@ -135,8 +135,8 @@ Disassembly of section \.plt: #------ abf2's .plt entry #------------------------------------------------------------------------------ 90b8: e28fc600 add ip, pc, #0, 12 - 90bc: e28cca07 add ip, ip, #28672 ; 0x7000 - 90c0: e5bcff78 ldr pc, \[ip, #3960\]! ; 0xf78 + 90bc: e28cca07 add ip, ip, #28672 @ 0x7000 + 90c0: e5bcff78 ldr pc, \[ip, #3960\]! @ 0xf78 Disassembly of section \.iplt: @@ -145,8 +145,8 @@ Disassembly of section \.iplt: #------ aaf1's .iplt entry #------------------------------------------------------------------------------ 90c4: e28fc600 add ip, pc, #0, 12 - 90c8: e28cca07 add ip, ip, #28672 ; 0x7000 - 90cc: e5bcff70 ldr pc, \[ip, #3952\]! ; 0xf70 + 90c8: e28cca07 add ip, ip, #28672 @ 0x7000 + 90cc: e5bcff70 ldr pc, \[ip, #3952\]! @ 0xf70 #------------------------------------------------------------------------------ #------ thumb entry to atf1's .iplt entry #------------------------------------------------------------------------------ @@ -156,8 +156,8 @@ Disassembly of section \.iplt: #------ atf1's .iplt entry #------------------------------------------------------------------------------ 90d4: e28fc600 add ip, pc, #0, 12 - 90d8: e28cca07 add ip, ip, #28672 ; 0x7000 - 90dc: e5bcff64 ldr pc, \[ip, #3940\]! ; 0xf64 + 90d8: e28cca07 add ip, ip, #28672 @ 0x7000 + 90dc: e5bcff64 ldr pc, \[ip, #3940\]! @ 0xf64 #------------------------------------------------------------------------------ #------ thumb entry to abf1's .iplt entry #------------------------------------------------------------------------------ @@ -167,14 +167,14 @@ Disassembly of section \.iplt: #------ abf1's .iplt entry #------------------------------------------------------------------------------ 90e4: e28fc600 add ip, pc, #0, 12 - 90e8: e28cca07 add ip, ip, #28672 ; 0x7000 - 90ec: e5bcff58 ldr pc, \[ip, #3928\]! ; 0xf58 + 90e8: e28cca07 add ip, ip, #28672 @ 0x7000 + 90ec: e5bcff58 ldr pc, \[ip, #3928\]! @ 0xf58 #------------------------------------------------------------------------------ #------ taf1's .iplt entry #------------------------------------------------------------------------------ 90f0: e28fc600 add ip, pc, #0, 12 - 90f4: e28cca07 add ip, ip, #28672 ; 0x7000 - 90f8: e5bcff50 ldr pc, \[ip, #3920\]! ; 0xf50 + 90f4: e28cca07 add ip, ip, #28672 @ 0x7000 + 90f8: e5bcff50 ldr pc, \[ip, #3920\]! @ 0xf50 #------------------------------------------------------------------------------ #------ thumb entry to ttf1's .iplt entry #------------------------------------------------------------------------------ @@ -184,8 +184,8 @@ Disassembly of section \.iplt: #------ ttf1's .iplt entry #------------------------------------------------------------------------------ 9100: e28fc600 add ip, pc, #0, 12 - 9104: e28cca07 add ip, ip, #28672 ; 0x7000 - 9108: e5bcff44 ldr pc, \[ip, #3908\]! ; 0xf44 + 9104: e28cca07 add ip, ip, #28672 @ 0x7000 + 9108: e5bcff44 ldr pc, \[ip, #3908\]! @ 0xf44 #------------------------------------------------------------------------------ #------ thumb entry to tbf1's .iplt entry #------------------------------------------------------------------------------ @@ -195,8 +195,8 @@ Disassembly of section \.iplt: #------ tbf1's .iplt entry #------------------------------------------------------------------------------ 9110: e28fc600 add ip, pc, #0, 12 - 9114: e28cca07 add ip, ip, #28672 ; 0x7000 - 9118: e5bcff38 ldr pc, \[ip, #3896\]! ; 0xf38 + 9114: e28cca07 add ip, ip, #28672 @ 0x7000 + 9118: e5bcff38 ldr pc, \[ip, #3896\]! @ 0xf38 #------------------------------------------------------------------------------ #------ thumb entry to atf3 #------------------------------------------------------------------------------ @@ -205,8 +205,8 @@ Disassembly of section \.iplt: 00009120 <atf3>: 9120: e28fc600 add ip, pc, #0, 12 - 9124: e28cca07 add ip, ip, #28672 ; 0x7000 - 9128: e5bcff2c ldr pc, \[ip, #3884\]! ; 0xf2c + 9124: e28cca07 add ip, ip, #28672 @ 0x7000 + 9128: e5bcff2c ldr pc, \[ip, #3884\]! @ 0xf2c #------------------------------------------------------------------------------ #------ thumb entry to abf3 #------------------------------------------------------------------------------ @@ -215,8 +215,8 @@ Disassembly of section \.iplt: 00009130 <abf3>: 9130: e28fc600 add ip, pc, #0, 12 - 9134: e28cca07 add ip, ip, #28672 ; 0x7000 - 9138: e5bcff20 ldr pc, \[ip, #3872\]! ; 0xf20 + 9134: e28cca07 add ip, ip, #28672 @ 0x7000 + 9138: e5bcff20 ldr pc, \[ip, #3872\]! @ 0xf20 #------------------------------------------------------------------------------ #------ thumb entry to ttf3 #------------------------------------------------------------------------------ @@ -225,8 +225,8 @@ Disassembly of section \.iplt: 00009140 <ttf3>: 9140: e28fc600 add ip, pc, #0, 12 - 9144: e28cca07 add ip, ip, #28672 ; 0x7000 - 9148: e5bcff14 ldr pc, \[ip, #3860\]! ; 0xf14 + 9144: e28cca07 add ip, ip, #28672 @ 0x7000 + 9148: e5bcff14 ldr pc, \[ip, #3860\]! @ 0xf14 #------------------------------------------------------------------------------ #------ thumb entry to tbf3 #------------------------------------------------------------------------------ @@ -235,18 +235,18 @@ Disassembly of section \.iplt: 00009150 <tbf3>: 9150: e28fc600 add ip, pc, #0, 12 - 9154: e28cca07 add ip, ip, #28672 ; 0x7000 - 9158: e5bcff08 ldr pc, \[ip, #3848\]! ; 0xf08 + 9154: e28cca07 add ip, ip, #28672 @ 0x7000 + 9158: e5bcff08 ldr pc, \[ip, #3848\]! @ 0xf08 0000915c <taf3>: 915c: e28fc600 add ip, pc, #0, 12 - 9160: e28cca07 add ip, ip, #28672 ; 0x7000 - 9164: e5bcff00 ldr pc, \[ip, #3840\]! ; 0xf00 + 9160: e28cca07 add ip, ip, #28672 @ 0x7000 + 9164: e5bcff00 ldr pc, \[ip, #3840\]! @ 0xf00 00009168 <aaf3>: 9168: e28fc600 add ip, pc, #0, 12 - 916c: e28cca07 add ip, ip, #28672 ; 0x7000 - 9170: e5bcfef8 ldr pc, \[ip, #3832\]! ; 0xef8 + 916c: e28cca07 add ip, ip, #28672 @ 0x7000 + 9170: e5bcfef8 ldr pc, \[ip, #3832\]! @ 0xef8 Disassembly of section \.text: @@ -280,8 +280,8 @@ Disassembly of section \.text: a028: eb0017f4 bl 10000 <foo> a02c: ea0017f3 b 10000 <foo> a030: 0a0017f2 beq 10000 <foo> - a034: e59f4000 ldr r4, \[pc\] ; a03c <_start\+0x14> - a038: e59f4000 ldr r4, \[pc\] ; a040 <_start\+0x18> + a034: e59f4000 ldr r4, \[pc\] @ a03c <_start\+0x14> + a038: e59f4000 ldr r4, \[pc\] @ a040 <_start\+0x18> #------------------------------------------------------------------------------ #------ .got offset for foo #------------------------------------------------------------------------------ @@ -302,8 +302,8 @@ Disassembly of section \.text: #------ aaf1's .iplt entry #------------------------------------------------------------------------------ a04c: 0afffc1c beq 90c4 <abf2@plt\+0x10> - a050: e59f4000 ldr r4, \[pc\] ; a058 <_start\+0x30> - a054: e59f4000 ldr r4, \[pc\] ; a05c <_start\+0x34> + a050: e59f4000 ldr r4, \[pc\] @ a058 <_start\+0x30> + a054: e59f4000 ldr r4, \[pc\] @ a05c <_start\+0x34> #------------------------------------------------------------------------------ #------ .got offset for aaf1's .iplt entry #------------------------------------------------------------------------------ @@ -324,8 +324,8 @@ Disassembly of section \.text: #------ taf1's .iplt entry #------------------------------------------------------------------------------ a068: 0afffc20 beq 90f0 <abf2@plt\+0x3c> - a06c: e59f4000 ldr r4, \[pc\] ; a074 <_start\+0x4c> - a070: e59f4000 ldr r4, \[pc\] ; a078 <_start\+0x50> + a06c: e59f4000 ldr r4, \[pc\] @ a074 <_start\+0x4c> + a070: e59f4000 ldr r4, \[pc\] @ a078 <_start\+0x50> #------------------------------------------------------------------------------ #------ .got offset for taf1's .iplt entry #------------------------------------------------------------------------------ @@ -346,8 +346,8 @@ Disassembly of section \.text: #------ abf1's .iplt entry #------------------------------------------------------------------------------ a084: 0afffc16 beq 90e4 <abf2@plt\+0x30> - a088: e59f4000 ldr r4, \[pc\] ; a090 <_start\+0x68> - a08c: e59f4000 ldr r4, \[pc\] ; a094 <_start\+0x6c> + a088: e59f4000 ldr r4, \[pc\] @ a090 <_start\+0x68> + a08c: e59f4000 ldr r4, \[pc\] @ a094 <_start\+0x6c> #------------------------------------------------------------------------------ #------ .got offset for abf1's .iplt entry #------------------------------------------------------------------------------ @@ -368,8 +368,8 @@ Disassembly of section \.text: #------ tbf1's .iplt entry #------------------------------------------------------------------------------ a0a0: 0afffc1a beq 9110 <abf2@plt\+0x5c> - a0a4: e59f4000 ldr r4, \[pc\] ; a0ac <_start\+0x84> - a0a8: e59f4000 ldr r4, \[pc\] ; a0b0 <_start\+0x88> + a0a4: e59f4000 ldr r4, \[pc\] @ a0ac <_start\+0x84> + a0a8: e59f4000 ldr r4, \[pc\] @ a0b0 <_start\+0x88> #------------------------------------------------------------------------------ #------ .got offset for tbf1's .iplt entry #------------------------------------------------------------------------------ @@ -390,8 +390,8 @@ Disassembly of section \.text: #------ aaf2's .plt entry #------------------------------------------------------------------------------ a0bc: 0afffbe6 beq 905c <aaf2@plt> - a0c0: e59f4000 ldr r4, \[pc\] ; a0c8 <_start\+0xa0> - a0c4: e59f4000 ldr r4, \[pc\] ; a0cc <_start\+0xa4> + a0c0: e59f4000 ldr r4, \[pc\] @ a0c8 <_start\+0xa0> + a0c4: e59f4000 ldr r4, \[pc\] @ a0cc <_start\+0xa4> #------------------------------------------------------------------------------ #------ .got offset for aaf2 #------------------------------------------------------------------------------ @@ -412,8 +412,8 @@ Disassembly of section \.text: #------ taf2's .plt entry #------------------------------------------------------------------------------ a0d8: 0afffbdc beq 9050 <taf2@plt> - a0dc: e59f4000 ldr r4, \[pc\] ; a0e4 <_start\+0xbc> - a0e0: e59f4000 ldr r4, \[pc\] ; a0e8 <_start\+0xc0> + a0dc: e59f4000 ldr r4, \[pc\] @ a0e4 <_start\+0xbc> + a0e0: e59f4000 ldr r4, \[pc\] @ a0e8 <_start\+0xc0> #------------------------------------------------------------------------------ #------ .got offset for taf2 #------------------------------------------------------------------------------ @@ -434,8 +434,8 @@ Disassembly of section \.text: #------ abf2's .plt entry #------------------------------------------------------------------------------ a0f4: 0afffbef beq 90b8 <abf2@plt\+0x4> - a0f8: e59f4000 ldr r4, \[pc\] ; a100 <_start\+0xd8> - a0fc: e59f4000 ldr r4, \[pc\] ; a104 <_start\+0xdc> + a0f8: e59f4000 ldr r4, \[pc\] @ a100 <_start\+0xd8> + a0fc: e59f4000 ldr r4, \[pc\] @ a104 <_start\+0xdc> #------------------------------------------------------------------------------ #------ .got offset for abf2 #------------------------------------------------------------------------------ @@ -456,8 +456,8 @@ Disassembly of section \.text: #------ tbf2's .plt entry #------------------------------------------------------------------------------ a110: 0afffbcb beq 9044 <tbf2@plt\+0x4> - a114: e59f4000 ldr r4, \[pc\] ; a11c <_start\+0xf4> - a118: e59f4000 ldr r4, \[pc\] ; a120 <_start\+0xf8> + a114: e59f4000 ldr r4, \[pc\] @ a11c <_start\+0xf4> + a118: e59f4000 ldr r4, \[pc\] @ a120 <_start\+0xf8> #------------------------------------------------------------------------------ #------ .got offset for tbf2 #------------------------------------------------------------------------------ @@ -469,8 +469,8 @@ Disassembly of section \.text: a124: ebfffc0f bl 9168 <aaf3> a128: eafffc0e b 9168 <aaf3> a12c: 0afffc0d beq 9168 <aaf3> - a130: e59f4000 ldr r4, \[pc\] ; a138 <_start\+0x110> - a134: e59f4000 ldr r4, \[pc\] ; a13c <_start\+0x114> + a130: e59f4000 ldr r4, \[pc\] @ a138 <_start\+0x110> + a134: e59f4000 ldr r4, \[pc\] @ a13c <_start\+0x114> #------------------------------------------------------------------------------ #------ .got offset for aaf3 #------------------------------------------------------------------------------ @@ -482,8 +482,8 @@ Disassembly of section \.text: a140: ebfffc05 bl 915c <taf3> a144: eafffc04 b 915c <taf3> a148: 0afffc03 beq 915c <taf3> - a14c: e59f4000 ldr r4, \[pc\] ; a154 <_start\+0x12c> - a150: e59f4000 ldr r4, \[pc\] ; a158 <_start\+0x130> + a14c: e59f4000 ldr r4, \[pc\] @ a154 <_start\+0x12c> + a150: e59f4000 ldr r4, \[pc\] @ a158 <_start\+0x130> #------------------------------------------------------------------------------ #------ .got offset for taf3 #------------------------------------------------------------------------------ @@ -495,8 +495,8 @@ Disassembly of section \.text: a15c: ebfffbf3 bl 9130 <abf3> a160: eafffbf2 b 9130 <abf3> a164: 0afffbf1 beq 9130 <abf3> - a168: e59f4000 ldr r4, \[pc\] ; a170 <_start\+0x148> - a16c: e59f4000 ldr r4, \[pc\] ; a174 <_start\+0x14c> + a168: e59f4000 ldr r4, \[pc\] @ a170 <_start\+0x148> + a16c: e59f4000 ldr r4, \[pc\] @ a174 <_start\+0x14c> #------------------------------------------------------------------------------ #------ .got offset for abf3 #------------------------------------------------------------------------------ @@ -508,8 +508,8 @@ Disassembly of section \.text: a178: ebfffbf4 bl 9150 <tbf3> a17c: eafffbf3 b 9150 <tbf3> a180: 0afffbf2 beq 9150 <tbf3> - a184: e59f4000 ldr r4, \[pc\] ; a18c <_start\+0x164> - a188: e59f4000 ldr r4, \[pc\] ; a190 <_start\+0x168> + a184: e59f4000 ldr r4, \[pc\] @ a18c <_start\+0x164> + a188: e59f4000 ldr r4, \[pc\] @ a190 <_start\+0x168> #------------------------------------------------------------------------------ #------ .got offset for tbf3 #------------------------------------------------------------------------------ @@ -530,8 +530,8 @@ Disassembly of section \.text: #------ aaf4's .plt entry #------------------------------------------------------------------------------ a19c: 0afffba0 beq 9024 <aaf4@plt> - a1a0: e59f4000 ldr r4, \[pc\] ; a1a8 <_start\+0x180> - a1a4: e59f4000 ldr r4, \[pc\] ; a1ac <_start\+0x184> + a1a0: e59f4000 ldr r4, \[pc\] @ a1a8 <_start\+0x180> + a1a4: e59f4000 ldr r4, \[pc\] @ a1ac <_start\+0x184> #------------------------------------------------------------------------------ #------ .got offset for aaf4 #------------------------------------------------------------------------------ @@ -552,8 +552,8 @@ Disassembly of section \.text: #------ taf4's .plt entry #------------------------------------------------------------------------------ a1b8: 0afffbba beq 90a8 <taf4@plt> - a1bc: e59f4000 ldr r4, \[pc\] ; a1c4 <_start\+0x19c> - a1c0: e59f4000 ldr r4, \[pc\] ; a1c8 <_start\+0x1a0> + a1bc: e59f4000 ldr r4, \[pc\] @ a1c4 <_start\+0x19c> + a1c0: e59f4000 ldr r4, \[pc\] @ a1c8 <_start\+0x1a0> #------------------------------------------------------------------------------ #------ .got offset for taf4 #------------------------------------------------------------------------------ @@ -574,8 +574,8 @@ Disassembly of section \.text: #------ abf4's .plt entry #------------------------------------------------------------------------------ a1d4: 0afffba4 beq 906c <abf4@plt\+0x4> - a1d8: e59f4000 ldr r4, \[pc\] ; a1e0 <_start\+0x1b8> - a1dc: e59f4000 ldr r4, \[pc\] ; a1e4 <_start\+0x1bc> + a1d8: e59f4000 ldr r4, \[pc\] @ a1e0 <_start\+0x1b8> + a1dc: e59f4000 ldr r4, \[pc\] @ a1e4 <_start\+0x1bc> #------------------------------------------------------------------------------ #------ .got offset for abf4 #------------------------------------------------------------------------------ @@ -596,8 +596,8 @@ Disassembly of section \.text: #------ tbf4's .plt entry #------------------------------------------------------------------------------ a1f0: 0afffba1 beq 907c <tbf4@plt\+0x4> - a1f4: e59f4000 ldr r4, \[pc\] ; a1fc <_start\+0x1d4> - a1f8: e59f4000 ldr r4, \[pc\] ; a200 <_start\+0x1d8> + a1f4: e59f4000 ldr r4, \[pc\] @ a1fc <_start\+0x1d4> + a1f8: e59f4000 ldr r4, \[pc\] @ a200 <_start\+0x1d8> #------------------------------------------------------------------------------ #------ .got offset for tbf4 #------------------------------------------------------------------------------ @@ -611,8 +611,8 @@ Disassembly of section \.text: a204: f005 fefc bl 10000 <foo> a208: f005 befa b\.w 10000 <foo> a20c: f005 86f8 beq\.w 10000 <foo> - a210: 4c00 ldr r4, \[pc, #0\] ; \(a214 <_thumb\+0x10>\) - a212: 4c01 ldr r4, \[pc, #4\] ; \(a218 <_thumb\+0x14>\) + a210: 4c00 ldr r4, \[pc, #0\] @ \(a214 <_thumb\+0x10>\) + a212: 4c01 ldr r4, \[pc, #4\] @ \(a218 <_thumb\+0x14>\) #------------------------------------------------------------------------------ #------ .got offset for foo #------------------------------------------------------------------------------ @@ -633,8 +633,8 @@ Disassembly of section \.text: #------ thumb entry to atf1's .iplt entry #------------------------------------------------------------------------------ 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>\) + a228: 4c00 ldr r4, \[pc, #0\] @ \(a22c <_thumb\+0x28>\) + a22a: 4c01 ldr r4, \[pc, #4\] @ \(a230 <_thumb\+0x2c>\) #------------------------------------------------------------------------------ #------ .got offset for atf1's .iplt entry #------------------------------------------------------------------------------ @@ -655,8 +655,8 @@ Disassembly of section \.text: #------ thumb entry to ttf1's .iplt entry #------------------------------------------------------------------------------ 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>\) + a240: 4c00 ldr r4, \[pc, #0\] @ \(a244 <_thumb\+0x40>\) + a242: 4c01 ldr r4, \[pc, #4\] @ \(a248 <_thumb\+0x44>\) #------------------------------------------------------------------------------ #------ .got offset for ttf1's .iplt entry #------------------------------------------------------------------------------ @@ -677,8 +677,8 @@ Disassembly of section \.text: #------ thumb entry to abf1's .iplt entry #------------------------------------------------------------------------------ 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>\) + a258: 4c00 ldr r4, \[pc, #0\] @ \(a25c <_thumb\+0x58>\) + a25a: 4c01 ldr r4, \[pc, #4\] @ \(a260 <_thumb\+0x5c>\) #------------------------------------------------------------------------------ #------ .got offset for abf1's .iplt entry #------------------------------------------------------------------------------ @@ -699,8 +699,8 @@ Disassembly of section \.text: #------ thumb entry to tbf1's .iplt entry #------------------------------------------------------------------------------ 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>\) + a270: 4c00 ldr r4, \[pc, #0\] @ \(a274 <_thumb\+0x70>\) + a272: 4c01 ldr r4, \[pc, #4\] @ \(a278 <_thumb\+0x74>\) #------------------------------------------------------------------------------ #------ .got offset for tbf1's .iplt entry #------------------------------------------------------------------------------ @@ -721,8 +721,8 @@ Disassembly of section \.text: #------ thumb entry to atf2's .plt entry #------------------------------------------------------------------------------ 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>\) + a288: 4c00 ldr r4, \[pc, #0\] @ \(a28c <_thumb\+0x88>\) + a28a: 4c01 ldr r4, \[pc, #4\] @ \(a290 <_thumb\+0x8c>\) #------------------------------------------------------------------------------ #------ .got offset for atf2 #------------------------------------------------------------------------------ @@ -743,8 +743,8 @@ Disassembly of section \.text: #------ thumb entry to ttf2's .plt entry #------------------------------------------------------------------------------ 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>\) + a2a0: 4c00 ldr r4, \[pc, #0\] @ \(a2a4 <_thumb\+0xa0>\) + a2a2: 4c01 ldr r4, \[pc, #4\] @ \(a2a8 <_thumb\+0xa4>\) #------------------------------------------------------------------------------ #------ .got offset for ttf2 #------------------------------------------------------------------------------ @@ -765,8 +765,8 @@ Disassembly of section \.text: #------ thumb entry to abf2's .plt entry #------------------------------------------------------------------------------ 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>\) + a2b8: 4c00 ldr r4, \[pc, #0\] @ \(a2bc <_thumb\+0xb8>\) + a2ba: 4c01 ldr r4, \[pc, #4\] @ \(a2c0 <_thumb\+0xbc>\) #------------------------------------------------------------------------------ #------ .got offset for abf2 #------------------------------------------------------------------------------ @@ -787,8 +787,8 @@ Disassembly of section \.text: #------ thumb entry to tbf2's .plt entry #------------------------------------------------------------------------------ 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>\) + a2d0: 4c00 ldr r4, \[pc, #0\] @ \(a2d4 <_thumb\+0xd0>\) + a2d2: 4c01 ldr r4, \[pc, #4\] @ \(a2d8 <_thumb\+0xd4>\) #------------------------------------------------------------------------------ #------ .got offset for tbf2 #------------------------------------------------------------------------------ @@ -806,8 +806,8 @@ Disassembly of section \.text: #------ thumb entry to atf3 #------------------------------------------------------------------------------ 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>\) + a2e8: 4c00 ldr r4, \[pc, #0\] @ \(a2ec <_thumb\+0xe8>\) + a2ea: 4c01 ldr r4, \[pc, #4\] @ \(a2f0 <_thumb\+0xec>\) #------------------------------------------------------------------------------ #------ .got offset for atf3 #------------------------------------------------------------------------------ @@ -825,8 +825,8 @@ Disassembly of section \.text: #------ thumb entry to ttf3 #------------------------------------------------------------------------------ a2fc: f43e af1e beq\.w 913c <abf3\+0xc> - a300: 4c00 ldr r4, \[pc, #0\] ; \(a304 <_thumb\+0x100>\) - a302: 4c01 ldr r4, \[pc, #4\] ; \(a308 <_thumb\+0x104>\) + a300: 4c00 ldr r4, \[pc, #0\] @ \(a304 <_thumb\+0x100>\) + a302: 4c01 ldr r4, \[pc, #4\] @ \(a308 <_thumb\+0x104>\) #------------------------------------------------------------------------------ #------ .got offset for ttf3 #------------------------------------------------------------------------------ @@ -844,8 +844,8 @@ Disassembly of section \.text: #------ thumb entry to abf3 #------------------------------------------------------------------------------ a314: f43e af0a beq\.w 912c <atf3\+0xc> - a318: 4c00 ldr r4, \[pc, #0\] ; \(a31c <_thumb\+0x118>\) - a31a: 4c01 ldr r4, \[pc, #4\] ; \(a320 <_thumb\+0x11c>\) + a318: 4c00 ldr r4, \[pc, #0\] @ \(a31c <_thumb\+0x118>\) + a31a: 4c01 ldr r4, \[pc, #4\] @ \(a320 <_thumb\+0x11c>\) #------------------------------------------------------------------------------ #------ .got offset for abf3 #------------------------------------------------------------------------------ @@ -863,8 +863,8 @@ Disassembly of section \.text: #------ thumb entry to tbf3 #------------------------------------------------------------------------------ a32c: f43e af0e beq\.w 914c <ttf3\+0xc> - a330: 4c00 ldr r4, \[pc, #0\] ; \(a334 <_thumb\+0x130>\) - a332: 4c01 ldr r4, \[pc, #4\] ; \(a338 <_thumb\+0x134>\) + a330: 4c00 ldr r4, \[pc, #0\] @ \(a334 <_thumb\+0x130>\) + a332: 4c01 ldr r4, \[pc, #4\] @ \(a338 <_thumb\+0x134>\) #------------------------------------------------------------------------------ #------ .got offset for tbf3 #------------------------------------------------------------------------------ @@ -885,8 +885,8 @@ Disassembly of section \.text: #------ thumb entry to atf4's .plt entry #------------------------------------------------------------------------------ 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>\) + a348: 4c00 ldr r4, \[pc, #0\] @ \(a34c <_thumb\+0x148>\) + a34a: 4c01 ldr r4, \[pc, #4\] @ \(a350 <_thumb\+0x14c>\) #------------------------------------------------------------------------------ #------ .got offset for atf4 #------------------------------------------------------------------------------ @@ -907,8 +907,8 @@ Disassembly of section \.text: #------ thumb entry to ttf4's .plt entry #------------------------------------------------------------------------------ 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>\) + a360: 4c00 ldr r4, \[pc, #0\] @ \(a364 <_thumb\+0x160>\) + a362: 4c01 ldr r4, \[pc, #4\] @ \(a368 <_thumb\+0x164>\) #------------------------------------------------------------------------------ #------ .got offset for ttf4 #------------------------------------------------------------------------------ @@ -929,8 +929,8 @@ Disassembly of section \.text: #------ thumb entry to abf4's .plt entry #------------------------------------------------------------------------------ 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>\) + a378: 4c00 ldr r4, \[pc, #0\] @ \(a37c <_thumb\+0x178>\) + a37a: 4c01 ldr r4, \[pc, #4\] @ \(a380 <_thumb\+0x17c>\) #------------------------------------------------------------------------------ #------ .got offset for abf4 #------------------------------------------------------------------------------ @@ -951,8 +951,8 @@ Disassembly of section \.text: #------ thumb entry to tbf4's .plt entry #------------------------------------------------------------------------------ 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>\) + a390: 4c00 ldr r4, \[pc, #0\] @ \(a394 <_thumb\+0x190>\) + a392: 4c01 ldr r4, \[pc, #4\] @ \(a398 <_thumb\+0x194>\) #------------------------------------------------------------------------------ #------ .got offset for tbf4 #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-11.dd b/ld/testsuite/ld-arm/ifunc-11.dd index 89a7530..cfae9a5 100644 --- a/ld/testsuite/ld-arm/ifunc-11.dd +++ b/ld/testsuite/ld-arm/ifunc-11.dd @@ -23,8 +23,8 @@ Disassembly of section \.text: a010: 46f7 mov pc, lr 0000a012 <_start>: - a012: f8df 4004 ldr\.w r4, \[pc, #4\] ; a018 <_start\+0x6> - a016: 4c01 ldr r4, \[pc, #4\] ; \(a01c <_start\+0xa>\) + a012: f8df 4004 ldr\.w r4, \[pc, #4\] @ a018 <_start\+0x6> + a016: 4c01 ldr r4, \[pc, #4\] @ \(a01c <_start\+0xa>\) #------------------------------------------------------------------------------ #------ .got offset for foo #------------------------------------------------------------------------------ @@ -33,8 +33,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for foo #------------------------------------------------------------------------------ a01c: 00006ff0 \.word 0x00006ff0 - a020: 4c00 ldr r4, \[pc, #0\] ; \(a024 <_start\+0x12>\) - a022: 4c01 ldr r4, \[pc, #4\] ; \(a028 <_start\+0x16>\) + a020: 4c00 ldr r4, \[pc, #0\] @ \(a024 <_start\+0x12>\) + a022: 4c01 ldr r4, \[pc, #4\] @ \(a028 <_start\+0x16>\) #------------------------------------------------------------------------------ #------ .got offset for f1 #------------------------------------------------------------------------------ @@ -43,8 +43,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f1 #------------------------------------------------------------------------------ a028: 00006fe8 \.word 0x00006fe8 - a02c: 4c00 ldr r4, \[pc, #0\] ; \(a030 <_start\+0x1e>\) - a02e: 4c01 ldr r4, \[pc, #4\] ; \(a034 <_start\+0x22>\) + a02c: 4c00 ldr r4, \[pc, #0\] @ \(a030 <_start\+0x1e>\) + a02e: 4c01 ldr r4, \[pc, #4\] @ \(a034 <_start\+0x22>\) #------------------------------------------------------------------------------ #------ .got offset for f2 #------------------------------------------------------------------------------ @@ -53,8 +53,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f2 #------------------------------------------------------------------------------ a034: 00006ff0 \.word 0x00006ff0 - a038: 4c00 ldr r4, \[pc, #0\] ; \(a03c <_start\+0x2a>\) - a03a: 4c01 ldr r4, \[pc, #4\] ; \(a040 <_start\+0x2e>\) + a038: 4c00 ldr r4, \[pc, #0\] @ \(a03c <_start\+0x2a>\) + a03a: 4c01 ldr r4, \[pc, #4\] @ \(a040 <_start\+0x2e>\) #------------------------------------------------------------------------------ #------ .got offset for f3 #------------------------------------------------------------------------------ @@ -63,8 +63,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f3 #------------------------------------------------------------------------------ a040: 00006fe0 \.word 0x00006fe0 - a044: 4c00 ldr r4, \[pc, #0\] ; \(a048 <_start\+0x36>\) - a046: 4c01 ldr r4, \[pc, #4\] ; \(a04c <_start\+0x3a>\) + a044: 4c00 ldr r4, \[pc, #0\] @ \(a048 <_start\+0x36>\) + a046: 4c01 ldr r4, \[pc, #4\] @ \(a04c <_start\+0x3a>\) #------------------------------------------------------------------------------ #------ .got offset for f1t #------------------------------------------------------------------------------ @@ -73,8 +73,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f1t #------------------------------------------------------------------------------ a04c: 00006fc8 \.word 0x00006fc8 - a050: 4c00 ldr r4, \[pc, #0\] ; \(a054 <_start\+0x42>\) - a052: 4c01 ldr r4, \[pc, #4\] ; \(a058 <_start\+0x46>\) + a050: 4c00 ldr r4, \[pc, #0\] @ \(a054 <_start\+0x42>\) + a052: 4c01 ldr r4, \[pc, #4\] @ \(a058 <_start\+0x46>\) #------------------------------------------------------------------------------ #------ .got offset for f2t #------------------------------------------------------------------------------ @@ -83,8 +83,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f2t #------------------------------------------------------------------------------ a058: 00006fc4 \.word 0x00006fc4 - a05c: 4c00 ldr r4, \[pc, #0\] ; \(a060 <_start\+0x4e>\) - a05e: 4c01 ldr r4, \[pc, #4\] ; \(a064 <_start\+0x52>\) + a05c: 4c00 ldr r4, \[pc, #0\] @ \(a060 <_start\+0x4e>\) + a05e: 4c01 ldr r4, \[pc, #4\] @ \(a064 <_start\+0x52>\) #------------------------------------------------------------------------------ #------ .got offset for f3t #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-12.dd b/ld/testsuite/ld-arm/ifunc-12.dd index 89a7530..cfae9a5 100644 --- a/ld/testsuite/ld-arm/ifunc-12.dd +++ b/ld/testsuite/ld-arm/ifunc-12.dd @@ -23,8 +23,8 @@ Disassembly of section \.text: a010: 46f7 mov pc, lr 0000a012 <_start>: - a012: f8df 4004 ldr\.w r4, \[pc, #4\] ; a018 <_start\+0x6> - a016: 4c01 ldr r4, \[pc, #4\] ; \(a01c <_start\+0xa>\) + a012: f8df 4004 ldr\.w r4, \[pc, #4\] @ a018 <_start\+0x6> + a016: 4c01 ldr r4, \[pc, #4\] @ \(a01c <_start\+0xa>\) #------------------------------------------------------------------------------ #------ .got offset for foo #------------------------------------------------------------------------------ @@ -33,8 +33,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for foo #------------------------------------------------------------------------------ a01c: 00006ff0 \.word 0x00006ff0 - a020: 4c00 ldr r4, \[pc, #0\] ; \(a024 <_start\+0x12>\) - a022: 4c01 ldr r4, \[pc, #4\] ; \(a028 <_start\+0x16>\) + a020: 4c00 ldr r4, \[pc, #0\] @ \(a024 <_start\+0x12>\) + a022: 4c01 ldr r4, \[pc, #4\] @ \(a028 <_start\+0x16>\) #------------------------------------------------------------------------------ #------ .got offset for f1 #------------------------------------------------------------------------------ @@ -43,8 +43,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f1 #------------------------------------------------------------------------------ a028: 00006fe8 \.word 0x00006fe8 - a02c: 4c00 ldr r4, \[pc, #0\] ; \(a030 <_start\+0x1e>\) - a02e: 4c01 ldr r4, \[pc, #4\] ; \(a034 <_start\+0x22>\) + a02c: 4c00 ldr r4, \[pc, #0\] @ \(a030 <_start\+0x1e>\) + a02e: 4c01 ldr r4, \[pc, #4\] @ \(a034 <_start\+0x22>\) #------------------------------------------------------------------------------ #------ .got offset for f2 #------------------------------------------------------------------------------ @@ -53,8 +53,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f2 #------------------------------------------------------------------------------ a034: 00006ff0 \.word 0x00006ff0 - a038: 4c00 ldr r4, \[pc, #0\] ; \(a03c <_start\+0x2a>\) - a03a: 4c01 ldr r4, \[pc, #4\] ; \(a040 <_start\+0x2e>\) + a038: 4c00 ldr r4, \[pc, #0\] @ \(a03c <_start\+0x2a>\) + a03a: 4c01 ldr r4, \[pc, #4\] @ \(a040 <_start\+0x2e>\) #------------------------------------------------------------------------------ #------ .got offset for f3 #------------------------------------------------------------------------------ @@ -63,8 +63,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f3 #------------------------------------------------------------------------------ a040: 00006fe0 \.word 0x00006fe0 - a044: 4c00 ldr r4, \[pc, #0\] ; \(a048 <_start\+0x36>\) - a046: 4c01 ldr r4, \[pc, #4\] ; \(a04c <_start\+0x3a>\) + a044: 4c00 ldr r4, \[pc, #0\] @ \(a048 <_start\+0x36>\) + a046: 4c01 ldr r4, \[pc, #4\] @ \(a04c <_start\+0x3a>\) #------------------------------------------------------------------------------ #------ .got offset for f1t #------------------------------------------------------------------------------ @@ -73,8 +73,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f1t #------------------------------------------------------------------------------ a04c: 00006fc8 \.word 0x00006fc8 - a050: 4c00 ldr r4, \[pc, #0\] ; \(a054 <_start\+0x42>\) - a052: 4c01 ldr r4, \[pc, #4\] ; \(a058 <_start\+0x46>\) + a050: 4c00 ldr r4, \[pc, #0\] @ \(a054 <_start\+0x42>\) + a052: 4c01 ldr r4, \[pc, #4\] @ \(a058 <_start\+0x46>\) #------------------------------------------------------------------------------ #------ .got offset for f2t #------------------------------------------------------------------------------ @@ -83,8 +83,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f2t #------------------------------------------------------------------------------ a058: 00006fc4 \.word 0x00006fc4 - a05c: 4c00 ldr r4, \[pc, #0\] ; \(a060 <_start\+0x4e>\) - a05e: 4c01 ldr r4, \[pc, #4\] ; \(a064 <_start\+0x52>\) + a05c: 4c00 ldr r4, \[pc, #0\] @ \(a060 <_start\+0x4e>\) + a05e: 4c01 ldr r4, \[pc, #4\] @ \(a064 <_start\+0x52>\) #------------------------------------------------------------------------------ #------ .got offset for f3t #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-13.dd b/ld/testsuite/ld-arm/ifunc-13.dd index d5df382..0e472ef 100644 --- a/ld/testsuite/ld-arm/ifunc-13.dd +++ b/ld/testsuite/ld-arm/ifunc-13.dd @@ -17,8 +17,8 @@ Disassembly of section \.text: a00a: 46f7 mov pc, lr 0000a00c <_start>: - a00c: 4c00 ldr r4, \[pc, #0\] ; \(a010 <_start\+0x4>\) - a00e: 4c01 ldr r4, \[pc, #4\] ; \(a014 <_start\+0x8>\) + a00c: 4c00 ldr r4, \[pc, #0\] @ \(a010 <_start\+0x4>\) + a00e: 4c01 ldr r4, \[pc, #4\] @ \(a014 <_start\+0x8>\) #------------------------------------------------------------------------------ #------ .got offset for foo #------------------------------------------------------------------------------ @@ -27,8 +27,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for foo #------------------------------------------------------------------------------ a014: 00006ff8 \.word 0x00006ff8 - a018: 4c00 ldr r4, \[pc, #0\] ; \(a01c <_start\+0x10>\) - a01a: 4c01 ldr r4, \[pc, #4\] ; \(a020 <_start\+0x14>\) + a018: 4c00 ldr r4, \[pc, #0\] @ \(a01c <_start\+0x10>\) + a01a: 4c01 ldr r4, \[pc, #4\] @ \(a020 <_start\+0x14>\) #------------------------------------------------------------------------------ #------ .got offset for f1 #------------------------------------------------------------------------------ @@ -37,8 +37,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f1 #------------------------------------------------------------------------------ a020: 00006ff0 \.word 0x00006ff0 - a024: 4c00 ldr r4, \[pc, #0\] ; \(a028 <_start\+0x1c>\) - a026: 4c01 ldr r4, \[pc, #4\] ; \(a02c <_start\+0x20>\) + a024: 4c00 ldr r4, \[pc, #0\] @ \(a028 <_start\+0x1c>\) + a026: 4c01 ldr r4, \[pc, #4\] @ \(a02c <_start\+0x20>\) #------------------------------------------------------------------------------ #------ .got offset for f2 #------------------------------------------------------------------------------ @@ -47,8 +47,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f2 #------------------------------------------------------------------------------ a02c: 00006ff8 \.word 0x00006ff8 - a030: 4c00 ldr r4, \[pc, #0\] ; \(a034 <_start\+0x28>\) - a032: 4c01 ldr r4, \[pc, #4\] ; \(a038 <_start\+0x2c>\) + a030: 4c00 ldr r4, \[pc, #0\] @ \(a034 <_start\+0x28>\) + a032: 4c01 ldr r4, \[pc, #4\] @ \(a038 <_start\+0x2c>\) #------------------------------------------------------------------------------ #------ .got offset for f3 #------------------------------------------------------------------------------ @@ -57,8 +57,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f3 #------------------------------------------------------------------------------ a038: 00006fe8 \.word 0x00006fe8 - a03c: 4c00 ldr r4, \[pc, #0\] ; \(a040 <_start\+0x34>\) - a03e: 4c01 ldr r4, \[pc, #4\] ; \(a044 <_start\+0x38>\) + a03c: 4c00 ldr r4, \[pc, #0\] @ \(a040 <_start\+0x34>\) + a03e: 4c01 ldr r4, \[pc, #4\] @ \(a044 <_start\+0x38>\) #------------------------------------------------------------------------------ #------ .got offset for f1t #------------------------------------------------------------------------------ @@ -67,8 +67,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f1t #------------------------------------------------------------------------------ a044: 00006fd0 \.word 0x00006fd0 - a048: 4c00 ldr r4, \[pc, #0\] ; \(a04c <_start\+0x40>\) - a04a: 4c01 ldr r4, \[pc, #4\] ; \(a050 <_start\+0x44>\) + a048: 4c00 ldr r4, \[pc, #0\] @ \(a04c <_start\+0x40>\) + a04a: 4c01 ldr r4, \[pc, #4\] @ \(a050 <_start\+0x44>\) #------------------------------------------------------------------------------ #------ .got offset for f2t #------------------------------------------------------------------------------ @@ -77,8 +77,8 @@ Disassembly of section \.text: #------ PC-relative offset of .got entry for f2t #------------------------------------------------------------------------------ a050: 00006fcc \.word 0x00006fcc - a054: 4c00 ldr r4, \[pc, #0\] ; \(a058 <_start\+0x4c>\) - a056: 4c01 ldr r4, \[pc, #4\] ; \(a05c <_start\+0x50>\) + a054: 4c00 ldr r4, \[pc, #0\] @ \(a058 <_start\+0x4c>\) + a056: 4c01 ldr r4, \[pc, #4\] @ \(a05c <_start\+0x50>\) #------------------------------------------------------------------------------ #------ .got offset for f3t #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-14.dd b/ld/testsuite/ld-arm/ifunc-14.dd index 281373c..d0b795c 100644 --- a/ld/testsuite/ld-arm/ifunc-14.dd +++ b/ld/testsuite/ld-arm/ifunc-14.dd @@ -5,8 +5,8 @@ Disassembly of section \.plt: 00009000 <.plt>: - 9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <.*> + 9000: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + 9004: e59fe004 ldr lr, \[pc, #4\] @ 9010 <.*> 9008: e08fe00e add lr, pc, lr 900c: e5bef008 ldr pc, \[lr, #8\]! #------------------------------------------------------------------------------ @@ -18,15 +18,15 @@ Disassembly of section \.plt: #------------------------------------------------------------------------------ 00009014 <f2t@plt>: 9014: e28fc600 add ip, pc, #0, 12 - 9018: e28cca07 add ip, ip, #28672 ; 0x7000 - 901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0 + 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 + 9024: e28cca07 add ip, ip, #28672 @ 0x7000 + 9028: e5bcffe8 ldr pc, \[ip, #4072\]! @ 0xfe8 Disassembly of section \.iplt: @@ -35,24 +35,24 @@ Disassembly of section \.iplt: #------ f1's .iplt entry #------------------------------------------------------------------------------ 902c: e28fc600 add ip, pc, #0, 12 - 9030: e28cca07 add ip, ip, #28672 ; 0x7000 - 9034: e5bcffe0 ldr pc, \[ip, #4064\]! ; 0xfe0 + 9030: e28cca07 add ip, ip, #28672 @ 0x7000 + 9034: e5bcffe0 ldr pc, \[ip, #4064\]! @ 0xfe0 #------------------------------------------------------------------------------ #------ f1t's .iplt entry #------------------------------------------------------------------------------ 9038: e28fc600 add ip, pc, #0, 12 - 903c: e28cca07 add ip, ip, #28672 ; 0x7000 - 9040: e5bcffd8 ldr pc, \[ip, #4056\]! ; 0xfd8 + 903c: e28cca07 add ip, ip, #28672 @ 0x7000 + 9040: e5bcffd8 ldr pc, \[ip, #4056\]! @ 0xfd8 00009044 <f3>: 9044: e28fc600 add ip, pc, #0, 12 - 9048: e28cca07 add ip, ip, #28672 ; 0x7000 - 904c: e5bcffd0 ldr pc, \[ip, #4048\]! ; 0xfd0 + 9048: e28cca07 add ip, ip, #28672 @ 0x7000 + 904c: e5bcffd0 ldr pc, \[ip, #4048\]! @ 0xfd0 00009050 <f3t>: 9050: e28fc600 add ip, pc, #0, 12 - 9054: e28cca07 add ip, ip, #28672 ; 0x7000 - 9058: e5bcffc8 ldr pc, \[ip, #4040\]! ; 0xfc8 + 9054: e28cca07 add ip, ip, #28672 @ 0x7000 + 9058: e5bcffc8 ldr pc, \[ip, #4040\]! @ 0xfc8 Disassembly of section \.text: @@ -65,37 +65,37 @@ Disassembly of section \.text: a00a: 46f7 mov pc, lr 0000a00c <_start>: - a00c: f8df 4000 ldr\.w r4, \[pc\] ; a010 <_start\+0x4> + a00c: f8df 4000 ldr\.w r4, \[pc\] @ a010 <_start\+0x4> #------------------------------------------------------------------------------ #------ PC-relative offset of foo #------------------------------------------------------------------------------ a010: 00005ff0 \.word 0x00005ff0 - a014: f8df 4000 ldr\.w r4, \[pc\] ; a018 <_start\+0xc> + a014: f8df 4000 ldr\.w r4, \[pc\] @ a018 <_start\+0xc> #------------------------------------------------------------------------------ #------ PC-relative offset of f1's .iplt entry #------------------------------------------------------------------------------ a018: fffff014 \.word 0xfffff014 - a01c: f8df 4000 ldr\.w r4, \[pc\] ; a020 <_start\+0x14> + a01c: f8df 4000 ldr\.w r4, \[pc\] @ a020 <_start\+0x14> #------------------------------------------------------------------------------ #------ PC-relative offset of f2's .plt entry #------------------------------------------------------------------------------ a020: fffff000 \.word 0xfffff000 - a024: f8df 4000 ldr\.w r4, \[pc\] ; a028 <_start\+0x1c> + a024: f8df 4000 ldr\.w r4, \[pc\] @ a028 <_start\+0x1c> #------------------------------------------------------------------------------ #------ PC-relative offset of f3 #------------------------------------------------------------------------------ a028: fffff01c \.word 0xfffff01c - a02c: f8df 4000 ldr\.w r4, \[pc\] ; a030 <_start\+0x24> + a02c: f8df 4000 ldr\.w r4, \[pc\] @ a030 <_start\+0x24> #------------------------------------------------------------------------------ #------ PC-relative offset of f1t's .iplt entry #------------------------------------------------------------------------------ a030: fffff008 \.word 0xfffff008 - a034: f8df 4000 ldr\.w r4, \[pc\] ; a038 <_start\+0x2c> + a034: f8df 4000 ldr\.w r4, \[pc\] @ a038 <_start\+0x2c> #------------------------------------------------------------------------------ #------ PC-relative offset of f2t's .plt entry #------------------------------------------------------------------------------ a038: ffffefdc \.word 0xffffefdc - a03c: f8df 4000 ldr\.w r4, \[pc\] ; a040 <_start\+0x34> + a03c: f8df 4000 ldr\.w r4, \[pc\] @ a040 <_start\+0x34> #------------------------------------------------------------------------------ #------ PC-relative offset of f3t #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-15.dd b/ld/testsuite/ld-arm/ifunc-15.dd index d3fbf9d..4e5031f 100644 --- a/ld/testsuite/ld-arm/ifunc-15.dd +++ b/ld/testsuite/ld-arm/ifunc-15.dd @@ -5,8 +5,8 @@ Disassembly of section \.plt: 00009000 <.plt>: - 9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <.*> + 9000: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + 9004: e59fe004 ldr lr, \[pc, #4\] @ 9010 <.*> 9008: e08fe00e add lr, pc, lr 900c: e5bef008 ldr pc, \[lr, #8\]! #------------------------------------------------------------------------------ @@ -18,15 +18,15 @@ Disassembly of section \.plt: #------------------------------------------------------------------------------ 00009014 <f2t@plt>: 9014: e28fc600 add ip, pc, #0, 12 - 9018: e28cca07 add ip, ip, #28672 ; 0x7000 - 901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0 + 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 + 9024: e28cca07 add ip, ip, #28672 @ 0x7000 + 9028: e5bcffe8 ldr pc, \[ip, #4072\]! @ 0xfe8 Disassembly of section \.iplt: @@ -35,24 +35,24 @@ Disassembly of section \.iplt: #------ f1's .iplt entry #------------------------------------------------------------------------------ 902c: e28fc600 add ip, pc, #0, 12 - 9030: e28cca07 add ip, ip, #28672 ; 0x7000 - 9034: e5bcffe0 ldr pc, \[ip, #4064\]! ; 0xfe0 + 9030: e28cca07 add ip, ip, #28672 @ 0x7000 + 9034: e5bcffe0 ldr pc, \[ip, #4064\]! @ 0xfe0 #------------------------------------------------------------------------------ #------ f1t's .iplt entry #------------------------------------------------------------------------------ 9038: e28fc600 add ip, pc, #0, 12 - 903c: e28cca07 add ip, ip, #28672 ; 0x7000 - 9040: e5bcffd8 ldr pc, \[ip, #4056\]! ; 0xfd8 + 903c: e28cca07 add ip, ip, #28672 @ 0x7000 + 9040: e5bcffd8 ldr pc, \[ip, #4056\]! @ 0xfd8 00009044 <f3>: 9044: e28fc600 add ip, pc, #0, 12 - 9048: e28cca07 add ip, ip, #28672 ; 0x7000 - 904c: e5bcffd0 ldr pc, \[ip, #4048\]! ; 0xfd0 + 9048: e28cca07 add ip, ip, #28672 @ 0x7000 + 904c: e5bcffd0 ldr pc, \[ip, #4048\]! @ 0xfd0 00009050 <f3t>: 9050: e28fc600 add ip, pc, #0, 12 - 9054: e28cca07 add ip, ip, #28672 ; 0x7000 - 9058: e5bcffc8 ldr pc, \[ip, #4040\]! ; 0xfc8 + 9054: e28cca07 add ip, ip, #28672 @ 0x7000 + 9058: e5bcffc8 ldr pc, \[ip, #4040\]! @ 0xfc8 Disassembly of section \.text: @@ -65,37 +65,37 @@ Disassembly of section \.text: a00a: 46f7 mov pc, lr 0000a00c <_start>: - a00c: f8df 4000 ldr\.w r4, \[pc\] ; a010 <_start\+0x4> + a00c: f8df 4000 ldr\.w r4, \[pc\] @ a010 <_start\+0x4> #------------------------------------------------------------------------------ #------ foo #------------------------------------------------------------------------------ a010: 00010000 \.word 0x00010000 - a014: f8df 4000 ldr\.w r4, \[pc\] ; a018 <_start\+0xc> + a014: f8df 4000 ldr\.w r4, \[pc\] @ a018 <_start\+0xc> #------------------------------------------------------------------------------ #------ f1's .iplt entry #------------------------------------------------------------------------------ a018: 0000902c \.word 0x0000902c - a01c: f8df 4000 ldr\.w r4, \[pc\] ; a020 <_start\+0x14> + a01c: f8df 4000 ldr\.w r4, \[pc\] @ a020 <_start\+0x14> #------------------------------------------------------------------------------ #------ f2's .plt entry #------------------------------------------------------------------------------ a020: 00009020 \.word 0x00009020 - a024: f8df 4000 ldr\.w r4, \[pc\] ; a028 <_start\+0x1c> + a024: f8df 4000 ldr\.w r4, \[pc\] @ a028 <_start\+0x1c> #------------------------------------------------------------------------------ #------ f3 #------------------------------------------------------------------------------ a028: 00009044 \.word 0x00009044 - a02c: f8df 4000 ldr\.w r4, \[pc\] ; a030 <_start\+0x24> + a02c: f8df 4000 ldr\.w r4, \[pc\] @ a030 <_start\+0x24> #------------------------------------------------------------------------------ #------ f1t's .iplt entry #------------------------------------------------------------------------------ a030: 00009038 \.word 0x00009038 - a034: f8df 4000 ldr\.w r4, \[pc\] ; a038 <_start\+0x2c> + a034: f8df 4000 ldr\.w r4, \[pc\] @ a038 <_start\+0x2c> #------------------------------------------------------------------------------ #------ f2t's .plt entry #------------------------------------------------------------------------------ a038: 00009014 \.word 0x00009014 - a03c: f8df 4000 ldr\.w r4, \[pc\] ; a040 <_start\+0x34> + a03c: f8df 4000 ldr\.w r4, \[pc\] @ a040 <_start\+0x34> #------------------------------------------------------------------------------ #------ f3t #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-16.dd b/ld/testsuite/ld-arm/ifunc-16.dd index 16c2a97..7cd61d2 100644 --- a/ld/testsuite/ld-arm/ifunc-16.dd +++ b/ld/testsuite/ld-arm/ifunc-16.dd @@ -9,34 +9,34 @@ Disassembly of section \.iplt: #------ f1's .iplt entry #------------------------------------------------------------------------------ 9000: e28fc600 add ip, pc, #0, 12 - 9004: e28cca08 add ip, ip, #8, 20 ; 0x8000 + 9004: e28cca08 add ip, ip, #8, 20 @ 0x8000 9008: e5bcf004 ldr pc, \[ip, #4\]! #------------------------------------------------------------------------------ #------ f1t's .iplt entry #------------------------------------------------------------------------------ 900c: e28fc600 add ip, pc, #0, 12 - 9010: e28cca07 add ip, ip, #28672 ; 0x7000 - 9014: e5bcfffc ldr pc, \[ip, #4092\]! ; 0xffc + 9010: e28cca07 add ip, ip, #28672 @ 0x7000 + 9014: e5bcfffc ldr pc, \[ip, #4092\]! @ 0xffc 00009018 <f2t>: 9018: e28fc600 add ip, pc, #0, 12 - 901c: e28cca07 add ip, ip, #28672 ; 0x7000 - 9020: e5bcfff4 ldr pc, \[ip, #4084\]! ; 0xff4 + 901c: e28cca07 add ip, ip, #28672 @ 0x7000 + 9020: e5bcfff4 ldr pc, \[ip, #4084\]! @ 0xff4 00009024 <f3>: 9024: e28fc600 add ip, pc, #0, 12 - 9028: e28cca07 add ip, ip, #28672 ; 0x7000 - 902c: e5bcffec ldr pc, \[ip, #4076\]! ; 0xfec + 9028: e28cca07 add ip, ip, #28672 @ 0x7000 + 902c: e5bcffec ldr pc, \[ip, #4076\]! @ 0xfec 00009030 <f2>: 9030: e28fc600 add ip, pc, #0, 12 - 9034: e28cca07 add ip, ip, #28672 ; 0x7000 - 9038: e5bcffe4 ldr pc, \[ip, #4068\]! ; 0xfe4 + 9034: e28cca07 add ip, ip, #28672 @ 0x7000 + 9038: e5bcffe4 ldr pc, \[ip, #4068\]! @ 0xfe4 0000903c <f3t>: 903c: e28fc600 add ip, pc, #0, 12 - 9040: e28cca07 add ip, ip, #28672 ; 0x7000 - 9044: e5bcffdc ldr pc, \[ip, #4060\]! ; 0xfdc + 9040: e28cca07 add ip, ip, #28672 @ 0x7000 + 9044: e5bcffdc ldr pc, \[ip, #4060\]! @ 0xfdc Disassembly of section \.text: @@ -51,37 +51,37 @@ Disassembly of section \.text: a010: 46f7 mov pc, lr 0000a012 <_start>: - a012: 4c00 ldr r4, \[pc, #0\] ; \(a014 <_start\+0x2>\) + a012: 4c00 ldr r4, \[pc, #0\] @ \(a014 <_start\+0x2>\) #------------------------------------------------------------------------------ #------ foo #------------------------------------------------------------------------------ a014: 00010000 \.word 0x00010000 - a018: f8df 4000 ldr\.w r4, \[pc\] ; a01c <_start\+0xa> + a018: f8df 4000 ldr\.w r4, \[pc\] @ a01c <_start\+0xa> #------------------------------------------------------------------------------ #------ f1's .iplt entry #------------------------------------------------------------------------------ a01c: 00009000 \.word 0x00009000 - a020: f8df 4000 ldr\.w r4, \[pc\] ; a024 <_start\+0x12> + a020: f8df 4000 ldr\.w r4, \[pc\] @ a024 <_start\+0x12> #------------------------------------------------------------------------------ #------ f2 #------------------------------------------------------------------------------ a024: 00009030 \.word 0x00009030 - a028: f8df 4000 ldr\.w r4, \[pc\] ; a02c <_start\+0x1a> + a028: f8df 4000 ldr\.w r4, \[pc\] @ a02c <_start\+0x1a> #------------------------------------------------------------------------------ #------ f3 #------------------------------------------------------------------------------ a02c: 00009024 \.word 0x00009024 - a030: f8df 4000 ldr\.w r4, \[pc\] ; a034 <_start\+0x22> + a030: f8df 4000 ldr\.w r4, \[pc\] @ a034 <_start\+0x22> #------------------------------------------------------------------------------ #------ f1t's .iplt entry #------------------------------------------------------------------------------ a034: 0000900c \.word 0x0000900c - a038: f8df 4000 ldr\.w r4, \[pc\] ; a03c <_start\+0x2a> + a038: f8df 4000 ldr\.w r4, \[pc\] @ a03c <_start\+0x2a> #------------------------------------------------------------------------------ #------ f2t #------------------------------------------------------------------------------ a03c: 00009018 \.word 0x00009018 - a040: f8df 4000 ldr\.w r4, \[pc\] ; a044 <_start\+0x32> + a040: f8df 4000 ldr\.w r4, \[pc\] @ a044 <_start\+0x32> #------------------------------------------------------------------------------ #------ f3t #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-17.dd b/ld/testsuite/ld-arm/ifunc-17.dd index ee5cd05..499bf14 100644 --- a/ld/testsuite/ld-arm/ifunc-17.dd +++ b/ld/testsuite/ld-arm/ifunc-17.dd @@ -9,7 +9,7 @@ Disassembly of section \.iplt: #------ appfunc1's .iplt entry #------------------------------------------------------------------------------ 9000: e28fc600 add ip, pc, #0, 12 - 9004: e28cca08 add ip, ip, #8, 20 ; 0x8000 + 9004: e28cca08 add ip, ip, #8, 20 @ 0x8000 9008: e5bcf004 ldr pc, \[ip, #4\]! Disassembly of section \.text: diff --git a/ld/testsuite/ld-arm/ifunc-2.dd b/ld/testsuite/ld-arm/ifunc-2.dd index a60ef2b..0568128 100644 --- a/ld/testsuite/ld-arm/ifunc-2.dd +++ b/ld/testsuite/ld-arm/ifunc-2.dd @@ -9,14 +9,14 @@ Disassembly of section \.iplt: #------ f1's .iplt entry #------------------------------------------------------------------------------ 9000: e28fc600 add ip, pc, #0, 12 - 9004: e28cca08 add ip, ip, #8, 20 ; 0x8000 + 9004: e28cca08 add ip, ip, #8, 20 @ 0x8000 9008: e5bcf004 ldr pc, \[ip, #4\]! #------------------------------------------------------------------------------ #------ f2's .iplt entry #------------------------------------------------------------------------------ 900c: e28fc600 add ip, pc, #0, 12 - 9010: e28cca07 add ip, ip, #28672 ; 0x7000 - 9014: e5bcfffc ldr pc, \[ip, #4092\]! ; 0xffc + 9010: e28cca07 add ip, ip, #28672 @ 0x7000 + 9014: e5bcfffc ldr pc, \[ip, #4092\]! @ 0xffc #------------------------------------------------------------------------------ #------ thumb entry to f3's .iplt entry #------------------------------------------------------------------------------ @@ -26,8 +26,8 @@ Disassembly of section \.iplt: #------ f3's .iplt entry #------------------------------------------------------------------------------ 901c: e28fc600 add ip, pc, #0, 12 - 9020: e28cca07 add ip, ip, #28672 ; 0x7000 - 9024: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0 + 9020: e28cca07 add ip, ip, #28672 @ 0x7000 + 9024: e5bcfff0 ldr pc, \[ip, #4080\]! @ 0xff0 #------------------------------------------------------------------------------ #------ thumb entry to f4's .iplt entry #------------------------------------------------------------------------------ @@ -37,8 +37,8 @@ Disassembly of section \.iplt: #------ f4's .iplt entry #------------------------------------------------------------------------------ 902c: e28fc600 add ip, pc, #0, 12 - 9030: e28cca07 add ip, ip, #28672 ; 0x7000 - 9034: e5bcffe4 ldr pc, \[ip, #4068\]! ; 0xfe4 + 9030: e28cca07 add ip, ip, #28672 @ 0x7000 + 9034: e5bcffe4 ldr pc, \[ip, #4068\]! @ 0xfe4 #------------------------------------------------------------------------------ #------ thumb entry to f7 #------------------------------------------------------------------------------ @@ -47,13 +47,13 @@ Disassembly of section \.iplt: 0000903c <f7>: 903c: e28fc600 add ip, pc, #0, 12 - 9040: e28cca07 add ip, ip, #28672 ; 0x7000 - 9044: e5bcffd8 ldr pc, \[ip, #4056\]! ; 0xfd8 + 9040: e28cca07 add ip, ip, #28672 @ 0x7000 + 9044: e5bcffd8 ldr pc, \[ip, #4056\]! @ 0xfd8 00009048 <f5>: 9048: e28fc600 add ip, pc, #0, 12 - 904c: e28cca07 add ip, ip, #28672 ; 0x7000 - 9050: e5bcffd0 ldr pc, \[ip, #4048\]! ; 0xfd0 + 904c: e28cca07 add ip, ip, #28672 @ 0x7000 + 9050: e5bcffd0 ldr pc, \[ip, #4048\]! @ 0xfd0 #------------------------------------------------------------------------------ #------ thumb entry to f8 #------------------------------------------------------------------------------ @@ -62,13 +62,13 @@ Disassembly of section \.iplt: 00009058 <f8>: 9058: e28fc600 add ip, pc, #0, 12 - 905c: e28cca07 add ip, ip, #28672 ; 0x7000 - 9060: e5bcffc4 ldr pc, \[ip, #4036\]! ; 0xfc4 + 905c: e28cca07 add ip, ip, #28672 @ 0x7000 + 9060: e5bcffc4 ldr pc, \[ip, #4036\]! @ 0xfc4 00009064 <f6>: 9064: e28fc600 add ip, pc, #0, 12 - 9068: e28cca07 add ip, ip, #28672 ; 0x7000 - 906c: e5bcffbc ldr pc, \[ip, #4028\]! ; 0xfbc + 9068: e28cca07 add ip, ip, #28672 @ 0x7000 + 906c: e5bcffbc ldr pc, \[ip, #4028\]! @ 0xfbc Disassembly of section \.text: @@ -96,11 +96,11 @@ Disassembly of section \.text: a020: eb0017f6 bl 10000 <foo> a024: ea0017f5 b 10000 <foo> a028: 0a0017f4 beq 10000 <foo> - a02c: e59f4014 ldr r4, \[pc, #20\] ; a048 <_start\+0x28> - a030: e59f4014 ldr r4, \[pc, #20\] ; a04c <_start\+0x2c> - a034: e59f4014 ldr r4, \[pc, #20\] ; a050 <_start\+0x30> - a038: e59f4014 ldr r4, \[pc, #20\] ; a054 <_start\+0x34> - a03c: e59f5014 ldr r5, \[pc, #20\] ; a058 <_start\+0x38> + a02c: e59f4014 ldr r4, \[pc, #20\] @ a048 <_start\+0x28> + a030: e59f4014 ldr r4, \[pc, #20\] @ a04c <_start\+0x2c> + a034: e59f4014 ldr r4, \[pc, #20\] @ a050 <_start\+0x30> + a038: e59f4014 ldr r4, \[pc, #20\] @ a054 <_start\+0x34> + a03c: e59f5014 ldr r5, \[pc, #20\] @ a058 <_start\+0x38> a040: e3004000 movw r4, #0 a044: e3404001 movt r4, #1 #------------------------------------------------------------------------------ @@ -135,12 +135,12 @@ Disassembly of section \.text: #------ f1's .iplt entry #------------------------------------------------------------------------------ a064: 0afffbe5 beq 9000 <f7-0x3c> - a068: e59f4014 ldr r4, \[pc, #20\] ; a084 <_start\+0x64> - a06c: e59f4014 ldr r4, \[pc, #20\] ; a088 <_start\+0x68> - a070: e59f4014 ldr r4, \[pc, #20\] ; a08c <_start\+0x6c> - a074: e59f4014 ldr r4, \[pc, #20\] ; a090 <_start\+0x70> - a078: e59f5014 ldr r5, \[pc, #20\] ; a094 <_start\+0x74> - a07c: e3094000 movw r4, #36864 ; 0x9000 + a068: e59f4014 ldr r4, \[pc, #20\] @ a084 <_start\+0x64> + a06c: e59f4014 ldr r4, \[pc, #20\] @ a088 <_start\+0x68> + a070: e59f4014 ldr r4, \[pc, #20\] @ a08c <_start\+0x6c> + a074: e59f4014 ldr r4, \[pc, #20\] @ a090 <_start\+0x70> + a078: e59f5014 ldr r5, \[pc, #20\] @ a094 <_start\+0x74> + a07c: e3094000 movw r4, #36864 @ 0x9000 a080: e3404000 movt r4, #0 #------------------------------------------------------------------------------ #------ f1's .iplt entry @@ -174,12 +174,12 @@ Disassembly of section \.text: #------ f2's .iplt entry #------------------------------------------------------------------------------ a0a0: 0afffbd9 beq 900c <f7-0x30> - a0a4: e59f4014 ldr r4, \[pc, #20\] ; a0c0 <_start\+0xa0> - a0a8: e59f4014 ldr r4, \[pc, #20\] ; a0c4 <_start\+0xa4> - a0ac: e59f4014 ldr r4, \[pc, #20\] ; a0c8 <_start\+0xa8> - a0b0: e59f4014 ldr r4, \[pc, #20\] ; a0cc <_start\+0xac> - a0b4: e59f5014 ldr r5, \[pc, #20\] ; a0d0 <_start\+0xb0> - a0b8: e309400c movw r4, #36876 ; 0x900c + a0a4: e59f4014 ldr r4, \[pc, #20\] @ a0c0 <_start\+0xa0> + a0a8: e59f4014 ldr r4, \[pc, #20\] @ a0c4 <_start\+0xa4> + a0ac: e59f4014 ldr r4, \[pc, #20\] @ a0c8 <_start\+0xa8> + a0b0: e59f4014 ldr r4, \[pc, #20\] @ a0cc <_start\+0xac> + a0b4: e59f5014 ldr r5, \[pc, #20\] @ a0d0 <_start\+0xb0> + a0b8: e309400c movw r4, #36876 @ 0x900c a0bc: e3404000 movt r4, #0 #------------------------------------------------------------------------------ #------ f2's .iplt entry @@ -204,12 +204,12 @@ Disassembly of section \.text: a0d4: ebfffbdb bl 9048 <f5> a0d8: eafffbda b 9048 <f5> a0dc: 0afffbd9 beq 9048 <f5> - a0e0: e59f4014 ldr r4, \[pc, #20\] ; a0fc <_start\+0xdc> - a0e4: e59f4014 ldr r4, \[pc, #20\] ; a100 <_start\+0xe0> - a0e8: e59f4014 ldr r4, \[pc, #20\] ; a104 <_start\+0xe4> - a0ec: e59f4014 ldr r4, \[pc, #20\] ; a108 <_start\+0xe8> - a0f0: e59f5014 ldr r5, \[pc, #20\] ; a10c <_start\+0xec> - a0f4: e3094048 movw r4, #36936 ; 0x9048 + a0e0: e59f4014 ldr r4, \[pc, #20\] @ a0fc <_start\+0xdc> + a0e4: e59f4014 ldr r4, \[pc, #20\] @ a100 <_start\+0xe0> + a0e8: e59f4014 ldr r4, \[pc, #20\] @ a104 <_start\+0xe4> + a0ec: e59f4014 ldr r4, \[pc, #20\] @ a108 <_start\+0xe8> + a0f0: e59f5014 ldr r5, \[pc, #20\] @ a10c <_start\+0xec> + a0f4: e3094048 movw r4, #36936 @ 0x9048 a0f8: e3404000 movt r4, #0 #------------------------------------------------------------------------------ #------ f5 @@ -234,12 +234,12 @@ Disassembly of section \.text: a110: ebfffbd3 bl 9064 <f6> a114: eafffbd2 b 9064 <f6> a118: 0afffbd1 beq 9064 <f6> - a11c: e59f4014 ldr r4, \[pc, #20\] ; a138 <_start\+0x118> - a120: e59f4014 ldr r4, \[pc, #20\] ; a13c <_start\+0x11c> - a124: e59f4014 ldr r4, \[pc, #20\] ; a140 <_start\+0x120> - a128: e59f4014 ldr r4, \[pc, #20\] ; a144 <_start\+0x124> - a12c: e59f5014 ldr r5, \[pc, #20\] ; a148 <_start\+0x128> - a130: e3094064 movw r4, #36964 ; 0x9064 + a11c: e59f4014 ldr r4, \[pc, #20\] @ a138 <_start\+0x118> + a120: e59f4014 ldr r4, \[pc, #20\] @ a13c <_start\+0x11c> + a124: e59f4014 ldr r4, \[pc, #20\] @ a140 <_start\+0x120> + a128: e59f4014 ldr r4, \[pc, #20\] @ a144 <_start\+0x124> + a12c: e59f5014 ldr r5, \[pc, #20\] @ a148 <_start\+0x128> + a130: e3094064 movw r4, #36964 @ 0x9064 a134: e3404000 movt r4, #0 #------------------------------------------------------------------------------ #------ f6 @@ -266,11 +266,11 @@ Disassembly of section \.text: a14c: f005 ff58 bl 10000 <foo> a150: f005 bf56 b\.w 10000 <foo> a154: f005 8754 beq\.w 10000 <foo> - a158: 4c04 ldr r4, \[pc, #16\] ; \(a16c <_thumb\+0x20>\) - a15a: f8df 4014 ldr\.w r4, \[pc, #20\] ; a170 <_thumb\+0x24> - a15e: 4c05 ldr r4, \[pc, #20\] ; \(a174 <_thumb\+0x28>\) - a160: 4c05 ldr r4, \[pc, #20\] ; \(a178 <_thumb\+0x2c>\) - a162: 4d06 ldr r5, \[pc, #24\] ; \(a17c <_thumb\+0x30>\) + a158: 4c04 ldr r4, \[pc, #16\] @ \(a16c <_thumb\+0x20>\) + a15a: f8df 4014 ldr\.w r4, \[pc, #20\] @ a170 <_thumb\+0x24> + a15e: 4c05 ldr r4, \[pc, #20\] @ \(a174 <_thumb\+0x28>\) + a160: 4c05 ldr r4, \[pc, #20\] @ \(a178 <_thumb\+0x2c>\) + a162: 4d06 ldr r5, \[pc, #24\] @ \(a17c <_thumb\+0x30>\) a164: f240 0400 movw r4, #0 a168: f2c0 0401 movt r4, #1 #------------------------------------------------------------------------------ @@ -305,12 +305,12 @@ Disassembly of section \.text: #------ thumb entry to f3's .iplt entry #------------------------------------------------------------------------------ a188: f43e af46 beq\.w 9018 <f7-0x24> - a18c: 4c04 ldr r4, \[pc, #16\] ; \(a1a0 <_thumb\+0x54>\) - a18e: f8df 4014 ldr\.w r4, \[pc, #20\] ; a1a4 <_thumb\+0x58> - a192: 4c05 ldr r4, \[pc, #20\] ; \(a1a8 <_thumb\+0x5c>\) - a194: 4c05 ldr r4, \[pc, #20\] ; \(a1ac <_thumb\+0x60>\) - a196: 4d06 ldr r5, \[pc, #24\] ; \(a1b0 <_thumb\+0x64>\) - a198: f249 041c movw r4, #36892 ; 0x901c + a18c: 4c04 ldr r4, \[pc, #16\] @ \(a1a0 <_thumb\+0x54>\) + a18e: f8df 4014 ldr\.w r4, \[pc, #20\] @ a1a4 <_thumb\+0x58> + a192: 4c05 ldr r4, \[pc, #20\] @ \(a1a8 <_thumb\+0x5c>\) + a194: 4c05 ldr r4, \[pc, #20\] @ \(a1ac <_thumb\+0x60>\) + a196: 4d06 ldr r5, \[pc, #24\] @ \(a1b0 <_thumb\+0x64>\) + a198: f249 041c movw r4, #36892 @ 0x901c a19c: f2c0 0400 movt r4, #0 #------------------------------------------------------------------------------ #------ f3's .iplt entry @@ -344,12 +344,12 @@ Disassembly of section \.text: #------ thumb entry to f4's .iplt entry #------------------------------------------------------------------------------ a1bc: f43e af34 beq\.w 9028 <f7-0x14> - a1c0: 4c04 ldr r4, \[pc, #16\] ; \(a1d4 <_thumb\+0x88>\) - a1c2: f8df 4014 ldr\.w r4, \[pc, #20\] ; a1d8 <_thumb\+0x8c> - a1c6: 4c05 ldr r4, \[pc, #20\] ; \(a1dc <_thumb\+0x90>\) - a1c8: 4c05 ldr r4, \[pc, #20\] ; \(a1e0 <_thumb\+0x94>\) - a1ca: 4d06 ldr r5, \[pc, #24\] ; \(a1e4 <_thumb\+0x98>\) - a1cc: f249 042c movw r4, #36908 ; 0x902c + a1c0: 4c04 ldr r4, \[pc, #16\] @ \(a1d4 <_thumb\+0x88>\) + a1c2: f8df 4014 ldr\.w r4, \[pc, #20\] @ a1d8 <_thumb\+0x8c> + a1c6: 4c05 ldr r4, \[pc, #20\] @ \(a1dc <_thumb\+0x90>\) + a1c8: 4c05 ldr r4, \[pc, #20\] @ \(a1e0 <_thumb\+0x94>\) + a1ca: 4d06 ldr r5, \[pc, #24\] @ \(a1e4 <_thumb\+0x98>\) + a1cc: f249 042c movw r4, #36908 @ 0x902c a1d0: f2c0 0400 movt r4, #0 #------------------------------------------------------------------------------ #------ f4's .iplt entry @@ -380,12 +380,12 @@ Disassembly of section \.text: #------ thumb entry to f7 #------------------------------------------------------------------------------ a1f0: f43e af22 beq\.w 9038 <f7-0x4> - a1f4: 4c04 ldr r4, \[pc, #16\] ; \(a208 <_thumb\+0xbc>\) - a1f6: f8df 4014 ldr\.w r4, \[pc, #20\] ; a20c <_thumb\+0xc0> - a1fa: 4c05 ldr r4, \[pc, #20\] ; \(a210 <_thumb\+0xc4>\) - a1fc: 4c05 ldr r4, \[pc, #20\] ; \(a214 <_thumb\+0xc8>\) - a1fe: 4d06 ldr r5, \[pc, #24\] ; \(a218 <_thumb\+0xcc>\) - a200: f249 043c movw r4, #36924 ; 0x903c + a1f4: 4c04 ldr r4, \[pc, #16\] @ \(a208 <_thumb\+0xbc>\) + a1f6: f8df 4014 ldr\.w r4, \[pc, #20\] @ a20c <_thumb\+0xc0> + a1fa: 4c05 ldr r4, \[pc, #20\] @ \(a210 <_thumb\+0xc4>\) + a1fc: 4c05 ldr r4, \[pc, #20\] @ \(a214 <_thumb\+0xc8>\) + a1fe: 4d06 ldr r5, \[pc, #24\] @ \(a218 <_thumb\+0xcc>\) + a200: f249 043c movw r4, #36924 @ 0x903c a204: f2c0 0400 movt r4, #0 #------------------------------------------------------------------------------ #------ f7 @@ -416,12 +416,12 @@ Disassembly of section \.text: #------ thumb entry to f8 #------------------------------------------------------------------------------ a224: f43e af16 beq\.w 9054 <f5\+0xc> - a228: 4c04 ldr r4, \[pc, #16\] ; \(a23c <_thumb\+0xf0>\) - a22a: f8df 4014 ldr\.w r4, \[pc, #20\] ; a240 <_thumb\+0xf4> - a22e: 4c05 ldr r4, \[pc, #20\] ; \(a244 <_thumb\+0xf8>\) - a230: 4c05 ldr r4, \[pc, #20\] ; \(a248 <_thumb\+0xfc>\) - a232: 4d06 ldr r5, \[pc, #24\] ; \(a24c <_thumb\+0x100>\) - a234: f249 0458 movw r4, #36952 ; 0x9058 + a228: 4c04 ldr r4, \[pc, #16\] @ \(a23c <_thumb\+0xf0>\) + a22a: f8df 4014 ldr\.w r4, \[pc, #20\] @ a240 <_thumb\+0xf4> + a22e: 4c05 ldr r4, \[pc, #20\] @ \(a244 <_thumb\+0xf8>\) + a230: 4c05 ldr r4, \[pc, #20\] @ \(a248 <_thumb\+0xfc>\) + a232: 4d06 ldr r5, \[pc, #24\] @ \(a24c <_thumb\+0x100>\) + a234: f249 0458 movw r4, #36952 @ 0x9058 a238: f2c0 0400 movt r4, #0 #------------------------------------------------------------------------------ #------ f8 diff --git a/ld/testsuite/ld-arm/ifunc-3.dd b/ld/testsuite/ld-arm/ifunc-3.dd index 2297e5a..55802ef 100644 --- a/ld/testsuite/ld-arm/ifunc-3.dd +++ b/ld/testsuite/ld-arm/ifunc-3.dd @@ -5,8 +5,8 @@ Disassembly of section \.plt: 00009000 <.plt>: - 9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <.*> + 9000: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + 9004: e59fe004 ldr lr, \[pc, #4\] @ 9010 <.*> 9008: e08fe00e add lr, pc, lr 900c: e5bef008 ldr pc, \[lr, #8\]! #------------------------------------------------------------------------------ @@ -18,8 +18,8 @@ Disassembly of section \.plt: #------------------------------------------------------------------------------ 00009014 <f2@plt>: 9014: e28fc600 add ip, pc, #0, 12 - 9018: e28cca07 add ip, ip, #28672 ; 0x7000 - 901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0 + 9018: e28cca07 add ip, ip, #28672 @ 0x7000 + 901c: e5bcfff0 ldr pc, \[ip, #4080\]! @ 0xff0 Disassembly of section \.iplt: @@ -28,20 +28,20 @@ Disassembly of section \.iplt: #------ f1's .iplt entry #------------------------------------------------------------------------------ 9020: e28fc600 add ip, pc, #0, 12 - 9024: e28cca07 add ip, ip, #28672 ; 0x7000 - 9028: e5bcffe8 ldr pc, \[ip, #4072\]! ; 0xfe8 + 9024: e28cca07 add ip, ip, #28672 @ 0x7000 + 9028: e5bcffe8 ldr pc, \[ip, #4072\]! @ 0xfe8 #------------------------------------------------------------------------------ #------ f3's .iplt entry #------------------------------------------------------------------------------ 902c: e28fc600 add ip, pc, #0, 12 - 9030: e28cca07 add ip, ip, #28672 ; 0x7000 - 9034: e5bcffe0 ldr pc, \[ip, #4064\]! ; 0xfe0 + 9030: e28cca07 add ip, ip, #28672 @ 0x7000 + 9034: e5bcffe0 ldr pc, \[ip, #4064\]! @ 0xfe0 #------------------------------------------------------------------------------ #------ f4's .iplt entry #------------------------------------------------------------------------------ 9038: e28fc600 add ip, pc, #0, 12 - 903c: e28cca07 add ip, ip, #28672 ; 0x7000 - 9040: e5bcffd8 ldr pc, \[ip, #4056\]! ; 0xfd8 + 903c: e28cca07 add ip, ip, #28672 @ 0x7000 + 9040: e5bcffd8 ldr pc, \[ip, #4056\]! @ 0xfd8 Disassembly of section \.text: @@ -59,8 +59,8 @@ Disassembly of section \.text: 0000a010 <arm>: a010: eb0017fa bl 10000 <foo> - a014: e59f4000 ldr r4, \[pc\] ; a01c <arm\+0xc> - a018: e59f4000 ldr r4, \[pc\] ; a020 <arm\+0x10> + a014: e59f4000 ldr r4, \[pc\] @ a01c <arm\+0xc> + a018: e59f4000 ldr r4, \[pc\] @ a020 <arm\+0x10> #------------------------------------------------------------------------------ #------ .got offset for foo #------------------------------------------------------------------------------ @@ -73,8 +73,8 @@ Disassembly of section \.text: #------ f1's .iplt entry #------------------------------------------------------------------------------ a024: ebfffbfd bl 9020 <f2@plt\+0xc> - a028: e59f4000 ldr r4, \[pc\] ; a030 <arm\+0x20> - a02c: e59f4000 ldr r4, \[pc\] ; a034 <arm\+0x24> + a028: e59f4000 ldr r4, \[pc\] @ a030 <arm\+0x20> + a02c: e59f4000 ldr r4, \[pc\] @ a034 <arm\+0x24> #------------------------------------------------------------------------------ #------ GP-relative offset of f1's .igot.plt entry #------------------------------------------------------------------------------ @@ -87,8 +87,8 @@ Disassembly of section \.text: #------ f2's .plt entry #------------------------------------------------------------------------------ a038: ebfffbf5 bl 9014 <f2@plt> - a03c: e59f4000 ldr r4, \[pc\] ; a044 <arm\+0x34> - a040: e59f4000 ldr r4, \[pc\] ; a048 <arm\+0x38> + a03c: e59f4000 ldr r4, \[pc\] @ a044 <arm\+0x34> + a040: e59f4000 ldr r4, \[pc\] @ a048 <arm\+0x38> #------------------------------------------------------------------------------ #------ .got offset for f2 #------------------------------------------------------------------------------ @@ -101,8 +101,8 @@ Disassembly of section \.text: #------ f3's .iplt entry #------------------------------------------------------------------------------ a04c: ebfffbf6 bl 902c <f2@plt\+0x18> - a050: e59f4000 ldr r4, \[pc\] ; a058 <arm\+0x48> - a054: e59f4000 ldr r4, \[pc\] ; a05c <arm\+0x4c> + a050: e59f4000 ldr r4, \[pc\] @ a058 <arm\+0x48> + a054: e59f4000 ldr r4, \[pc\] @ a05c <arm\+0x4c> #------------------------------------------------------------------------------ #------ GP-relative offset of f3's .igot.plt entry #------------------------------------------------------------------------------ @@ -115,8 +115,8 @@ Disassembly of section \.text: #------ f4's .iplt entry #------------------------------------------------------------------------------ a060: ebfffbf4 bl 9038 <f2@plt\+0x24> - a064: e59f4000 ldr r4, \[pc\] ; a06c <arm\+0x5c> - a068: e59f4000 ldr r4, \[pc\] ; a070 <arm\+0x60> + a064: e59f4000 ldr r4, \[pc\] @ a06c <arm\+0x5c> + a068: e59f4000 ldr r4, \[pc\] @ a070 <arm\+0x60> #------------------------------------------------------------------------------ #------ .got offset for f4 #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-4.dd b/ld/testsuite/ld-arm/ifunc-4.dd index 89fc34b..f733670 100644 --- a/ld/testsuite/ld-arm/ifunc-4.dd +++ b/ld/testsuite/ld-arm/ifunc-4.dd @@ -5,8 +5,8 @@ Disassembly of section \.plt: 00009000 <.plt>: - 9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <.*> + 9000: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + 9004: e59fe004 ldr lr, \[pc, #4\] @ 9010 <.*> 9008: e08fe00e add lr, pc, lr 900c: e5bef008 ldr pc, \[lr, #8\]! #------------------------------------------------------------------------------ @@ -23,8 +23,8 @@ Disassembly of section \.plt: #------ atf2's .plt entry #------------------------------------------------------------------------------ 9018: e28fc600 add ip, pc, #0, 12 - 901c: e28cca07 add ip, ip, #28672 ; 0x7000 - 9020: e5bcffec ldr pc, \[ip, #4076\]! ; 0xfec + 901c: e28cca07 add ip, ip, #28672 @ 0x7000 + 9020: e5bcffec ldr pc, \[ip, #4076\]! @ 0xfec #------------------------------------------------------------------------------ #------ thumb entry to ttf2's .plt entry #------------------------------------------------------------------------------ @@ -35,8 +35,8 @@ Disassembly of section \.plt: #------ ttf2's .plt entry #------------------------------------------------------------------------------ 9028: e28fc600 add ip, pc, #0, 12 - 902c: e28cca07 add ip, ip, #28672 ; 0x7000 - 9030: e5bcffe0 ldr pc, \[ip, #4064\]! ; 0xfe0 + 902c: e28cca07 add ip, ip, #28672 @ 0x7000 + 9030: e5bcffe0 ldr pc, \[ip, #4064\]! @ 0xfe0 #------------------------------------------------------------------------------ #------ thumb entry to tbf2's .plt entry #------------------------------------------------------------------------------ @@ -47,22 +47,22 @@ Disassembly of section \.plt: #------ tbf2's .plt entry #------------------------------------------------------------------------------ 9038: e28fc600 add ip, pc, #0, 12 - 903c: e28cca07 add ip, ip, #28672 ; 0x7000 - 9040: e5bcffd4 ldr pc, \[ip, #4052\]! ; 0xfd4 + 903c: e28cca07 add ip, ip, #28672 @ 0x7000 + 9040: e5bcffd4 ldr pc, \[ip, #4052\]! @ 0xfd4 #------------------------------------------------------------------------------ #------ 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 + 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 + 9054: e28cca07 add ip, ip, #28672 @ 0x7000 + 9058: e5bcffc4 ldr pc, \[ip, #4036\]! @ 0xfc4 #------------------------------------------------------------------------------ #------ thumb entry to abf2's .plt entry #------------------------------------------------------------------------------ @@ -73,8 +73,8 @@ Disassembly of section \.plt: #------ abf2's .plt entry #------------------------------------------------------------------------------ 9060: e28fc600 add ip, pc, #0, 12 - 9064: e28cca07 add ip, ip, #28672 ; 0x7000 - 9068: e5bcffb8 ldr pc, \[ip, #4024\]! ; 0xfb8 + 9064: e28cca07 add ip, ip, #28672 @ 0x7000 + 9068: e5bcffb8 ldr pc, \[ip, #4024\]! @ 0xfb8 Disassembly of section \.iplt: @@ -83,8 +83,8 @@ Disassembly of section \.iplt: #------ aaf1's .iplt entry #------------------------------------------------------------------------------ 906c: e28fc600 add ip, pc, #0, 12 - 9070: e28cca07 add ip, ip, #28672 ; 0x7000 - 9074: e5bcffb0 ldr pc, \[ip, #4016\]! ; 0xfb0 + 9070: e28cca07 add ip, ip, #28672 @ 0x7000 + 9074: e5bcffb0 ldr pc, \[ip, #4016\]! @ 0xfb0 #------------------------------------------------------------------------------ #------ thumb entry to atf1's .iplt entry #------------------------------------------------------------------------------ @@ -94,8 +94,8 @@ Disassembly of section \.iplt: #------ atf1's .iplt entry #------------------------------------------------------------------------------ 907c: e28fc600 add ip, pc, #0, 12 - 9080: e28cca07 add ip, ip, #28672 ; 0x7000 - 9084: e5bcffa4 ldr pc, \[ip, #4004\]! ; 0xfa4 + 9080: e28cca07 add ip, ip, #28672 @ 0x7000 + 9084: e5bcffa4 ldr pc, \[ip, #4004\]! @ 0xfa4 #------------------------------------------------------------------------------ #------ thumb entry to abf1's .iplt entry #------------------------------------------------------------------------------ @@ -105,14 +105,14 @@ Disassembly of section \.iplt: #------ abf1's .iplt entry #------------------------------------------------------------------------------ 908c: e28fc600 add ip, pc, #0, 12 - 9090: e28cca07 add ip, ip, #28672 ; 0x7000 - 9094: e5bcff98 ldr pc, \[ip, #3992\]! ; 0xf98 + 9090: e28cca07 add ip, ip, #28672 @ 0x7000 + 9094: e5bcff98 ldr pc, \[ip, #3992\]! @ 0xf98 #------------------------------------------------------------------------------ #------ taf1's .iplt entry #------------------------------------------------------------------------------ 9098: e28fc600 add ip, pc, #0, 12 - 909c: e28cca07 add ip, ip, #28672 ; 0x7000 - 90a0: e5bcff90 ldr pc, \[ip, #3984\]! ; 0xf90 + 909c: e28cca07 add ip, ip, #28672 @ 0x7000 + 90a0: e5bcff90 ldr pc, \[ip, #3984\]! @ 0xf90 #------------------------------------------------------------------------------ #------ thumb entry to ttf1's .iplt entry #------------------------------------------------------------------------------ @@ -122,8 +122,8 @@ Disassembly of section \.iplt: #------ ttf1's .iplt entry #------------------------------------------------------------------------------ 90a8: e28fc600 add ip, pc, #0, 12 - 90ac: e28cca07 add ip, ip, #28672 ; 0x7000 - 90b0: e5bcff84 ldr pc, \[ip, #3972\]! ; 0xf84 + 90ac: e28cca07 add ip, ip, #28672 @ 0x7000 + 90b0: e5bcff84 ldr pc, \[ip, #3972\]! @ 0xf84 #------------------------------------------------------------------------------ #------ thumb entry to tbf1's .iplt entry #------------------------------------------------------------------------------ @@ -133,14 +133,14 @@ Disassembly of section \.iplt: #------ tbf1's .iplt entry #------------------------------------------------------------------------------ 90b8: e28fc600 add ip, pc, #0, 12 - 90bc: e28cca07 add ip, ip, #28672 ; 0x7000 - 90c0: e5bcff78 ldr pc, \[ip, #3960\]! ; 0xf78 + 90bc: e28cca07 add ip, ip, #28672 @ 0x7000 + 90c0: e5bcff78 ldr pc, \[ip, #3960\]! @ 0xf78 #------------------------------------------------------------------------------ #------ aaf4's .iplt entry #------------------------------------------------------------------------------ 90c4: e28fc600 add ip, pc, #0, 12 - 90c8: e28cca07 add ip, ip, #28672 ; 0x7000 - 90cc: e5bcff70 ldr pc, \[ip, #3952\]! ; 0xf70 + 90c8: e28cca07 add ip, ip, #28672 @ 0x7000 + 90cc: e5bcff70 ldr pc, \[ip, #3952\]! @ 0xf70 #------------------------------------------------------------------------------ #------ thumb entry to atf3's .iplt entry #------------------------------------------------------------------------------ @@ -150,8 +150,8 @@ Disassembly of section \.iplt: #------ atf3's .iplt entry #------------------------------------------------------------------------------ 90d4: e28fc600 add ip, pc, #0, 12 - 90d8: e28cca07 add ip, ip, #28672 ; 0x7000 - 90dc: e5bcff64 ldr pc, \[ip, #3940\]! ; 0xf64 + 90d8: e28cca07 add ip, ip, #28672 @ 0x7000 + 90dc: e5bcff64 ldr pc, \[ip, #3940\]! @ 0xf64 #------------------------------------------------------------------------------ #------ thumb entry to abf3's .iplt entry #------------------------------------------------------------------------------ @@ -161,8 +161,8 @@ Disassembly of section \.iplt: #------ abf3's .iplt entry #------------------------------------------------------------------------------ 90e4: e28fc600 add ip, pc, #0, 12 - 90e8: e28cca07 add ip, ip, #28672 ; 0x7000 - 90ec: e5bcff58 ldr pc, \[ip, #3928\]! ; 0xf58 + 90e8: e28cca07 add ip, ip, #28672 @ 0x7000 + 90ec: e5bcff58 ldr pc, \[ip, #3928\]! @ 0xf58 #------------------------------------------------------------------------------ #------ thumb entry to ttf3's .iplt entry #------------------------------------------------------------------------------ @@ -172,8 +172,8 @@ Disassembly of section \.iplt: #------ ttf3's .iplt entry #------------------------------------------------------------------------------ 90f4: e28fc600 add ip, pc, #0, 12 - 90f8: e28cca07 add ip, ip, #28672 ; 0x7000 - 90fc: e5bcff4c ldr pc, \[ip, #3916\]! ; 0xf4c + 90f8: e28cca07 add ip, ip, #28672 @ 0x7000 + 90fc: e5bcff4c ldr pc, \[ip, #3916\]! @ 0xf4c #------------------------------------------------------------------------------ #------ thumb entry to tbf3's .iplt entry #------------------------------------------------------------------------------ @@ -183,14 +183,14 @@ Disassembly of section \.iplt: #------ tbf3's .iplt entry #------------------------------------------------------------------------------ 9104: e28fc600 add ip, pc, #0, 12 - 9108: e28cca07 add ip, ip, #28672 ; 0x7000 - 910c: e5bcff40 ldr pc, \[ip, #3904\]! ; 0xf40 + 9108: e28cca07 add ip, ip, #28672 @ 0x7000 + 910c: e5bcff40 ldr pc, \[ip, #3904\]! @ 0xf40 #------------------------------------------------------------------------------ #------ taf3's .iplt entry #------------------------------------------------------------------------------ 9110: e28fc600 add ip, pc, #0, 12 - 9114: e28cca07 add ip, ip, #28672 ; 0x7000 - 9118: e5bcff38 ldr pc, \[ip, #3896\]! ; 0xf38 + 9114: e28cca07 add ip, ip, #28672 @ 0x7000 + 9118: e5bcff38 ldr pc, \[ip, #3896\]! @ 0xf38 #------------------------------------------------------------------------------ #------ thumb entry to abf4's .iplt entry #------------------------------------------------------------------------------ @@ -200,8 +200,8 @@ Disassembly of section \.iplt: #------ abf4's .iplt entry #------------------------------------------------------------------------------ 9120: e28fc600 add ip, pc, #0, 12 - 9124: e28cca07 add ip, ip, #28672 ; 0x7000 - 9128: e5bcff2c ldr pc, \[ip, #3884\]! ; 0xf2c + 9124: e28cca07 add ip, ip, #28672 @ 0x7000 + 9128: e5bcff2c ldr pc, \[ip, #3884\]! @ 0xf2c #------------------------------------------------------------------------------ #------ thumb entry to tbf4's .iplt entry #------------------------------------------------------------------------------ @@ -211,8 +211,8 @@ Disassembly of section \.iplt: #------ tbf4's .iplt entry #------------------------------------------------------------------------------ 9130: e28fc600 add ip, pc, #0, 12 - 9134: e28cca07 add ip, ip, #28672 ; 0x7000 - 9138: e5bcff20 ldr pc, \[ip, #3872\]! ; 0xf20 + 9134: e28cca07 add ip, ip, #28672 @ 0x7000 + 9138: e5bcff20 ldr pc, \[ip, #3872\]! @ 0xf20 #------------------------------------------------------------------------------ #------ thumb entry to ttf4's .iplt entry #------------------------------------------------------------------------------ @@ -222,14 +222,14 @@ Disassembly of section \.iplt: #------ ttf4's .iplt entry #------------------------------------------------------------------------------ 9140: e28fc600 add ip, pc, #0, 12 - 9144: e28cca07 add ip, ip, #28672 ; 0x7000 - 9148: e5bcff14 ldr pc, \[ip, #3860\]! ; 0xf14 + 9144: e28cca07 add ip, ip, #28672 @ 0x7000 + 9148: e5bcff14 ldr pc, \[ip, #3860\]! @ 0xf14 #------------------------------------------------------------------------------ #------ aaf3's .iplt entry #------------------------------------------------------------------------------ 914c: e28fc600 add ip, pc, #0, 12 - 9150: e28cca07 add ip, ip, #28672 ; 0x7000 - 9154: e5bcff0c ldr pc, \[ip, #3852\]! ; 0xf0c + 9150: e28cca07 add ip, ip, #28672 @ 0x7000 + 9154: e5bcff0c ldr pc, \[ip, #3852\]! @ 0xf0c #------------------------------------------------------------------------------ #------ thumb entry to atf4's .iplt entry #------------------------------------------------------------------------------ @@ -239,14 +239,14 @@ Disassembly of section \.iplt: #------ atf4's .iplt entry #------------------------------------------------------------------------------ 915c: e28fc600 add ip, pc, #0, 12 - 9160: e28cca07 add ip, ip, #28672 ; 0x7000 - 9164: e5bcff00 ldr pc, \[ip, #3840\]! ; 0xf00 + 9160: e28cca07 add ip, ip, #28672 @ 0x7000 + 9164: e5bcff00 ldr pc, \[ip, #3840\]! @ 0xf00 #------------------------------------------------------------------------------ #------ taf4's .iplt entry #------------------------------------------------------------------------------ 9168: e28fc600 add ip, pc, #0, 12 - 916c: e28cca07 add ip, ip, #28672 ; 0x7000 - 9170: e5bcfef8 ldr pc, \[ip, #3832\]! ; 0xef8 + 916c: e28cca07 add ip, ip, #28672 @ 0x7000 + 9170: e5bcfef8 ldr pc, \[ip, #3832\]! @ 0xef8 Disassembly of section \.text: @@ -330,8 +330,8 @@ Disassembly of section \.text: a050: eb0017ea bl 10000 <foo> a054: ea0017e9 b 10000 <foo> a058: 0a0017e8 beq 10000 <foo> - a05c: e59f4000 ldr r4, \[pc\] ; a064 <arm\+0x14> - a060: e59f4000 ldr r4, \[pc\] ; a068 <arm\+0x18> + a05c: e59f4000 ldr r4, \[pc\] @ a064 <arm\+0x14> + a060: e59f4000 ldr r4, \[pc\] @ a068 <arm\+0x18> #------------------------------------------------------------------------------ #------ .got offset for foo #------------------------------------------------------------------------------ @@ -352,8 +352,8 @@ Disassembly of section \.text: #------ aaf1's .iplt entry #------------------------------------------------------------------------------ a074: 0afffbfc beq 906c <abf2@plt\+0x10> - a078: e59f4000 ldr r4, \[pc\] ; a080 <arm\+0x30> - a07c: e59f4000 ldr r4, \[pc\] ; a084 <arm\+0x34> + a078: e59f4000 ldr r4, \[pc\] @ a080 <arm\+0x30> + a07c: e59f4000 ldr r4, \[pc\] @ a084 <arm\+0x34> #------------------------------------------------------------------------------ #------ GP-relative offset of aaf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -374,8 +374,8 @@ Disassembly of section \.text: #------ taf1's .iplt entry #------------------------------------------------------------------------------ a090: 0afffc00 beq 9098 <abf2@plt\+0x3c> - a094: e59f4000 ldr r4, \[pc\] ; a09c <arm\+0x4c> - a098: e59f4000 ldr r4, \[pc\] ; a0a0 <arm\+0x50> + a094: e59f4000 ldr r4, \[pc\] @ a09c <arm\+0x4c> + a098: e59f4000 ldr r4, \[pc\] @ a0a0 <arm\+0x50> #------------------------------------------------------------------------------ #------ GP-relative offset of taf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -396,8 +396,8 @@ Disassembly of section \.text: #------ abf1's .iplt entry #------------------------------------------------------------------------------ a0ac: 0afffbf6 beq 908c <abf2@plt\+0x30> - a0b0: e59f4000 ldr r4, \[pc\] ; a0b8 <arm\+0x68> - a0b4: e59f4000 ldr r4, \[pc\] ; a0bc <arm\+0x6c> + a0b0: e59f4000 ldr r4, \[pc\] @ a0b8 <arm\+0x68> + a0b4: e59f4000 ldr r4, \[pc\] @ a0bc <arm\+0x6c> #------------------------------------------------------------------------------ #------ GP-relative offset of abf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -418,8 +418,8 @@ Disassembly of section \.text: #------ tbf1's .iplt entry #------------------------------------------------------------------------------ a0c8: 0afffbfa beq 90b8 <abf2@plt\+0x5c> - a0cc: e59f4000 ldr r4, \[pc\] ; a0d4 <arm\+0x84> - a0d0: e59f4000 ldr r4, \[pc\] ; a0d8 <arm\+0x88> + a0cc: e59f4000 ldr r4, \[pc\] @ a0d4 <arm\+0x84> + a0d0: e59f4000 ldr r4, \[pc\] @ a0d8 <arm\+0x88> #------------------------------------------------------------------------------ #------ GP-relative offset of tbf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -440,8 +440,8 @@ Disassembly of section \.text: #------ aaf2's .plt entry #------------------------------------------------------------------------------ a0e4: 0afffbd9 beq 9050 <aaf2@plt> - a0e8: e59f4000 ldr r4, \[pc\] ; a0f0 <arm\+0xa0> - a0ec: e59f4000 ldr r4, \[pc\] ; a0f4 <arm\+0xa4> + a0e8: e59f4000 ldr r4, \[pc\] @ a0f0 <arm\+0xa0> + a0ec: e59f4000 ldr r4, \[pc\] @ a0f4 <arm\+0xa4> #------------------------------------------------------------------------------ #------ .got offset for aaf2 #------------------------------------------------------------------------------ @@ -462,8 +462,8 @@ Disassembly of section \.text: #------ taf2's .plt entry #------------------------------------------------------------------------------ a100: 0afffbcf beq 9044 <taf2@plt> - a104: e59f4000 ldr r4, \[pc\] ; a10c <arm\+0xbc> - a108: e59f4000 ldr r4, \[pc\] ; a110 <arm\+0xc0> + a104: e59f4000 ldr r4, \[pc\] @ a10c <arm\+0xbc> + a108: e59f4000 ldr r4, \[pc\] @ a110 <arm\+0xc0> #------------------------------------------------------------------------------ #------ .got offset for taf2 #------------------------------------------------------------------------------ @@ -484,8 +484,8 @@ Disassembly of section \.text: #------ abf2's .plt entry #------------------------------------------------------------------------------ a11c: 0afffbcf beq 9060 <abf2@plt\+0x4> - a120: e59f4000 ldr r4, \[pc\] ; a128 <arm\+0xd8> - a124: e59f4000 ldr r4, \[pc\] ; a12c <arm\+0xdc> + a120: e59f4000 ldr r4, \[pc\] @ a128 <arm\+0xd8> + a124: e59f4000 ldr r4, \[pc\] @ a12c <arm\+0xdc> #------------------------------------------------------------------------------ #------ .got offset for abf2 #------------------------------------------------------------------------------ @@ -506,8 +506,8 @@ Disassembly of section \.text: #------ tbf2's .plt entry #------------------------------------------------------------------------------ a138: 0afffbbe beq 9038 <tbf2@plt\+0x4> - a13c: e59f4000 ldr r4, \[pc\] ; a144 <arm\+0xf4> - a140: e59f4000 ldr r4, \[pc\] ; a148 <arm\+0xf8> + a13c: e59f4000 ldr r4, \[pc\] @ a144 <arm\+0xf4> + a140: e59f4000 ldr r4, \[pc\] @ a148 <arm\+0xf8> #------------------------------------------------------------------------------ #------ .got offset for tbf2 #------------------------------------------------------------------------------ @@ -528,8 +528,8 @@ Disassembly of section \.text: #------ aaf3's .iplt entry #------------------------------------------------------------------------------ a154: 0afffbfc beq 914c <abf2@plt\+0xf0> - a158: e59f4000 ldr r4, \[pc\] ; a160 <arm\+0x110> - a15c: e59f4000 ldr r4, \[pc\] ; a164 <arm\+0x114> + a158: e59f4000 ldr r4, \[pc\] @ a160 <arm\+0x110> + a15c: e59f4000 ldr r4, \[pc\] @ a164 <arm\+0x114> #------------------------------------------------------------------------------ #------ GP-relative offset of aaf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -550,8 +550,8 @@ Disassembly of section \.text: #------ taf3's .iplt entry #------------------------------------------------------------------------------ a170: 0afffbe6 beq 9110 <abf2@plt\+0xb4> - a174: e59f4000 ldr r4, \[pc\] ; a17c <arm\+0x12c> - a178: e59f4000 ldr r4, \[pc\] ; a180 <arm\+0x130> + a174: e59f4000 ldr r4, \[pc\] @ a17c <arm\+0x12c> + a178: e59f4000 ldr r4, \[pc\] @ a180 <arm\+0x130> #------------------------------------------------------------------------------ #------ GP-relative offset of taf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -572,8 +572,8 @@ Disassembly of section \.text: #------ abf3's .iplt entry #------------------------------------------------------------------------------ a18c: 0afffbd4 beq 90e4 <abf2@plt\+0x88> - a190: e59f4000 ldr r4, \[pc\] ; a198 <arm\+0x148> - a194: e59f4000 ldr r4, \[pc\] ; a19c <arm\+0x14c> + a190: e59f4000 ldr r4, \[pc\] @ a198 <arm\+0x148> + a194: e59f4000 ldr r4, \[pc\] @ a19c <arm\+0x14c> #------------------------------------------------------------------------------ #------ GP-relative offset of abf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -594,8 +594,8 @@ Disassembly of section \.text: #------ tbf3's .iplt entry #------------------------------------------------------------------------------ a1a8: 0afffbd5 beq 9104 <abf2@plt\+0xa8> - a1ac: e59f4000 ldr r4, \[pc\] ; a1b4 <arm\+0x164> - a1b0: e59f4000 ldr r4, \[pc\] ; a1b8 <arm\+0x168> + a1ac: e59f4000 ldr r4, \[pc\] @ a1b4 <arm\+0x164> + a1b0: e59f4000 ldr r4, \[pc\] @ a1b8 <arm\+0x168> #------------------------------------------------------------------------------ #------ GP-relative offset of tbf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -616,8 +616,8 @@ Disassembly of section \.text: #------ aaf4's .iplt entry #------------------------------------------------------------------------------ a1c4: 0afffbbe beq 90c4 <abf2@plt\+0x68> - a1c8: e59f4000 ldr r4, \[pc\] ; a1d0 <arm\+0x180> - a1cc: e59f4000 ldr r4, \[pc\] ; a1d4 <arm\+0x184> + a1c8: e59f4000 ldr r4, \[pc\] @ a1d0 <arm\+0x180> + a1cc: e59f4000 ldr r4, \[pc\] @ a1d4 <arm\+0x184> #------------------------------------------------------------------------------ #------ .got offset for aaf4 #------------------------------------------------------------------------------ @@ -638,8 +638,8 @@ Disassembly of section \.text: #------ taf4's .iplt entry #------------------------------------------------------------------------------ a1e0: 0afffbe0 beq 9168 <abf2@plt\+0x10c> - a1e4: e59f4000 ldr r4, \[pc\] ; a1ec <arm\+0x19c> - a1e8: e59f4000 ldr r4, \[pc\] ; a1f0 <arm\+0x1a0> + a1e4: e59f4000 ldr r4, \[pc\] @ a1ec <arm\+0x19c> + a1e8: e59f4000 ldr r4, \[pc\] @ a1f0 <arm\+0x1a0> #------------------------------------------------------------------------------ #------ .got offset for taf4 #------------------------------------------------------------------------------ @@ -660,8 +660,8 @@ Disassembly of section \.text: #------ abf4's .iplt entry #------------------------------------------------------------------------------ a1fc: 0afffbc7 beq 9120 <abf2@plt\+0xc4> - a200: e59f4000 ldr r4, \[pc\] ; a208 <arm\+0x1b8> - a204: e59f4000 ldr r4, \[pc\] ; a20c <arm\+0x1bc> + a200: e59f4000 ldr r4, \[pc\] @ a208 <arm\+0x1b8> + a204: e59f4000 ldr r4, \[pc\] @ a20c <arm\+0x1bc> #------------------------------------------------------------------------------ #------ .got offset for abf4 #------------------------------------------------------------------------------ @@ -682,8 +682,8 @@ Disassembly of section \.text: #------ tbf4's .iplt entry #------------------------------------------------------------------------------ a218: 0afffbc4 beq 9130 <abf2@plt\+0xd4> - a21c: e59f4000 ldr r4, \[pc\] ; a224 <arm\+0x1d4> - a220: e59f4000 ldr r4, \[pc\] ; a228 <arm\+0x1d8> + a21c: e59f4000 ldr r4, \[pc\] @ a224 <arm\+0x1d4> + a220: e59f4000 ldr r4, \[pc\] @ a228 <arm\+0x1d8> #------------------------------------------------------------------------------ #------ .got offset for tbf4 #------------------------------------------------------------------------------ @@ -697,8 +697,8 @@ Disassembly of section \.text: a22c: f005 fee8 bl 10000 <foo> a230: f005 bee6 b\.w 10000 <foo> a234: f005 86e4 beq\.w 10000 <foo> - a238: 4c00 ldr r4, \[pc, #0\] ; \(a23c <_thumb\+0x10>\) - a23a: 4c01 ldr r4, \[pc, #4\] ; \(a240 <_thumb\+0x14>\) + a238: 4c00 ldr r4, \[pc, #0\] @ \(a23c <_thumb\+0x10>\) + a23a: 4c01 ldr r4, \[pc, #4\] @ \(a240 <_thumb\+0x14>\) #------------------------------------------------------------------------------ #------ .got offset for foo #------------------------------------------------------------------------------ @@ -719,8 +719,8 @@ Disassembly of section \.text: #------ thumb entry to atf1's .iplt entry #------------------------------------------------------------------------------ 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>\) + a250: 4c00 ldr r4, \[pc, #0\] @ \(a254 <_thumb\+0x28>\) + a252: 4c01 ldr r4, \[pc, #4\] @ \(a258 <_thumb\+0x2c>\) #------------------------------------------------------------------------------ #------ GP-relative offset of atf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -741,8 +741,8 @@ Disassembly of section \.text: #------ thumb entry to ttf1's .iplt entry #------------------------------------------------------------------------------ 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>\) + a268: 4c00 ldr r4, \[pc, #0\] @ \(a26c <_thumb\+0x40>\) + a26a: 4c01 ldr r4, \[pc, #4\] @ \(a270 <_thumb\+0x44>\) #------------------------------------------------------------------------------ #------ GP-relative offset of ttf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -763,8 +763,8 @@ Disassembly of section \.text: #------ thumb entry to abf1's .iplt entry #------------------------------------------------------------------------------ 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>\) + a280: 4c00 ldr r4, \[pc, #0\] @ \(a284 <_thumb\+0x58>\) + a282: 4c01 ldr r4, \[pc, #4\] @ \(a288 <_thumb\+0x5c>\) #------------------------------------------------------------------------------ #------ GP-relative offset of abf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -785,8 +785,8 @@ Disassembly of section \.text: #------ thumb entry to tbf1's .iplt entry #------------------------------------------------------------------------------ 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>\) + a298: 4c00 ldr r4, \[pc, #0\] @ \(a29c <_thumb\+0x70>\) + a29a: 4c01 ldr r4, \[pc, #4\] @ \(a2a0 <_thumb\+0x74>\) #------------------------------------------------------------------------------ #------ GP-relative offset of tbf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -807,8 +807,8 @@ Disassembly of section \.text: #------ thumb entry to atf2's .plt entry #------------------------------------------------------------------------------ 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>\) + a2b0: 4c00 ldr r4, \[pc, #0\] @ \(a2b4 <_thumb\+0x88>\) + a2b2: 4c01 ldr r4, \[pc, #4\] @ \(a2b8 <_thumb\+0x8c>\) #------------------------------------------------------------------------------ #------ .got offset for atf2 #------------------------------------------------------------------------------ @@ -829,8 +829,8 @@ Disassembly of section \.text: #------ thumb entry to ttf2's .plt entry #------------------------------------------------------------------------------ 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>\) + a2c8: 4c00 ldr r4, \[pc, #0\] @ \(a2cc <_thumb\+0xa0>\) + a2ca: 4c01 ldr r4, \[pc, #4\] @ \(a2d0 <_thumb\+0xa4>\) #------------------------------------------------------------------------------ #------ .got offset for ttf2 #------------------------------------------------------------------------------ @@ -851,8 +851,8 @@ Disassembly of section \.text: #------ thumb entry to abf2's .plt entry #------------------------------------------------------------------------------ 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>\) + a2e0: 4c00 ldr r4, \[pc, #0\] @ \(a2e4 <_thumb\+0xb8>\) + a2e2: 4c01 ldr r4, \[pc, #4\] @ \(a2e8 <_thumb\+0xbc>\) #------------------------------------------------------------------------------ #------ .got offset for abf2 #------------------------------------------------------------------------------ @@ -873,8 +873,8 @@ Disassembly of section \.text: #------ thumb entry to tbf2's .plt entry #------------------------------------------------------------------------------ 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>\) + a2f8: 4c00 ldr r4, \[pc, #0\] @ \(a2fc <_thumb\+0xd0>\) + a2fa: 4c01 ldr r4, \[pc, #4\] @ \(a300 <_thumb\+0xd4>\) #------------------------------------------------------------------------------ #------ .got offset for tbf2 #------------------------------------------------------------------------------ @@ -895,8 +895,8 @@ Disassembly of section \.text: #------ thumb entry to atf3's .iplt entry #------------------------------------------------------------------------------ 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>\) + a310: 4c00 ldr r4, \[pc, #0\] @ \(a314 <_thumb\+0xe8>\) + a312: 4c01 ldr r4, \[pc, #4\] @ \(a318 <_thumb\+0xec>\) #------------------------------------------------------------------------------ #------ GP-relative offset of atf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -917,8 +917,8 @@ Disassembly of section \.text: #------ thumb entry to ttf3's .iplt entry #------------------------------------------------------------------------------ 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>\) + a328: 4c00 ldr r4, \[pc, #0\] @ \(a32c <_thumb\+0x100>\) + a32a: 4c01 ldr r4, \[pc, #4\] @ \(a330 <_thumb\+0x104>\) #------------------------------------------------------------------------------ #------ GP-relative offset of ttf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -939,8 +939,8 @@ Disassembly of section \.text: #------ thumb entry to abf3's .iplt entry #------------------------------------------------------------------------------ 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>\) + a340: 4c00 ldr r4, \[pc, #0\] @ \(a344 <_thumb\+0x118>\) + a342: 4c01 ldr r4, \[pc, #4\] @ \(a348 <_thumb\+0x11c>\) #------------------------------------------------------------------------------ #------ GP-relative offset of abf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -961,8 +961,8 @@ Disassembly of section \.text: #------ thumb entry to tbf3's .iplt entry #------------------------------------------------------------------------------ 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>\) + a358: 4c00 ldr r4, \[pc, #0\] @ \(a35c <_thumb\+0x130>\) + a35a: 4c01 ldr r4, \[pc, #4\] @ \(a360 <_thumb\+0x134>\) #------------------------------------------------------------------------------ #------ GP-relative offset of tbf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -983,8 +983,8 @@ Disassembly of section \.text: #------ thumb entry to atf4's .iplt entry #------------------------------------------------------------------------------ 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>\) + a370: 4c00 ldr r4, \[pc, #0\] @ \(a374 <_thumb\+0x148>\) + a372: 4c01 ldr r4, \[pc, #4\] @ \(a378 <_thumb\+0x14c>\) #------------------------------------------------------------------------------ #------ .got offset for atf4 #------------------------------------------------------------------------------ @@ -1005,8 +1005,8 @@ Disassembly of section \.text: #------ thumb entry to ttf4's .iplt entry #------------------------------------------------------------------------------ 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>\) + a388: 4c00 ldr r4, \[pc, #0\] @ \(a38c <_thumb\+0x160>\) + a38a: 4c01 ldr r4, \[pc, #4\] @ \(a390 <_thumb\+0x164>\) #------------------------------------------------------------------------------ #------ .got offset for ttf4 #------------------------------------------------------------------------------ @@ -1027,8 +1027,8 @@ Disassembly of section \.text: #------ thumb entry to abf4's .iplt entry #------------------------------------------------------------------------------ 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>\) + a3a0: 4c00 ldr r4, \[pc, #0\] @ \(a3a4 <_thumb\+0x178>\) + a3a2: 4c01 ldr r4, \[pc, #4\] @ \(a3a8 <_thumb\+0x17c>\) #------------------------------------------------------------------------------ #------ .got offset for abf4 #------------------------------------------------------------------------------ @@ -1049,8 +1049,8 @@ Disassembly of section \.text: #------ thumb entry to tbf4's .iplt entry #------------------------------------------------------------------------------ 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>\) + a3b8: 4c00 ldr r4, \[pc, #0\] @ \(a3bc <_thumb\+0x190>\) + a3ba: 4c01 ldr r4, \[pc, #4\] @ \(a3c0 <_thumb\+0x194>\) #------------------------------------------------------------------------------ #------ .got offset for tbf4 #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-5.dd b/ld/testsuite/ld-arm/ifunc-5.dd index b0bf597..566cd55 100644 --- a/ld/testsuite/ld-arm/ifunc-5.dd +++ b/ld/testsuite/ld-arm/ifunc-5.dd @@ -9,20 +9,20 @@ Disassembly of section \.iplt: #------ f1's .iplt entry #------------------------------------------------------------------------------ 9000: e28fc600 add ip, pc, #0, 12 - 9004: e28cca08 add ip, ip, #8, 20 ; 0x8000 + 9004: e28cca08 add ip, ip, #8, 20 @ 0x8000 9008: e5bcf004 ldr pc, \[ip, #4\]! #------------------------------------------------------------------------------ #------ f3's .iplt entry #------------------------------------------------------------------------------ 900c: e28fc600 add ip, pc, #0, 12 - 9010: e28cca07 add ip, ip, #28672 ; 0x7000 - 9014: e5bcfffc ldr pc, \[ip, #4092\]! ; 0xffc + 9010: e28cca07 add ip, ip, #28672 @ 0x7000 + 9014: e5bcfffc ldr pc, \[ip, #4092\]! @ 0xffc #------------------------------------------------------------------------------ #------ f2's .iplt entry #------------------------------------------------------------------------------ 9018: e28fc600 add ip, pc, #0, 12 - 901c: e28cca07 add ip, ip, #28672 ; 0x7000 - 9020: e5bcfff4 ldr pc, \[ip, #4084\]! ; 0xff4 + 901c: e28cca07 add ip, ip, #28672 @ 0x7000 + 9020: e5bcfff4 ldr pc, \[ip, #4084\]! @ 0xff4 Disassembly of section \.text: @@ -37,8 +37,8 @@ Disassembly of section \.text: 0000a00c <_start>: a00c: eb0017fb bl 10000 <foo> - a010: e59f4000 ldr r4, \[pc\] ; a018 <_start\+0xc> - a014: e59f4000 ldr r4, \[pc\] ; a01c <_start\+0x10> + a010: e59f4000 ldr r4, \[pc\] @ a018 <_start\+0xc> + a014: e59f4000 ldr r4, \[pc\] @ a01c <_start\+0x10> #------------------------------------------------------------------------------ #------ .got offset for foo #------------------------------------------------------------------------------ @@ -51,8 +51,8 @@ Disassembly of section \.text: #------ f1's .iplt entry #------------------------------------------------------------------------------ a020: ebfffbf6 bl 9000 <__irel_end\+0xfe8> - a024: e59f4000 ldr r4, \[pc\] ; a02c <_start\+0x20> - a028: e59f4000 ldr r4, \[pc\] ; a030 <_start\+0x24> + a024: e59f4000 ldr r4, \[pc\] @ a02c <_start\+0x20> + a028: e59f4000 ldr r4, \[pc\] @ a030 <_start\+0x24> #------------------------------------------------------------------------------ #------ GP-relative offset of f1's .igot.plt entry #------------------------------------------------------------------------------ @@ -65,8 +65,8 @@ Disassembly of section \.text: #------ f2's .iplt entry #------------------------------------------------------------------------------ a034: ebfffbf7 bl 9018 <__irel_end\+0x1000> - a038: e59f4000 ldr r4, \[pc\] ; a040 <_start\+0x34> - a03c: e59f4000 ldr r4, \[pc\] ; a044 <_start\+0x38> + a038: e59f4000 ldr r4, \[pc\] @ a040 <_start\+0x34> + a03c: e59f4000 ldr r4, \[pc\] @ a044 <_start\+0x38> #------------------------------------------------------------------------------ #------ GP-relative offset of f2's .igot.plt entry #------------------------------------------------------------------------------ @@ -79,8 +79,8 @@ Disassembly of section \.text: #------ f3's .iplt entry #------------------------------------------------------------------------------ a048: ebfffbef bl 900c <__irel_end\+0xff4> - a04c: e59f4000 ldr r4, \[pc\] ; a054 <_start\+0x48> - a050: e59f4000 ldr r4, \[pc\] ; a058 <_start\+0x4c> + a04c: e59f4000 ldr r4, \[pc\] @ a054 <_start\+0x48> + a050: e59f4000 ldr r4, \[pc\] @ a058 <_start\+0x4c> #------------------------------------------------------------------------------ #------ GP-relative offset of f3's .igot.plt entry #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-6.dd b/ld/testsuite/ld-arm/ifunc-6.dd index c060cb2..44542d2 100644 --- a/ld/testsuite/ld-arm/ifunc-6.dd +++ b/ld/testsuite/ld-arm/ifunc-6.dd @@ -14,14 +14,14 @@ Disassembly of section \.iplt: #------ f3's .iplt entry #------------------------------------------------------------------------------ 9004: e28fc600 add ip, pc, #0, 12 - 9008: e28cca08 add ip, ip, #8, 20 ; 0x8000 + 9008: e28cca08 add ip, ip, #8, 20 @ 0x8000 900c: e5bcf000 ldr pc, \[ip, #0\]! #------------------------------------------------------------------------------ #------ f2's .iplt entry #------------------------------------------------------------------------------ 9010: e28fc600 add ip, pc, #0, 12 - 9014: e28cca07 add ip, ip, #28672 ; 0x7000 - 9018: e5bcfff8 ldr pc, \[ip, #4088\]! ; 0xff8 + 9014: e28cca07 add ip, ip, #28672 @ 0x7000 + 9018: e5bcfff8 ldr pc, \[ip, #4088\]! @ 0xff8 #------------------------------------------------------------------------------ #------ thumb entry to f4's .iplt entry #------------------------------------------------------------------------------ @@ -31,14 +31,14 @@ Disassembly of section \.iplt: #------ f4's .iplt entry #------------------------------------------------------------------------------ 9020: e28fc600 add ip, pc, #0, 12 - 9024: e28cca07 add ip, ip, #28672 ; 0x7000 - 9028: e5bcffec ldr pc, \[ip, #4076\]! ; 0xfec + 9024: e28cca07 add ip, ip, #28672 @ 0x7000 + 9028: e5bcffec ldr pc, \[ip, #4076\]! @ 0xfec #------------------------------------------------------------------------------ #------ f1's .iplt entry #------------------------------------------------------------------------------ 902c: e28fc600 add ip, pc, #0, 12 - 9030: e28cca07 add ip, ip, #28672 ; 0x7000 - 9034: e5bcffe4 ldr pc, \[ip, #4068\]! ; 0xfe4 + 9030: e28cca07 add ip, ip, #28672 @ 0x7000 + 9034: e5bcffe4 ldr pc, \[ip, #4068\]! @ 0xfe4 Disassembly of section \.text: @@ -60,8 +60,8 @@ Disassembly of section \.text: a010: eb0017fa bl 10000 <foo> a014: ea0017f9 b 10000 <foo> a018: 0a0017f8 beq 10000 <foo> - a01c: e59f4000 ldr r4, \[pc\] ; a024 <_start\+0x14> - a020: e59f4000 ldr r4, \[pc\] ; a028 <_start\+0x18> + a01c: e59f4000 ldr r4, \[pc\] @ a024 <_start\+0x14> + a020: e59f4000 ldr r4, \[pc\] @ a028 <_start\+0x18> #------------------------------------------------------------------------------ #------ .got offset for foo #------------------------------------------------------------------------------ @@ -82,8 +82,8 @@ Disassembly of section \.text: #------ f1's .iplt entry #------------------------------------------------------------------------------ a034: 0afffbfc beq 902c <__irel_end\+0x100c> - a038: e59f4000 ldr r4, \[pc\] ; a040 <_start\+0x30> - a03c: e59f4000 ldr r4, \[pc\] ; a044 <_start\+0x34> + a038: e59f4000 ldr r4, \[pc\] @ a040 <_start\+0x30> + a03c: e59f4000 ldr r4, \[pc\] @ a044 <_start\+0x34> #------------------------------------------------------------------------------ #------ GP-relative offset of f1's .igot.plt entry #------------------------------------------------------------------------------ @@ -104,8 +104,8 @@ Disassembly of section \.text: #------ f2's .iplt entry #------------------------------------------------------------------------------ a050: 0afffbee beq 9010 <__irel_end\+0xff0> - a054: e59f4000 ldr r4, \[pc\] ; a05c <_start\+0x4c> - a058: e59f4000 ldr r4, \[pc\] ; a060 <_start\+0x50> + a054: e59f4000 ldr r4, \[pc\] @ a05c <_start\+0x4c> + a058: e59f4000 ldr r4, \[pc\] @ a060 <_start\+0x50> #------------------------------------------------------------------------------ #------ GP-relative offset of f2's .igot.plt entry #------------------------------------------------------------------------------ @@ -119,8 +119,8 @@ Disassembly of section \.text: a064: f005 ffcc bl 10000 <foo> a068: f005 bfca b\.w 10000 <foo> a06c: f005 87c8 beq\.w 10000 <foo> - a070: 4c00 ldr r4, \[pc, #0\] ; \(a074 <_thumb\+0x10>\) - a072: 4c01 ldr r4, \[pc, #4\] ; \(a078 <_thumb\+0x14>\) + a070: 4c00 ldr r4, \[pc, #0\] @ \(a074 <_thumb\+0x10>\) + a072: 4c01 ldr r4, \[pc, #4\] @ \(a078 <_thumb\+0x14>\) #------------------------------------------------------------------------------ #------ .got offset for foo #------------------------------------------------------------------------------ @@ -141,8 +141,8 @@ Disassembly of section \.text: #------ thumb entry to f3's .iplt entry #------------------------------------------------------------------------------ a084: f43e afbc beq\.w 9000 <__irel_end\+0xfe0> - a088: 4c00 ldr r4, \[pc, #0\] ; \(a08c <_thumb\+0x28>\) - a08a: 4c01 ldr r4, \[pc, #4\] ; \(a090 <_thumb\+0x2c>\) + a088: 4c00 ldr r4, \[pc, #0\] @ \(a08c <_thumb\+0x28>\) + a08a: 4c01 ldr r4, \[pc, #4\] @ \(a090 <_thumb\+0x2c>\) #------------------------------------------------------------------------------ #------ GP-relative offset of f3's .igot.plt entry #------------------------------------------------------------------------------ @@ -163,8 +163,8 @@ Disassembly of section \.text: #------ thumb entry to f4's .iplt entry #------------------------------------------------------------------------------ a09c: f43e afbe beq\.w 901c <__irel_end\+0xffc> - a0a0: 4c00 ldr r4, \[pc, #0\] ; \(a0a4 <_thumb\+0x40>\) - a0a2: 4c01 ldr r4, \[pc, #4\] ; \(a0a8 <_thumb\+0x44>\) + a0a0: 4c00 ldr r4, \[pc, #0\] @ \(a0a4 <_thumb\+0x40>\) + a0a2: 4c01 ldr r4, \[pc, #4\] @ \(a0a8 <_thumb\+0x44>\) #------------------------------------------------------------------------------ #------ GP-relative offset of f4's .igot.plt entry #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-7.dd b/ld/testsuite/ld-arm/ifunc-7.dd index c2c5e9c..c2db058 100644 --- a/ld/testsuite/ld-arm/ifunc-7.dd +++ b/ld/testsuite/ld-arm/ifunc-7.dd @@ -9,14 +9,14 @@ Disassembly of section \.iplt: #------ f1's .iplt entry #------------------------------------------------------------------------------ 9000: e28fc600 add ip, pc, #0, 12 - 9004: e28cca08 add ip, ip, #8, 20 ; 0x8000 + 9004: e28cca08 add ip, ip, #8, 20 @ 0x8000 9008: e5bcf004 ldr pc, \[ip, #4\]! #------------------------------------------------------------------------------ #------ f3's .iplt entry #------------------------------------------------------------------------------ 900c: e28fc600 add ip, pc, #0, 12 - 9010: e28cca07 add ip, ip, #28672 ; 0x7000 - 9014: e5bcfffc ldr pc, \[ip, #4092\]! ; 0xffc + 9010: e28cca07 add ip, ip, #28672 @ 0x7000 + 9014: e5bcfffc ldr pc, \[ip, #4092\]! @ 0xffc Disassembly of section \.text: @@ -28,8 +28,8 @@ Disassembly of section \.text: 0000a008 <arm>: a008: eb0017fc bl 10000 <foo> - a00c: e59f4000 ldr r4, \[pc\] ; a014 <arm\+0xc> - a010: e59f4000 ldr r4, \[pc\] ; a018 <arm\+0x10> + a00c: e59f4000 ldr r4, \[pc\] @ a014 <arm\+0xc> + a010: e59f4000 ldr r4, \[pc\] @ a018 <arm\+0x10> #------------------------------------------------------------------------------ #------ .got offset for foo #------------------------------------------------------------------------------ @@ -42,8 +42,8 @@ Disassembly of section \.text: #------ f1's .iplt entry #------------------------------------------------------------------------------ a01c: ebfffbf7 bl 9000 <f1-0x1000> - a020: e59f4000 ldr r4, \[pc\] ; a028 <arm\+0x20> - a024: e59f4000 ldr r4, \[pc\] ; a02c <arm\+0x24> + a020: e59f4000 ldr r4, \[pc\] @ a028 <arm\+0x20> + a024: e59f4000 ldr r4, \[pc\] @ a02c <arm\+0x24> #------------------------------------------------------------------------------ #------ GP-relative offset of f1's .igot.plt entry #------------------------------------------------------------------------------ @@ -56,8 +56,8 @@ Disassembly of section \.text: #------ f3's .iplt entry #------------------------------------------------------------------------------ a030: ebfffbf5 bl 900c <f1-0xff4> - a034: e59f4000 ldr r4, \[pc\] ; a03c <arm\+0x34> - a038: e59f4000 ldr r4, \[pc\] ; a040 <arm\+0x38> + a034: e59f4000 ldr r4, \[pc\] @ a03c <arm\+0x34> + a038: e59f4000 ldr r4, \[pc\] @ a040 <arm\+0x38> #------------------------------------------------------------------------------ #------ GP-relative offset of f3's .igot.plt entry #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-8.dd b/ld/testsuite/ld-arm/ifunc-8.dd index 8216eb1..e6c9b9a 100644 --- a/ld/testsuite/ld-arm/ifunc-8.dd +++ b/ld/testsuite/ld-arm/ifunc-8.dd @@ -9,7 +9,7 @@ Disassembly of section \.iplt: #------ aaf1's .iplt entry #------------------------------------------------------------------------------ 9000: e28fc600 add ip, pc, #0, 12 - 9004: e28cca08 add ip, ip, #8, 20 ; 0x8000 + 9004: e28cca08 add ip, ip, #8, 20 @ 0x8000 9008: e5bcf004 ldr pc, \[ip, #4\]! #------------------------------------------------------------------------------ #------ thumb entry to atf1's .iplt entry @@ -20,8 +20,8 @@ Disassembly of section \.iplt: #------ atf1's .iplt entry #------------------------------------------------------------------------------ 9010: e28fc600 add ip, pc, #0, 12 - 9014: e28cca07 add ip, ip, #28672 ; 0x7000 - 9018: e5bcfff8 ldr pc, \[ip, #4088\]! ; 0xff8 + 9014: e28cca07 add ip, ip, #28672 @ 0x7000 + 9018: e5bcfff8 ldr pc, \[ip, #4088\]! @ 0xff8 #------------------------------------------------------------------------------ #------ thumb entry to abf1's .iplt entry #------------------------------------------------------------------------------ @@ -31,14 +31,14 @@ Disassembly of section \.iplt: #------ abf1's .iplt entry #------------------------------------------------------------------------------ 9020: e28fc600 add ip, pc, #0, 12 - 9024: e28cca07 add ip, ip, #28672 ; 0x7000 - 9028: e5bcffec ldr pc, \[ip, #4076\]! ; 0xfec + 9024: e28cca07 add ip, ip, #28672 @ 0x7000 + 9028: e5bcffec ldr pc, \[ip, #4076\]! @ 0xfec #------------------------------------------------------------------------------ #------ taf1's .iplt entry #------------------------------------------------------------------------------ 902c: e28fc600 add ip, pc, #0, 12 - 9030: e28cca07 add ip, ip, #28672 ; 0x7000 - 9034: e5bcffe4 ldr pc, \[ip, #4068\]! ; 0xfe4 + 9030: e28cca07 add ip, ip, #28672 @ 0x7000 + 9034: e5bcffe4 ldr pc, \[ip, #4068\]! @ 0xfe4 #------------------------------------------------------------------------------ #------ thumb entry to ttf1's .iplt entry #------------------------------------------------------------------------------ @@ -48,8 +48,8 @@ Disassembly of section \.iplt: #------ ttf1's .iplt entry #------------------------------------------------------------------------------ 903c: e28fc600 add ip, pc, #0, 12 - 9040: e28cca07 add ip, ip, #28672 ; 0x7000 - 9044: e5bcffd8 ldr pc, \[ip, #4056\]! ; 0xfd8 + 9040: e28cca07 add ip, ip, #28672 @ 0x7000 + 9044: e5bcffd8 ldr pc, \[ip, #4056\]! @ 0xfd8 #------------------------------------------------------------------------------ #------ thumb entry to tbf1's .iplt entry #------------------------------------------------------------------------------ @@ -59,8 +59,8 @@ Disassembly of section \.iplt: #------ tbf1's .iplt entry #------------------------------------------------------------------------------ 904c: e28fc600 add ip, pc, #0, 12 - 9050: e28cca07 add ip, ip, #28672 ; 0x7000 - 9054: e5bcffcc ldr pc, \[ip, #4044\]! ; 0xfcc + 9050: e28cca07 add ip, ip, #28672 @ 0x7000 + 9054: e5bcffcc ldr pc, \[ip, #4044\]! @ 0xfcc #------------------------------------------------------------------------------ #------ thumb entry to atf3's .iplt entry #------------------------------------------------------------------------------ @@ -70,8 +70,8 @@ Disassembly of section \.iplt: #------ atf3's .iplt entry #------------------------------------------------------------------------------ 905c: e28fc600 add ip, pc, #0, 12 - 9060: e28cca07 add ip, ip, #28672 ; 0x7000 - 9064: e5bcffc0 ldr pc, \[ip, #4032\]! ; 0xfc0 + 9060: e28cca07 add ip, ip, #28672 @ 0x7000 + 9064: e5bcffc0 ldr pc, \[ip, #4032\]! @ 0xfc0 #------------------------------------------------------------------------------ #------ thumb entry to abf3's .iplt entry #------------------------------------------------------------------------------ @@ -81,8 +81,8 @@ Disassembly of section \.iplt: #------ abf3's .iplt entry #------------------------------------------------------------------------------ 906c: e28fc600 add ip, pc, #0, 12 - 9070: e28cca07 add ip, ip, #28672 ; 0x7000 - 9074: e5bcffb4 ldr pc, \[ip, #4020\]! ; 0xfb4 + 9070: e28cca07 add ip, ip, #28672 @ 0x7000 + 9074: e5bcffb4 ldr pc, \[ip, #4020\]! @ 0xfb4 #------------------------------------------------------------------------------ #------ thumb entry to ttf3's .iplt entry #------------------------------------------------------------------------------ @@ -92,8 +92,8 @@ Disassembly of section \.iplt: #------ ttf3's .iplt entry #------------------------------------------------------------------------------ 907c: e28fc600 add ip, pc, #0, 12 - 9080: e28cca07 add ip, ip, #28672 ; 0x7000 - 9084: e5bcffa8 ldr pc, \[ip, #4008\]! ; 0xfa8 + 9080: e28cca07 add ip, ip, #28672 @ 0x7000 + 9084: e5bcffa8 ldr pc, \[ip, #4008\]! @ 0xfa8 #------------------------------------------------------------------------------ #------ thumb entry to tbf3's .iplt entry #------------------------------------------------------------------------------ @@ -103,20 +103,20 @@ Disassembly of section \.iplt: #------ tbf3's .iplt entry #------------------------------------------------------------------------------ 908c: e28fc600 add ip, pc, #0, 12 - 9090: e28cca07 add ip, ip, #28672 ; 0x7000 - 9094: e5bcff9c ldr pc, \[ip, #3996\]! ; 0xf9c + 9090: e28cca07 add ip, ip, #28672 @ 0x7000 + 9094: e5bcff9c ldr pc, \[ip, #3996\]! @ 0xf9c #------------------------------------------------------------------------------ #------ taf3's .iplt entry #------------------------------------------------------------------------------ 9098: e28fc600 add ip, pc, #0, 12 - 909c: e28cca07 add ip, ip, #28672 ; 0x7000 - 90a0: e5bcff94 ldr pc, \[ip, #3988\]! ; 0xf94 + 909c: e28cca07 add ip, ip, #28672 @ 0x7000 + 90a0: e5bcff94 ldr pc, \[ip, #3988\]! @ 0xf94 #------------------------------------------------------------------------------ #------ aaf3's .iplt entry #------------------------------------------------------------------------------ 90a4: e28fc600 add ip, pc, #0, 12 - 90a8: e28cca07 add ip, ip, #28672 ; 0x7000 - 90ac: e5bcff8c ldr pc, \[ip, #3980\]! ; 0xf8c + 90a8: e28cca07 add ip, ip, #28672 @ 0x7000 + 90ac: e5bcff8c ldr pc, \[ip, #3980\]! @ 0xf8c Disassembly of section \.text: @@ -162,8 +162,8 @@ Disassembly of section \.text: a028: eb0017f4 bl 10000 <foo> a02c: ea0017f3 b 10000 <foo> a030: 0a0017f2 beq 10000 <foo> - a034: e59f4000 ldr r4, \[pc\] ; a03c <arm\+0x14> - a038: e59f4000 ldr r4, \[pc\] ; a040 <arm\+0x18> + a034: e59f4000 ldr r4, \[pc\] @ a03c <arm\+0x14> + a038: e59f4000 ldr r4, \[pc\] @ a040 <arm\+0x18> #------------------------------------------------------------------------------ #------ .got offset for foo #------------------------------------------------------------------------------ @@ -184,8 +184,8 @@ Disassembly of section \.text: #------ aaf1's .iplt entry #------------------------------------------------------------------------------ a04c: 0afffbeb beq 9000 <aaf1-0x1000> - a050: e59f4000 ldr r4, \[pc\] ; a058 <arm\+0x30> - a054: e59f4000 ldr r4, \[pc\] ; a05c <arm\+0x34> + a050: e59f4000 ldr r4, \[pc\] @ a058 <arm\+0x30> + a054: e59f4000 ldr r4, \[pc\] @ a05c <arm\+0x34> #------------------------------------------------------------------------------ #------ GP-relative offset of aaf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -206,8 +206,8 @@ Disassembly of section \.text: #------ taf1's .iplt entry #------------------------------------------------------------------------------ a068: 0afffbef beq 902c <aaf1-0xfd4> - a06c: e59f4000 ldr r4, \[pc\] ; a074 <arm\+0x4c> - a070: e59f4000 ldr r4, \[pc\] ; a078 <arm\+0x50> + a06c: e59f4000 ldr r4, \[pc\] @ a074 <arm\+0x4c> + a070: e59f4000 ldr r4, \[pc\] @ a078 <arm\+0x50> #------------------------------------------------------------------------------ #------ GP-relative offset of taf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -228,8 +228,8 @@ Disassembly of section \.text: #------ abf1's .iplt entry #------------------------------------------------------------------------------ a084: 0afffbe5 beq 9020 <aaf1-0xfe0> - a088: e59f4000 ldr r4, \[pc\] ; a090 <arm\+0x68> - a08c: e59f4000 ldr r4, \[pc\] ; a094 <arm\+0x6c> + a088: e59f4000 ldr r4, \[pc\] @ a090 <arm\+0x68> + a08c: e59f4000 ldr r4, \[pc\] @ a094 <arm\+0x6c> #------------------------------------------------------------------------------ #------ GP-relative offset of abf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -250,8 +250,8 @@ Disassembly of section \.text: #------ tbf1's .iplt entry #------------------------------------------------------------------------------ a0a0: 0afffbe9 beq 904c <aaf1-0xfb4> - a0a4: e59f4000 ldr r4, \[pc\] ; a0ac <arm\+0x84> - a0a8: e59f4000 ldr r4, \[pc\] ; a0b0 <arm\+0x88> + a0a4: e59f4000 ldr r4, \[pc\] @ a0ac <arm\+0x84> + a0a8: e59f4000 ldr r4, \[pc\] @ a0b0 <arm\+0x88> #------------------------------------------------------------------------------ #------ GP-relative offset of tbf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -272,8 +272,8 @@ Disassembly of section \.text: #------ aaf3's .plt entry #------------------------------------------------------------------------------ a0bc: 0afffbf8 beq 90a4 <aaf1-0xf5c> - a0c0: e59f4000 ldr r4, \[pc\] ; a0c8 <arm\+0xa0> - a0c4: e59f4000 ldr r4, \[pc\] ; a0cc <arm\+0xa4> + a0c0: e59f4000 ldr r4, \[pc\] @ a0c8 <arm\+0xa0> + a0c4: e59f4000 ldr r4, \[pc\] @ a0cc <arm\+0xa4> #------------------------------------------------------------------------------ #------ GP-relative offset of aaf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -294,8 +294,8 @@ Disassembly of section \.text: #------ taf3's .iplt entry #------------------------------------------------------------------------------ a0d8: 0afffbee beq 9098 <aaf1-0xf68> - a0dc: e59f4000 ldr r4, \[pc\] ; a0e4 <arm\+0xbc> - a0e0: e59f4000 ldr r4, \[pc\] ; a0e8 <arm\+0xc0> + a0dc: e59f4000 ldr r4, \[pc\] @ a0e4 <arm\+0xbc> + a0e0: e59f4000 ldr r4, \[pc\] @ a0e8 <arm\+0xc0> #------------------------------------------------------------------------------ #------ GP-relative offset of taf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -316,8 +316,8 @@ Disassembly of section \.text: #------ abf3's .iplt entry #------------------------------------------------------------------------------ a0f4: 0afffbdc beq 906c <aaf1-0xf94> - a0f8: e59f4000 ldr r4, \[pc\] ; a100 <arm\+0xd8> - a0fc: e59f4000 ldr r4, \[pc\] ; a104 <arm\+0xdc> + a0f8: e59f4000 ldr r4, \[pc\] @ a100 <arm\+0xd8> + a0fc: e59f4000 ldr r4, \[pc\] @ a104 <arm\+0xdc> #------------------------------------------------------------------------------ #------ GP-relative offset of abf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -338,8 +338,8 @@ Disassembly of section \.text: #------ tbf3's .iplt entry #------------------------------------------------------------------------------ a110: 0afffbdd beq 908c <aaf1-0xf74> - a114: e59f4000 ldr r4, \[pc\] ; a11c <arm\+0xf4> - a118: e59f4000 ldr r4, \[pc\] ; a120 <arm\+0xf8> + a114: e59f4000 ldr r4, \[pc\] @ a11c <arm\+0xf4> + a118: e59f4000 ldr r4, \[pc\] @ a120 <arm\+0xf8> #------------------------------------------------------------------------------ #------ GP-relative offset of tbf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -353,8 +353,8 @@ Disassembly of section \.text: a124: f005 ff6c bl 10000 <foo> a128: f005 bf6a b\.w 10000 <foo> a12c: f005 8768 beq\.w 10000 <foo> - a130: 4c00 ldr r4, \[pc, #0\] ; \(a134 <_thumb\+0x10>\) - a132: 4c01 ldr r4, \[pc, #4\] ; \(a138 <_thumb\+0x14>\) + a130: 4c00 ldr r4, \[pc, #0\] @ \(a134 <_thumb\+0x10>\) + a132: 4c01 ldr r4, \[pc, #4\] @ \(a138 <_thumb\+0x14>\) #------------------------------------------------------------------------------ #------ .got offset for foo #------------------------------------------------------------------------------ @@ -375,8 +375,8 @@ Disassembly of section \.text: #------ thumb entry to atf1's .iplt entry #------------------------------------------------------------------------------ a144: f43e af62 beq\.w 900c <aaf1-0xff4> - a148: 4c00 ldr r4, \[pc, #0\] ; \(a14c <_thumb\+0x28>\) - a14a: 4c01 ldr r4, \[pc, #4\] ; \(a150 <_thumb\+0x2c>\) + a148: 4c00 ldr r4, \[pc, #0\] @ \(a14c <_thumb\+0x28>\) + a14a: 4c01 ldr r4, \[pc, #4\] @ \(a150 <_thumb\+0x2c>\) #------------------------------------------------------------------------------ #------ GP-relative offset of atf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -397,8 +397,8 @@ Disassembly of section \.text: #------ thumb entry to ttf1's .iplt entry #------------------------------------------------------------------------------ a15c: f43e af6c beq\.w 9038 <aaf1-0xfc8> - a160: 4c00 ldr r4, \[pc, #0\] ; \(a164 <_thumb\+0x40>\) - a162: 4c01 ldr r4, \[pc, #4\] ; \(a168 <_thumb\+0x44>\) + a160: 4c00 ldr r4, \[pc, #0\] @ \(a164 <_thumb\+0x40>\) + a162: 4c01 ldr r4, \[pc, #4\] @ \(a168 <_thumb\+0x44>\) #------------------------------------------------------------------------------ #------ GP-relative offset of ttf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -419,8 +419,8 @@ Disassembly of section \.text: #------ thumb entry to abf1's .iplt entry #------------------------------------------------------------------------------ a174: f43e af52 beq\.w 901c <aaf1-0xfe4> - a178: 4c00 ldr r4, \[pc, #0\] ; \(a17c <_thumb\+0x58>\) - a17a: 4c01 ldr r4, \[pc, #4\] ; \(a180 <_thumb\+0x5c>\) + a178: 4c00 ldr r4, \[pc, #0\] @ \(a17c <_thumb\+0x58>\) + a17a: 4c01 ldr r4, \[pc, #4\] @ \(a180 <_thumb\+0x5c>\) #------------------------------------------------------------------------------ #------ GP-relative offset of abf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -441,8 +441,8 @@ Disassembly of section \.text: #------ thumb entry to tbf1's .iplt entry #------------------------------------------------------------------------------ a18c: f43e af5c beq\.w 9048 <aaf1-0xfb8> - a190: 4c00 ldr r4, \[pc, #0\] ; \(a194 <_thumb\+0x70>\) - a192: 4c01 ldr r4, \[pc, #4\] ; \(a198 <_thumb\+0x74>\) + a190: 4c00 ldr r4, \[pc, #0\] @ \(a194 <_thumb\+0x70>\) + a192: 4c01 ldr r4, \[pc, #4\] @ \(a198 <_thumb\+0x74>\) #------------------------------------------------------------------------------ #------ GP-relative offset of tbf1's .igot.plt entry #------------------------------------------------------------------------------ @@ -463,8 +463,8 @@ Disassembly of section \.text: #------ thumb entry to atf3's .iplt entry #------------------------------------------------------------------------------ a1a4: f43e af58 beq\.w 9058 <aaf1-0xfa8> - a1a8: 4c00 ldr r4, \[pc, #0\] ; \(a1ac <_thumb\+0x88>\) - a1aa: 4c01 ldr r4, \[pc, #4\] ; \(a1b0 <_thumb\+0x8c>\) + a1a8: 4c00 ldr r4, \[pc, #0\] @ \(a1ac <_thumb\+0x88>\) + a1aa: 4c01 ldr r4, \[pc, #4\] @ \(a1b0 <_thumb\+0x8c>\) #------------------------------------------------------------------------------ #------ GP-relative offset of atf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -485,8 +485,8 @@ Disassembly of section \.text: #------ thumb entry to ttf3's .iplt entry #------------------------------------------------------------------------------ a1bc: f43e af5c beq\.w 9078 <aaf1-0xf88> - a1c0: 4c00 ldr r4, \[pc, #0\] ; \(a1c4 <_thumb\+0xa0>\) - a1c2: 4c01 ldr r4, \[pc, #4\] ; \(a1c8 <_thumb\+0xa4>\) + a1c0: 4c00 ldr r4, \[pc, #0\] @ \(a1c4 <_thumb\+0xa0>\) + a1c2: 4c01 ldr r4, \[pc, #4\] @ \(a1c8 <_thumb\+0xa4>\) #------------------------------------------------------------------------------ #------ GP-relative offset of ttf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -507,8 +507,8 @@ Disassembly of section \.text: #------ thumb entry to abf3's .iplt entry #------------------------------------------------------------------------------ a1d4: f43e af48 beq\.w 9068 <aaf1-0xf98> - a1d8: 4c00 ldr r4, \[pc, #0\] ; \(a1dc <_thumb\+0xb8>\) - a1da: 4c01 ldr r4, \[pc, #4\] ; \(a1e0 <_thumb\+0xbc>\) + a1d8: 4c00 ldr r4, \[pc, #0\] @ \(a1dc <_thumb\+0xb8>\) + a1da: 4c01 ldr r4, \[pc, #4\] @ \(a1e0 <_thumb\+0xbc>\) #------------------------------------------------------------------------------ #------ GP-relative offset of abf3's .igot.plt entry #------------------------------------------------------------------------------ @@ -529,8 +529,8 @@ Disassembly of section \.text: #------ thumb entry to tbf3's .iplt entry #------------------------------------------------------------------------------ a1ec: f43e af4c beq\.w 9088 <aaf1-0xf78> - a1f0: 4c00 ldr r4, \[pc, #0\] ; \(a1f4 <_thumb\+0xd0>\) - a1f2: 4c01 ldr r4, \[pc, #4\] ; \(a1f8 <_thumb\+0xd4>\) + a1f0: 4c00 ldr r4, \[pc, #0\] @ \(a1f4 <_thumb\+0xd0>\) + a1f2: 4c01 ldr r4, \[pc, #4\] @ \(a1f8 <_thumb\+0xd4>\) #------------------------------------------------------------------------------ #------ GP-relative offset of tbf3's .igot.plt entry #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-9.dd b/ld/testsuite/ld-arm/ifunc-9.dd index cc4afa8..20f1fd4 100644 --- a/ld/testsuite/ld-arm/ifunc-9.dd +++ b/ld/testsuite/ld-arm/ifunc-9.dd @@ -5,8 +5,8 @@ Disassembly of section \.plt: 00009000 <.plt>: - 9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <.*> + 9000: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + 9004: e59fe004 ldr lr, \[pc, #4\] @ 9010 <.*> 9008: e08fe00e add lr, pc, lr 900c: e5bef008 ldr pc, \[lr, #8\]! #------------------------------------------------------------------------------ @@ -18,8 +18,8 @@ Disassembly of section \.plt: #------------------------------------------------------------------------------ 00009014 <f2@plt>: 9014: e28fc600 add ip, pc, #0, 12 - 9018: e28cca07 add ip, ip, #28672 ; 0x7000 - 901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0 + 9018: e28cca07 add ip, ip, #28672 @ 0x7000 + 901c: e5bcfff0 ldr pc, \[ip, #4080\]! @ 0xff0 Disassembly of section \.iplt: @@ -28,13 +28,13 @@ Disassembly of section \.iplt: #------ f1's .iplt entry #------------------------------------------------------------------------------ 9020: e28fc600 add ip, pc, #0, 12 - 9024: e28cca07 add ip, ip, #28672 ; 0x7000 - 9028: e5bcffe8 ldr pc, \[ip, #4072\]! ; 0xfe8 + 9024: e28cca07 add ip, ip, #28672 @ 0x7000 + 9028: e5bcffe8 ldr pc, \[ip, #4072\]! @ 0xfe8 0000902c <f3>: 902c: e28fc600 add ip, pc, #0, 12 - 9030: e28cca07 add ip, ip, #28672 ; 0x7000 - 9034: e5bcffe0 ldr pc, \[ip, #4064\]! ; 0xfe0 + 9030: e28cca07 add ip, ip, #28672 @ 0x7000 + 9034: e5bcffe0 ldr pc, \[ip, #4064\]! @ 0xfe0 Disassembly of section \.text: @@ -44,11 +44,11 @@ Disassembly of section \.text: 0000a008 <_start>: a008: eb0017fc bl 10000 <foo> - a00c: e59f400c ldr r4, \[pc, #12\] ; a020 <_start\+0x18> - a010: e59f400c ldr r4, \[pc, #12\] ; a024 <_start\+0x1c> - a014: e59f400c ldr r4, \[pc, #12\] ; a028 <_start\+0x20> - a018: e59f400c ldr r4, \[pc, #12\] ; a02c <_start\+0x24> - a01c: e59f500c ldr r5, \[pc, #12\] ; a030 <_start\+0x28> + a00c: e59f400c ldr r4, \[pc, #12\] @ a020 <_start\+0x18> + a010: e59f400c ldr r4, \[pc, #12\] @ a024 <_start\+0x1c> + a014: e59f400c ldr r4, \[pc, #12\] @ a028 <_start\+0x20> + a018: e59f400c ldr r4, \[pc, #12\] @ a02c <_start\+0x24> + a01c: e59f500c ldr r5, \[pc, #12\] @ a030 <_start\+0x28> #------------------------------------------------------------------------------ #------ foo #------------------------------------------------------------------------------ @@ -73,11 +73,11 @@ Disassembly of section \.text: #------ f1's .iplt entry #------------------------------------------------------------------------------ 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> - a044: e59f400c ldr r4, \[pc, #12\] ; a058 <_start\+0x50> - a048: e59f500c ldr r5, \[pc, #12\] ; a05c <_start\+0x54> + 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> + a044: e59f400c ldr r4, \[pc, #12\] @ a058 <_start\+0x50> + a048: e59f500c ldr r5, \[pc, #12\] @ a05c <_start\+0x54> #------------------------------------------------------------------------------ #------ f1's .iplt entry #------------------------------------------------------------------------------ @@ -102,11 +102,11 @@ Disassembly of section \.text: #------ f2's .plt entry #------------------------------------------------------------------------------ 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> - a070: e59f400c ldr r4, \[pc, #12\] ; a084 <_start\+0x7c> - a074: e59f500c ldr r5, \[pc, #12\] ; a088 <_start\+0x80> + 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> + a070: e59f400c ldr r4, \[pc, #12\] @ a084 <_start\+0x7c> + a074: e59f500c ldr r5, \[pc, #12\] @ a088 <_start\+0x80> #------------------------------------------------------------------------------ #------ f2's .plt entry #------------------------------------------------------------------------------ @@ -128,11 +128,11 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ a088: 00006fa0 \.word 0x00006fa0 a08c: ebfffbe6 bl 902c <f3> - a090: e59f400c ldr r4, \[pc, #12\] ; a0a4 <_start\+0x9c> - a094: e59f400c ldr r4, \[pc, #12\] ; a0a8 <_start\+0xa0> - a098: e59f400c ldr r4, \[pc, #12\] ; a0ac <_start\+0xa4> - a09c: e59f400c ldr r4, \[pc, #12\] ; a0b0 <_start\+0xa8> - a0a0: e59f500c ldr r5, \[pc, #12\] ; a0b4 <_start\+0xac> + a090: e59f400c ldr r4, \[pc, #12\] @ a0a4 <_start\+0x9c> + a094: e59f400c ldr r4, \[pc, #12\] @ a0a8 <_start\+0xa0> + a098: e59f400c ldr r4, \[pc, #12\] @ a0ac <_start\+0xa4> + a09c: e59f400c ldr r4, \[pc, #12\] @ a0b0 <_start\+0xa8> + a0a0: e59f500c ldr r5, \[pc, #12\] @ a0b4 <_start\+0xac> #------------------------------------------------------------------------------ #------ f3 #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long-backward.d b/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long-backward.d index 9424207..3ac3a68 100644 --- a/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long-backward.d +++ b/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long-backward.d @@ -15,5 +15,5 @@ Disassembly of section .text: ... 001080.. <[^>]*>: - 1080..: f85f f000 ldr.w pc, \[pc\] ; 10800c <__dest_veneer\+0x4> + 1080..: f85f f000 ldr.w pc, \[pc\] @ 10800c <__dest_veneer\+0x4> 1080..: 00008003 .word 0x00008003 diff --git a/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long.d b/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long.d index 88481f0..22d6414 100644 --- a/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long.d +++ b/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long.d @@ -15,5 +15,5 @@ Disassembly of section .text: ... 000080.. <[^>]*>: - 80..: f85f f000 ldr.w pc, \[pc\] ; 800c <__dest_veneer\+0x4> + 80..: f85f f000 ldr.w pc, \[pc\] @ 800c <__dest_veneer\+0x4> 80..: 00108005 .word 0x00108005 diff --git a/ld/testsuite/ld-arm/jump-reloc-veneers-long.d b/ld/testsuite/ld-arm/jump-reloc-veneers-long.d index 1edb1b3..732d366 100644 --- a/ld/testsuite/ld-arm/jump-reloc-veneers-long.d +++ b/ld/testsuite/ld-arm/jump-reloc-veneers-long.d @@ -17,6 +17,6 @@ Disassembly of section .text: 000080.. <[^>]*>: 80..: 4778 bx pc 80..: e7fd b.n .+ <.+> - 80..: e59fc000 ldr ip, \[pc\] ; 80.. <__dest_veneer\+0xc> + 80..: e59fc000 ldr ip, \[pc\] @ 80.. <__dest_veneer\+0xc> 80..: e12fff1c bx ip 80..: 09000001 .word 0x09000001 diff --git a/ld/testsuite/ld-arm/long-plt-format.d b/ld/testsuite/ld-arm/long-plt-format.d index b14d9b5..106b63d 100644 --- a/ld/testsuite/ld-arm/long-plt-format.d +++ b/ld/testsuite/ld-arm/long-plt-format.d @@ -10,7 +10,7 @@ Disassembly of section .plt: .*: .* .*: .* .word .* .* <foo@plt>: - .*: .* add ip, pc, #-268435456 ; 0xf0000000 + .*: .* add ip, pc, #-268435456 @ 0xf0000000 .*: .* add ip, ip, #0, 12 .*: .* add ip, ip, #0, 20 - .*: .* ldr pc, [ip, #[0-9]*]! ; 0x.* + .*: .* ldr pc, [ip, #[0-9]*]! @ 0x.* diff --git a/ld/testsuite/ld-arm/mixed-app-v5.d b/ld/testsuite/ld-arm/mixed-app-v5.d index 9c734a9..f3494e9 100644 --- a/ld/testsuite/ld-arm/mixed-app-v5.d +++ b/ld/testsuite/ld-arm/mixed-app-v5.d @@ -7,18 +7,18 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <.*> + .*: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + .*: e59fe004 ldr lr, \[pc, #4\] @ .* <.*> .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* .* <lib_func2@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* .* <lib_func1@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* Disassembly of section .text: @@ -28,9 +28,9 @@ Disassembly of section .text: .*: eb000004 bl .* <app_func> .*: e89d6800 ldm sp, {fp, sp, lr} .*: e12fff1e bx lr - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .* <app_func>: .*: e1a0c00d mov ip, sp @@ -38,15 +38,15 @@ Disassembly of section .text: .*: ebffffee bl .* .*: e89d6800 ldm sp, {fp, sp, lr} .*: e12fff1e bx lr - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .* <app_func2>: .*: e12fff1e bx lr - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .* <app_tfunc>: .*: b500 push {lr} diff --git a/ld/testsuite/ld-arm/mixed-app.d b/ld/testsuite/ld-arm/mixed-app.d index 99c6e5d..cb95865 100644 --- a/ld/testsuite/ld-arm/mixed-app.d +++ b/ld/testsuite/ld-arm/mixed-app.d @@ -7,8 +7,8 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <.*> + .*: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + .*: e59fe004 ldr lr, \[pc, #4\] @ .* <.*> .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* @@ -16,11 +16,11 @@ Disassembly of section .plt: .*: 4778 bx pc .*: e7fd b.n .+ <.+> .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* .* <lib_func1@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* Disassembly of section .text: @@ -30,9 +30,9 @@ Disassembly of section .text: .*: eb000004 bl .* <app_func> .*: e89d6800 ldm sp, {fp, sp, lr} .*: e12fff1e bx lr - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .* <app_func>: .*: e1a0c00d mov ip, sp @@ -40,15 +40,15 @@ Disassembly of section .text: .*: ebffff.. bl .* .*: e89d6800 ldm sp, {fp, sp, lr} .*: e12fff1e bx lr - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .* <app_func2>: .*: e12fff1e bx lr - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .* <app_tfunc>: .*: b500 push {lr} diff --git a/ld/testsuite/ld-arm/mixed-lib.d b/ld/testsuite/ld-arm/mixed-lib.d index a4bb26b..0291add 100644 --- a/ld/testsuite/ld-arm/mixed-lib.d +++ b/ld/testsuite/ld-arm/mixed-lib.d @@ -7,14 +7,14 @@ start address 0x.* Disassembly of section .plt: .* <.plt>: - .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <.*> + .*: e52de004 push {lr} @ \(str lr, \[sp, #-4\]!\) + .*: e59fe004 ldr lr, \[pc, #4\] @ .* <.*> .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* .* <app_func2@plt>: .*: e28fc6.* add ip, pc, #.* - .*: e28cca.* add ip, ip, #.* ; 0x.* + .*: e28cca.* add ip, ip, #.* @ 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* Disassembly of section .text: @@ -24,9 +24,9 @@ Disassembly of section .text: .*: ebfffff. bl .* <app_func2@plt> .*: e89d6800 ldm sp, {fp, sp, lr} .*: e12fff1e bx lr - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .* <lib_func2>: .*: 4770 bx lr diff --git a/ld/testsuite/ld-arm/movw-merge.d b/ld/testsuite/ld-arm/movw-merge.d index 40e1681..8f11d13 100644 --- a/ld/testsuite/ld-arm/movw-merge.d +++ b/ld/testsuite/ld-arm/movw-merge.d @@ -4,10 +4,10 @@ Disassembly of section .text: 00008000 <[^>]*>: - 8000: e3080013 movw r0, #32787 ; 0x8013 + 8000: e3080013 movw r0, #32787 @ 0x8013 8004: e3400000 movt r0, #0 00008008 <[^>]*>: - 8008: f248 0013 movw r0, #32787 ; 0x8013 + 8008: f248 0013 movw r0, #32787 @ 0x8013 800c: f2c0 0000 movt r0, #0 diff --git a/ld/testsuite/ld-arm/non-contiguous-arm2.d b/ld/testsuite/ld-arm/non-contiguous-arm2.d index 14aca4c..811230c 100644 --- a/ld/testsuite/ld-arm/non-contiguous-arm2.d +++ b/ld/testsuite/ld-arm/non-contiguous-arm2.d @@ -37,19 +37,19 @@ SYMBOL TABLE: Disassembly of section .raml: 1fff0000 \<code1\>: -1fff0000: e1a00000 nop ; \(mov r0, r0\) -1fff0004: e1a00000 nop ; \(mov r0, r0\) +1fff0000: e1a00000 nop @ \(mov r0, r0\) +1fff0004: e1a00000 nop @ \(mov r0, r0\) 1fff0008: ebffffff bl 1fff000c \<code2\> 1fff000c \<code2\>: -1fff000c: e1a00000 nop ; \(mov r0, r0\) -1fff0010: e1a00000 nop ; \(mov r0, r0\) +1fff000c: e1a00000 nop @ \(mov r0, r0\) +1fff0010: e1a00000 nop @ \(mov r0, r0\) 1fff0014: eb003ff9 bl 20000000 \<code3\> Disassembly of section .ramu: 20000000 \<code3\>: -20000000: e1a00000 nop ; \(mov r0, r0\) +20000000: e1a00000 nop @ \(mov r0, r0\) 20000004: eb00fffd bl 20040000 \<code4\> Disassembly of section .ramz: diff --git a/ld/testsuite/ld-arm/non-contiguous-arm3.d b/ld/testsuite/ld-arm/non-contiguous-arm3.d index c500a29..9d5bc56 100644 --- a/ld/testsuite/ld-arm/non-contiguous-arm3.d +++ b/ld/testsuite/ld-arm/non-contiguous-arm3.d @@ -39,23 +39,23 @@ SYMBOL TABLE: Disassembly of section .raml: 1fff0000 \<code1\>: -1fff0000: e1a00000 nop ; \(mov r0, r0\) -1fff0004: e1a00000 nop ; \(mov r0, r0\) +1fff0000: e1a00000 nop @ \(mov r0, r0\) +1fff0004: e1a00000 nop @ \(mov r0, r0\) 1fff0008: ebffffff bl 1fff000c \<code2\> 1fff000c \<code2\>: -1fff000c: e1a00000 nop ; \(mov r0, r0\) -1fff0010: e1a00000 nop ; \(mov r0, r0\) +1fff000c: e1a00000 nop @ \(mov r0, r0\) +1fff0010: e1a00000 nop @ \(mov r0, r0\) 1fff0014: eb003ff9 bl 20000000 \<code3\> Disassembly of section .ramu: 20000000 \<code3\>: -20000000: e1a00000 nop ; \(mov r0, r0\) +20000000: e1a00000 nop @ \(mov r0, r0\) 20000004: ebffffff bl 20000008 \<__code4_veneer\> 20000008 \<__code4_veneer\>: -20000008: e51ff004 ldr pc, \[pc, #-4\] ; 2000000c \<__code4_veneer\+0x4\> +20000008: e51ff004 ldr pc, \[pc, #-4\] @ 2000000c \<__code4_veneer\+0x4\> 2000000c: 30040000 .word 0x30040000 Disassembly of section .ramz: diff --git a/ld/testsuite/ld-arm/non-contiguous-arm5.d b/ld/testsuite/ld-arm/non-contiguous-arm5.d index 60b6f56..730df2f 100644 --- a/ld/testsuite/ld-arm/non-contiguous-arm5.d +++ b/ld/testsuite/ld-arm/non-contiguous-arm5.d @@ -37,19 +37,19 @@ SYMBOL TABLE: Disassembly of section .raml: 1fff0000 \<code1\>: -1fff0000: e1a00000 nop ; \(mov r0, r0\) -1fff0004: e1a00000 nop ; \(mov r0, r0\) +1fff0000: e1a00000 nop @ \(mov r0, r0\) +1fff0004: e1a00000 nop @ \(mov r0, r0\) 1fff0008: eb003ffc bl 20000000 \<code2\> Disassembly of section .ramu: 20000000 \<code2\>: -20000000: e1a00000 nop ; \(mov r0, r0\) -20000004: e1a00000 nop ; \(mov r0, r0\) +20000000: e1a00000 nop @ \(mov r0, r0\) +20000004: e1a00000 nop @ \(mov r0, r0\) 20000008: ebffffff bl 2000000c \<code3\> 2000000c \<code3\>: -2000000c: e1a00000 nop ; \(mov r0, r0\) +2000000c: e1a00000 nop @ \(mov r0, r0\) 20000010: eb00fffa bl 20040000 \<code4\> Disassembly of section .ramz: diff --git a/ld/testsuite/ld-arm/non-contiguous-arm6.d b/ld/testsuite/ld-arm/non-contiguous-arm6.d index da69f6b..9a9869c 100644 --- a/ld/testsuite/ld-arm/non-contiguous-arm6.d +++ b/ld/testsuite/ld-arm/non-contiguous-arm6.d @@ -35,21 +35,21 @@ SYMBOL TABLE: Disassembly of section .raml: 1fff0000 \<code1\>: -1fff0000: e1a00000 nop ; \(mov r0, r0\) -1fff0004: e1a00000 nop ; \(mov r0, r0\) +1fff0000: e1a00000 nop @ \(mov r0, r0\) +1fff0004: e1a00000 nop @ \(mov r0, r0\) 1fff0008: ebffffff bl 1fff000c \<code2\> 1fff000c \<code2\>: -1fff000c: e1a00000 nop ; \(mov r0, r0\) -1fff0010: e1a00000 nop ; \(mov r0, r0\) +1fff000c: e1a00000 nop @ \(mov r0, r0\) +1fff0010: e1a00000 nop @ \(mov r0, r0\) 1fff0014: ebffffff bl 1fff0018 \<code3\> 1fff0018 \<code3\>: -1fff0018: e1a00000 nop ; \(mov r0, r0\) +1fff0018: e1a00000 nop @ \(mov r0, r0\) 1fff001c: ebffffff bl 1fff0020 \<__code4_veneer\> 1fff0020 \<__code4_veneer\>: -1fff0020: e51ff004 ldr pc, \[pc, #-4\] ; 1fff0024 \<__code4_veneer\+0x4\> +1fff0020: e51ff004 ldr pc, \[pc, #-4\] @ 1fff0024 \<__code4_veneer\+0x4\> 1fff0024: 40040000 .word 0x40040000 Disassembly of section .ramz: diff --git a/ld/testsuite/ld-arm/stm32l4xx-cannot-fix-far-ldm.d b/ld/testsuite/ld-arm/stm32l4xx-cannot-fix-far-ldm.d index 8e785c6..13b2838 100644 --- a/ld/testsuite/ld-arm/stm32l4xx-cannot-fix-far-ldm.d +++ b/ld/testsuite/ld-arm/stm32l4xx-cannot-fix-far-ldm.d @@ -3,7 +3,7 @@ #ld:-EL --fix-stm32l4xx-629360 -Ttext=0x80000 #objdump: -dr --prefix-addresses --show-raw-insn #name: STM32L4XX erratum : LDM cannot be patched when LDM is too far from veneer section -#warning: .*cannot create STM32L4XX veneer; jump out of range by 24 bytes; cannot encode branch instruction.* +#warning: .*cannot create STM32L4XX veneer@ jump out of range by 24 bytes; cannot encode branch instruction.* # Test the `LDM*' instructions when too far from the veneer section # They cannot, thus should not, be patched diff --git a/ld/testsuite/ld-arm/stm32l4xx-fix-ldm.d b/ld/testsuite/ld-arm/stm32l4xx-fix-ldm.d index 260415d..a8ff16f 100644 --- a/ld/testsuite/ld-arm/stm32l4xx-fix-ldm.d +++ b/ld/testsuite/ld-arm/stm32l4xx-fix-ldm.d @@ -77,19 +77,19 @@ Disassembly of section \.text: 80ae: de00 udf #0 000080b0 <__stm32l4xx_veneer_b>: - 80b0: f1a9 0928 sub\.w r9, r9, #40 ; 0x28 + 80b0: f1a9 0928 sub\.w r9, r9, #40 @ 0x28 80b4: e8b9 007e ldmia\.w r9!, {r1, r2, r3, r4, r5, r6} 80b8: e899 8380 ldmia\.w r9, {r7, r8, r9, pc} 80bc: f7f0 a000 udf\.w #0 000080c0 <__stm32l4xx_veneer_c>: - 80c0: f1a1 0728 sub\.w r7, r1, #40 ; 0x28 + 80c0: f1a1 0728 sub\.w r7, r1, #40 @ 0x28 80c4: e8b7 007e ldmia\.w r7!, {r1, r2, r3, r4, r5, r6} 80c8: e897 8380 ldmia\.w r7, {r7, r8, r9, pc} 80cc: f7f0 a000 udf\.w #0 000080d0 <__stm32l4xx_veneer_d>: - 80d0: f1a0 0728 sub\.w r7, r0, #40 ; 0x28 + 80d0: f1a0 0728 sub\.w r7, r0, #40 @ 0x28 80d4: e8b7 007e ldmia\.w r7!, {r1, r2, r3, r4, r5, r6} 80d8: e897 8380 ldmia\.w r7, {r7, r8, r9, pc} 80dc: f7f0 a000 udf\.w #0 @@ -101,7 +101,7 @@ Disassembly of section \.text: 80ec: f7f0 a000 udf\.w #0 000080f0 <__stm32l4xx_veneer_f>: - 80f0: f1a0 0028 sub\.w r0, r0, #40 ; 0x28 + 80f0: f1a0 0028 sub\.w r0, r0, #40 @ 0x28 80f4: 4607 mov r7, r0 80f6: e8b7 007e ldmia\.w r7!, {r1, r2, r3, r4, r5, r6} 80fa: e897 8380 ldmia\.w r7, {r7, r8, r9, pc} diff --git a/ld/testsuite/ld-arm/stm32l4xx-fix-vldm-dp.d b/ld/testsuite/ld-arm/stm32l4xx-fix-vldm-dp.d index cd7de14..cb7e48f 100644 --- a/ld/testsuite/ld-arm/stm32l4xx-fix-vldm-dp.d +++ b/ld/testsuite/ld-arm/stm32l4xx-fix-vldm-dp.d @@ -9,7 +9,7 @@ Disassembly of section \.text: 8004: ecba 5b08 vldmia sl!, {d5-d8} 8008: ecba 9b08 vldmia sl!, {d9-d12} 800c: ecba db06 vldmia sl!, {d13-d15} - 8010: f1aa 0a78 sub\.w sl, sl, #120 ; 0x78 + 8010: f1aa 0a78 sub\.w sl, sl, #120 @ 0x78 8014: f000 b826 b\.w 8064 <__stm32l4xx_veneer_0_r> 00008018 <__stm32l4xx_veneer_1>: diff --git a/ld/testsuite/ld-arm/stm32l4xx-fix-vldm.d b/ld/testsuite/ld-arm/stm32l4xx-fix-vldm.d index 49d7bee..4d03f76 100644 --- a/ld/testsuite/ld-arm/stm32l4xx-fix-vldm.d +++ b/ld/testsuite/ld-arm/stm32l4xx-fix-vldm.d @@ -9,7 +9,7 @@ Disassembly of section \.text: 8004: ecf9 4a08 vldmia r9!, {s9-s16} 8008: ecf9 8a08 vldmia r9!, {s17-s24} 800c: ecf9 ca07 vldmia r9!, {s25-s31} - 8010: f1a9 097c sub\.w r9, r9, #124 ; 0x7c + 8010: f1a9 097c sub\.w r9, r9, #124 @ 0x7c 8014: f000 b826 b\.w 8064 <__stm32l4xx_veneer_0_r> 00008018 <__stm32l4xx_veneer_1>: diff --git a/ld/testsuite/ld-arm/thumb-plt.d b/ld/testsuite/ld-arm/thumb-plt.d index aa9c61f..606b67e 100644 --- a/ld/testsuite/ld-arm/thumb-plt.d +++ b/ld/testsuite/ld-arm/thumb-plt.d @@ -11,13 +11,13 @@ Disassembly of section \.plt: 00000110 <\.plt>: 110: b500 push {lr} - 112: f8df e008 ldr.w lr, \[pc, #8\] ; 11c <\.plt\+0xc> + 112: f8df e008 ldr.w lr, \[pc, #8\] @ 11c <\.plt\+0xc> 116: 44fe add lr, pc 118: f85e ff08 ldr.w pc, \[lr, #8\]! 11c: 000100(.+) \.word 0x000100\1 00000120 <foo@plt>: - 120: f240 0c.+ movw ip, #[0-9]+ ; 0x.+ + 120: f240 0c.+ movw ip, #[0-9]+ @ 0x.+ 124: f2c0 0c01 movt ip, #1 128: 44fc add ip, pc 12a: f8dc f000 ldr.w pc, \[ip\] diff --git a/ld/testsuite/ld-arm/thumb1-adds.d b/ld/testsuite/ld-arm/thumb1-adds.d index 68ef68e..41ccbc4 100644 --- a/ld/testsuite/ld-arm/thumb1-adds.d +++ b/ld/testsuite/ld-arm/thumb1-adds.d @@ -5,8 +5,8 @@ Disassembly of section .text: 00008000 <[^>]*>: 8000: 3012 adds r0, #18 - 8002: 3134 adds r1, #52 ; 0x34 - 8004: 3280 adds r2, #128 ; 0x80 + 8002: 3134 adds r1, #52 @ 0x34 + 8004: 3280 adds r2, #128 @ 0x80 8006: 3301 adds r3, #1 8008: 3401 adds r4, #1 800a: 3500 adds r5, #0 @@ -17,11 +17,11 @@ Disassembly of section .text: 8010: 3012 adds r0, #18 8012: 3100 adds r1, #0 8014: 3200 adds r2, #0 - 8016: 33ca adds r3, #202 ; 0xca + 8016: 33ca adds r3, #202 @ 0xca 8018: 3700 adds r7, #0 - 801a: 3634 adds r6, #52 ; 0x34 - 801c: 3581 adds r5, #129 ; 0x81 - 801e: 3423 adds r4, #35 ; 0x23 + 801a: 3634 adds r6, #52 @ 0x34 + 801c: 3581 adds r5, #129 @ 0x81 + 801e: 3423 adds r4, #35 @ 0x23 00008020 <[^>]*>: 8020: 01 .byte 0x01 diff --git a/ld/testsuite/ld-arm/thumb1-movs.d b/ld/testsuite/ld-arm/thumb1-movs.d index 6a72bc1..1453eab 100644 --- a/ld/testsuite/ld-arm/thumb1-movs.d +++ b/ld/testsuite/ld-arm/thumb1-movs.d @@ -5,8 +5,8 @@ Disassembly of section .text: 00008000 <[^>]*>: 8000: 2012 movs r0, #18 - 8002: 2134 movs r1, #52 ; 0x34 - 8004: 2280 movs r2, #128 ; 0x80 + 8002: 2134 movs r1, #52 @ 0x34 + 8004: 2280 movs r2, #128 @ 0x80 8006: 2301 movs r3, #1 8008: 2401 movs r4, #1 800a: 2500 movs r5, #0 @@ -16,12 +16,12 @@ Disassembly of section .text: 00008010 <[^>]*>: 8010: 2012 movs r0, #18 8012: 2100 movs r1, #0 - 8014: 2281 movs r2, #129 ; 0x81 + 8014: 2281 movs r2, #129 @ 0x81 8016: 2320 movs r3, #32 8018: 2700 movs r7, #0 801a: 2600 movs r6, #0 - 801c: 2581 movs r5, #129 ; 0x81 - 801e: 2422 movs r4, #34 ; 0x22 + 801c: 2581 movs r5, #129 @ 0x81 + 801e: 2422 movs r4, #34 @ 0x22 00008020 <[^>]*>: 8020: 01 .byte 0x01 diff --git a/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d b/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d index 6b47810..bbbb8de 100644 --- a/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d +++ b/ld/testsuite/ld-arm/thumb2-bl-as-thumb1-bad.d @@ -8,7 +8,7 @@ Disassembly of section .text: \.\.\. 00001008 <__bar_veneer>: - 1008: e51ff004 ldr pc, \[pc, #-4\] ; 100c <__bar_veneer\+0x4> + 1008: e51ff004 ldr pc, \[pc, #-4\] @ 100c <__bar_veneer\+0x4> 100c: 0100100d .word 0x0100100d Disassembly of section .foo: diff --git a/ld/testsuite/ld-arm/thumb2-bl-bad.d b/ld/testsuite/ld-arm/thumb2-bl-bad.d index d78e451..4d2a3d6 100644 --- a/ld/testsuite/ld-arm/thumb2-bl-bad.d +++ b/ld/testsuite/ld-arm/thumb2-bl-bad.d @@ -8,7 +8,7 @@ Disassembly of section .text: \.\.\. 00001008 <__bar_veneer>: - 1008: e51ff004 ldr pc, \[pc, #-4\] ; 100c <__bar_veneer\+0x4> + 1008: e51ff004 ldr pc, \[pc, #-4\] @ 100c <__bar_veneer\+0x4> 100c: 0100100d .word 0x0100100d Disassembly of section .foo: diff --git a/ld/testsuite/ld-arm/tls-app.d b/ld/testsuite/ld-arm/tls-app.d index 454adcd..985e11e 100644 --- a/ld/testsuite/ld-arm/tls-app.d +++ b/ld/testsuite/ld-arm/tls-app.d @@ -7,8 +7,8 @@ start address 0x00008[0-9a-f]+ Disassembly of section .text: 00008[0-9a-f]+ <foo>: - 8[0-9a-f]+: e1a00000 nop ; \(mov r0, r0\) - 8[0-9a-f]+: e1a00000 nop ; \(mov r0, r0\) + 8[0-9a-f]+: e1a00000 nop @ \(mov r0, r0\) + 8[0-9a-f]+: e1a00000 nop @ \(mov r0, r0\) 8[0-9a-f]+: e1a0f00e mov pc, lr 8[0-9a-f]+: 000080bc .word 0x000080bc 8[0-9a-f]+: 000080b4 .word 0x000080b4 diff --git a/ld/testsuite/ld-arm/tls-descrelax-be32.d b/ld/testsuite/ld-arm/tls-descrelax-be32.d index 096723d..e58cb6a 100644 --- a/ld/testsuite/ld-arm/tls-descrelax-be32.d +++ b/ld/testsuite/ld-arm/tls-descrelax-be32.d @@ -6,103 +6,103 @@ start address 0x[0-9a-f]+ Disassembly of section .text: 00008000 <foo>: - 8000: e59f0004 ldr r0, \[pc, #4\] ; 800c <foo\+0xc> + 8000: e59f0004 ldr r0, \[pc, #4\] @ 800c <foo\+0xc> 8004: e79f0000 ldr r0, \[pc, r0\] - 8008: e1a00000 nop ; .* + 8008: e1a00000 nop @ .* 800c: 00008138 .word 0x00008138 - 8010: e59f0004 ldr r0, \[pc, #4\] ; 801c <foo\+0x1c> + 8010: e59f0004 ldr r0, \[pc, #4\] @ 801c <foo\+0x1c> 8014: e79f0000 ldr r0, \[pc, r0\] - 8018: e1a00000 nop ; .* + 8018: e1a00000 nop @ .* 801c: 00008128 .word 0x00008128 - 8020: e59f0004 ldr r0, \[pc, #4\] ; 802c <foo\+0x2c> - 8024: e1a00000 nop ; .* - 8028: e1a00000 nop ; .* + 8020: e59f0004 ldr r0, \[pc, #4\] @ 802c <foo\+0x2c> + 8024: e1a00000 nop @ .* + 8028: e1a00000 nop @ .* 802c: 0000000c .word 0x0000000c - 8030: e59f0004 ldr r0, \[pc, #4\] ; 803c <foo\+0x3c> - 8034: e1a00000 nop ; .* - 8038: e1a00000 nop ; .* + 8030: e59f0004 ldr r0, \[pc, #4\] @ 803c <foo\+0x3c> + 8034: e1a00000 nop @ .* + 8038: e1a00000 nop @ .* 803c: 0000000c .word 0x0000000c - 8040: e59f000c ldr r0, \[pc, #12\] ; 8054 <foo\+0x54> + 8040: e59f000c ldr r0, \[pc, #12\] @ 8054 <foo\+0x54> 8044: e08f0000 add r0, pc, r0 8048: e5901000 ldr r1, \[r0\] 804c: e1a00001 mov r0, r1 - 8050: e1a00000 nop ; .* + 8050: e1a00000 nop @ .* 8054: 000080f8 .word 0x000080f8 - 8058: e59f000c ldr r0, \[pc, #12\] ; 806c <foo\+0x6c> + 8058: e59f000c ldr r0, \[pc, #12\] @ 806c <foo\+0x6c> 805c: e08f0000 add r0, pc, r0 8060: e5901000 ldr r1, \[r0\] 8064: e1a00001 mov r0, r1 - 8068: e1a00000 nop ; .* + 8068: e1a00000 nop @ .* 806c: 000080e0 .word 0x000080e0 - 8070: e59f000c ldr r0, \[pc, #12\] ; 8084 <foo\+0x84> - 8074: e1a00000 nop ; .* - 8078: e1a00000 nop ; .* - 807c: e1a00000 nop ; .* - 8080: e1a00000 nop ; .* + 8070: e59f000c ldr r0, \[pc, #12\] @ 8084 <foo\+0x84> + 8074: e1a00000 nop @ .* + 8078: e1a00000 nop @ .* + 807c: e1a00000 nop @ .* + 8080: e1a00000 nop @ .* 8084: 0000000c .word 0x0000000c - 8088: e59f000c ldr r0, \[pc, #12\] ; 809c <foo\+0x9c> - 808c: e1a00000 nop ; .* - 8090: e1a00000 nop ; .* - 8094: e1a00000 nop ; .* - 8098: e1a00000 nop ; .* + 8088: e59f000c ldr r0, \[pc, #12\] @ 809c <foo\+0x9c> + 808c: e1a00000 nop @ .* + 8090: e1a00000 nop @ .* + 8094: e1a00000 nop @ .* + 8098: e1a00000 nop @ .* 809c: 0000000c .word 0x0000000c 000080a0 <bar>: - 80a0: 4801 ldr r0, \[pc, #4\] ; \(80a8 <bar\+0x8>\) + 80a0: 4801 ldr r0, \[pc, #4\] @ \(80a8 <bar\+0x8>\) 80a2: 4478 add r0, pc 80a4: 6800 ldr r0, \[r0, #0\] - 80a6: 46c0 nop ; .* + 80a6: 46c0 nop @ .* 80a8: 0000809e .word 0x0000809e - 80ac: 4801 ldr r0, \[pc, #4\] ; \(80b4 <bar\+0x14>\) + 80ac: 4801 ldr r0, \[pc, #4\] @ \(80b4 <bar\+0x14>\) 80ae: 4478 add r0, pc 80b0: 6800 ldr r0, \[r0, #0\] - 80b2: 46c0 nop ; .* + 80b2: 46c0 nop @ .* 80b4: 00008092 .word 0x00008092 - 80b8: 4801 ldr r0, \[pc, #4\] ; \(80c0 <bar\+0x20>\) + 80b8: 4801 ldr r0, \[pc, #4\] @ \(80c0 <bar\+0x20>\) 80ba: 4478 add r0, pc 80bc: 6800 ldr r0, \[r0, #0\] - 80be: 46c0 nop ; .* + 80be: 46c0 nop @ .* 80c0: 0000808a .word 0x0000808a - 80c4: 4801 ldr r0, \[pc, #4\] ; \(80cc <bar\+0x2c>\) - 80c6: 46c0 nop ; .* - 80c8: 46c0 nop ; .* - 80ca: 46c0 nop ; .* + 80c4: 4801 ldr r0, \[pc, #4\] @ \(80cc <bar\+0x2c>\) + 80c6: 46c0 nop @ .* + 80c8: 46c0 nop @ .* + 80ca: 46c0 nop @ .* 80cc: 0000000c .word 0x0000000c - 80d0: 4801 ldr r0, \[pc, #4\] ; \(80d8 <bar\+0x38>\) + 80d0: 4801 ldr r0, \[pc, #4\] @ \(80d8 <bar\+0x38>\) 80d2: bf00 nop 80d4: bf00 nop - 80d6: 46c0 nop ; .* + 80d6: 46c0 nop @ .* 80d8: 0000000c .word 0x0000000c - 80dc: 4801 ldr r0, \[pc, #4\] ; \(80e4 <bar\+0x44>\) + 80dc: 4801 ldr r0, \[pc, #4\] @ \(80e4 <bar\+0x44>\) 80de: bf00 nop 80e0: bf00 nop - 80e2: 46c0 nop ; .* + 80e2: 46c0 nop @ .* 80e4: 00000014 .word 0x00000014 - 80e8: 4802 ldr r0, \[pc, #8\] ; \(80f4 <bar\+0x54>\) + 80e8: 4802 ldr r0, \[pc, #8\] @ \(80f4 <bar\+0x54>\) 80ea: 4478 add r0, pc 80ec: 6801 ldr r1, \[r0, #0\] 80ee: 1c08 adds r0, r1, #0 - 80f0: 46c0 nop ; .* - 80f2: 46c0 nop ; .* + 80f0: 46c0 nop @ .* + 80f2: 46c0 nop @ .* 80f4: 00008056 .word 0x00008056 - 80f8: 4802 ldr r0, \[pc, #8\] ; \(8104 <bar\+0x64>\) + 80f8: 4802 ldr r0, \[pc, #8\] @ \(8104 <bar\+0x64>\) 80fa: 4478 add r0, pc 80fc: 6801 ldr r1, \[r0, #0\] 80fe: 4608 mov r0, r1 - 8100: 46c0 nop ; .* - 8102: 46c0 nop ; .* + 8100: 46c0 nop @ .* + 8102: 46c0 nop @ .* 8104: 00008046 .word 0x00008046 - 8108: 4802 ldr r0, \[pc, #8\] ; \(8114 <bar\+0x74>\) - 810a: 46c0 nop ; .* - 810c: 46c0 nop ; .* - 810e: 46c0 nop ; .* - 8110: 46c0 nop ; .* - 8112: 46c0 nop ; .* + 8108: 4802 ldr r0, \[pc, #8\] @ \(8114 <bar\+0x74>\) + 810a: 46c0 nop @ .* + 810c: 46c0 nop @ .* + 810e: 46c0 nop @ .* + 8110: 46c0 nop @ .* + 8112: 46c0 nop @ .* 8114: 0000000c .word 0x0000000c - 8118: 4802 ldr r0, \[pc, #8\] ; \(8124 <bar\+0x84>\) - 811a: 46c0 nop ; .* - 811c: 46c0 nop ; .* - 811e: 46c0 nop ; .* - 8120: 46c0 nop ; .* - 8122: 46c0 nop ; .* + 8118: 4802 ldr r0, \[pc, #8\] @ \(8124 <bar\+0x84>\) + 811a: 46c0 nop @ .* + 811c: 46c0 nop @ .* + 811e: 46c0 nop @ .* + 8120: 46c0 nop @ .* + 8122: 46c0 nop @ .* 8124: 0000000c .word 0x0000000c diff --git a/ld/testsuite/ld-arm/tls-descrelax-be8.d b/ld/testsuite/ld-arm/tls-descrelax-be8.d index 90a9633..1fb8fc1 100644 --- a/ld/testsuite/ld-arm/tls-descrelax-be8.d +++ b/ld/testsuite/ld-arm/tls-descrelax-be8.d @@ -6,103 +6,103 @@ start address 0x[0-9a-f]+ Disassembly of section .text: 00008000 <foo>: - 8000: e59f0004 ldr r0, \[pc, #4\] ; 800c <foo\+0xc> + 8000: e59f0004 ldr r0, \[pc, #4\] @ 800c <foo\+0xc> 8004: e79f0000 ldr r0, \[pc, r0\] 8008: e320f000 nop \{0\} 800c: 00008138 .word 0x00008138 - 8010: e59f0004 ldr r0, \[pc, #4\] ; 801c <foo\+0x1c> + 8010: e59f0004 ldr r0, \[pc, #4\] @ 801c <foo\+0x1c> 8014: e79f0000 ldr r0, \[pc, r0\] 8018: e320f000 nop \{0\} 801c: 00008128 .word 0x00008128 - 8020: e59f0004 ldr r0, \[pc, #4\] ; 802c <foo\+0x2c> + 8020: e59f0004 ldr r0, \[pc, #4\] @ 802c <foo\+0x2c> 8024: e320f000 nop \{0\} 8028: e320f000 nop \{0\} 802c: 0000000c .word 0x0000000c - 8030: e59f0004 ldr r0, \[pc, #4\] ; 803c <foo\+0x3c> - 8034: e1a00000 nop ; .* + 8030: e59f0004 ldr r0, \[pc, #4\] @ 803c <foo\+0x3c> + 8034: e1a00000 nop @ .* 8038: e320f000 nop \{0\} 803c: 0000000c .word 0x0000000c - 8040: e59f000c ldr r0, \[pc, #12\] ; 8054 <foo\+0x54> + 8040: e59f000c ldr r0, \[pc, #12\] @ 8054 <foo\+0x54> 8044: e08f0000 add r0, pc, r0 8048: e5901000 ldr r1, \[r0\] 804c: e1a00001 mov r0, r1 8050: e320f000 nop \{0\} 8054: 000080f8 .word 0x000080f8 - 8058: e59f000c ldr r0, \[pc, #12\] ; 806c <foo\+0x6c> + 8058: e59f000c ldr r0, \[pc, #12\] @ 806c <foo\+0x6c> 805c: e08f0000 add r0, pc, r0 8060: e5901000 ldr r1, \[r0\] 8064: e1a00001 mov r0, r1 8068: e320f000 nop \{0\} 806c: 000080e0 .word 0x000080e0 - 8070: e59f000c ldr r0, \[pc, #12\] ; 8084 <foo\+0x84> + 8070: e59f000c ldr r0, \[pc, #12\] @ 8084 <foo\+0x84> 8074: e320f000 nop \{0\} 8078: e320f000 nop \{0\} 807c: e320f000 nop \{0\} 8080: e320f000 nop \{0\} 8084: 0000000c .word 0x0000000c - 8088: e59f000c ldr r0, \[pc, #12\] ; 809c <foo\+0x9c> - 808c: e1a00000 nop ; .* - 8090: e1a00000 nop ; .* - 8094: e1a00000 nop ; .* + 8088: e59f000c ldr r0, \[pc, #12\] @ 809c <foo\+0x9c> + 808c: e1a00000 nop @ .* + 8090: e1a00000 nop @ .* + 8094: e1a00000 nop @ .* 8098: e320f000 nop \{0\} 809c: 0000000c .word 0x0000000c 000080a0 <bar>: - 80a0: 4801 ldr r0, \[pc, #4\] ; \(80a8 <bar\+0x8>\) + 80a0: 4801 ldr r0, \[pc, #4\] @ \(80a8 <bar\+0x8>\) 80a2: 4478 add r0, pc 80a4: 6800 ldr r0, \[r0, #0\] - 80a6: 46c0 nop ; .* + 80a6: 46c0 nop @ .* 80a8: 0000809e .word 0x0000809e - 80ac: 4801 ldr r0, \[pc, #4\] ; \(80b4 <bar\+0x14>\) + 80ac: 4801 ldr r0, \[pc, #4\] @ \(80b4 <bar\+0x14>\) 80ae: 4478 add r0, pc 80b0: 6800 ldr r0, \[r0, #0\] - 80b2: 46c0 nop ; \(mov r8, r8\) + 80b2: 46c0 nop @ \(mov r8, r8\) 80b4: 00008092 .word 0x00008092 - 80b8: 4801 ldr r0, \[pc, #4\] ; \(80c0 <bar\+0x20>\) + 80b8: 4801 ldr r0, \[pc, #4\] @ \(80c0 <bar\+0x20>\) 80ba: 4478 add r0, pc 80bc: 6800 ldr r0, \[r0, #0\] - 80be: 46c0 nop ; \(mov r8, r8\) + 80be: 46c0 nop @ \(mov r8, r8\) 80c0: 0000808a .word 0x0000808a - 80c4: 4801 ldr r0, \[pc, #4\] ; \(80cc <bar\+0x2c>\) - 80c6: 46c0 nop ; \(mov r8, r8\) - 80c8: 46c0 nop ; \(mov r8, r8\) + 80c4: 4801 ldr r0, \[pc, #4\] @ \(80cc <bar\+0x2c>\) + 80c6: 46c0 nop @ \(mov r8, r8\) + 80c8: 46c0 nop @ \(mov r8, r8\) 80ca: bf00 nop 80cc: 0000000c .word 0x0000000c - 80d0: 4801 ldr r0, \[pc, #4\] ; \(80d8 <bar\+0x38>\) + 80d0: 4801 ldr r0, \[pc, #4\] @ \(80d8 <bar\+0x38>\) 80d2: (f3af 8000)|(bf00 ) nop(.w)? #... - 80d6: 46c0 nop ; \(mov r8, r8\) + 80d6: 46c0 nop @ \(mov r8, r8\) 80d8: 0000000c .word 0x0000000c - 80dc: 4801 ldr r0, \[pc, #4\] ; \(80e4 <bar\+0x44>\) + 80dc: 4801 ldr r0, \[pc, #4\] @ \(80e4 <bar\+0x44>\) 80de: (f3af 8000)|(bf00 ) nop(.w)? #... - 80e2: 46c0 nop ; \(mov r8, r8\) + 80e2: 46c0 nop @ \(mov r8, r8\) 80e4: 00000014 .word 0x00000014 - 80e8: 4802 ldr r0, \[pc, #8\] ; \(80f4 <bar\+0x54>\) + 80e8: 4802 ldr r0, \[pc, #8\] @ \(80f4 <bar\+0x54>\) 80ea: 4478 add r0, pc 80ec: 6801 ldr r1, \[r0, #0\] 80ee: 1c08 adds r0, r1, #0 - 80f0: 46c0 nop ; \(mov r8, r8\) + 80f0: 46c0 nop @ \(mov r8, r8\) 80f2: bf00 nop 80f4: 00008056 .word 0x00008056 - 80f8: 4802 ldr r0, \[pc, #8\] ; \(8104 <bar\+0x64>\) + 80f8: 4802 ldr r0, \[pc, #8\] @ \(8104 <bar\+0x64>\) 80fa: 4478 add r0, pc 80fc: 6801 ldr r1, \[r0, #0\] 80fe: 4608 mov r0, r1 - 8100: 46c0 nop ; \(mov r8, r8\) + 8100: 46c0 nop @ \(mov r8, r8\) 8102: bf00 nop 8104: 00008046 .word 0x00008046 - 8108: 4802 ldr r0, \[pc, #8\] ; \(8114 <bar\+0x74>\) - 810a: 46c0 nop ; \(mov r8, r8\) - 810c: 46c0 nop ; \(mov r8, r8\) - 810e: 46c0 nop ; \(mov r8, r8\) - 8110: 46c0 nop ; \(mov r8, r8\) + 8108: 4802 ldr r0, \[pc, #8\] @ \(8114 <bar\+0x74>\) + 810a: 46c0 nop @ \(mov r8, r8\) + 810c: 46c0 nop @ \(mov r8, r8\) + 810e: 46c0 nop @ \(mov r8, r8\) + 8110: 46c0 nop @ \(mov r8, r8\) 8112: bf00 nop 8114: 0000000c .word 0x0000000c - 8118: 4802 ldr r0, \[pc, #8\] ; \(8124 <bar\+0x84>\) - 811a: 46c0 nop ; \(mov r8, r8\) - 811c: 46c0 nop ; \(mov r8, r8\) - 811e: 46c0 nop ; \(mov r8, r8\) - 8120: 46c0 nop ; \(mov r8, r8\) + 8118: 4802 ldr r0, \[pc, #8\] @ \(8124 <bar\+0x84>\) + 811a: 46c0 nop @ \(mov r8, r8\) + 811c: 46c0 nop @ \(mov r8, r8\) + 811e: 46c0 nop @ \(mov r8, r8\) + 8120: 46c0 nop @ \(mov r8, r8\) 8122: bf00 nop 8124: 0000000c .word 0x0000000c diff --git a/ld/testsuite/ld-arm/tls-descrelax-v7.d b/ld/testsuite/ld-arm/tls-descrelax-v7.d index 90a9633..1fb8fc1 100644 --- a/ld/testsuite/ld-arm/tls-descrelax-v7.d +++ b/ld/testsuite/ld-arm/tls-descrelax-v7.d @@ -6,103 +6,103 @@ start address 0x[0-9a-f]+ Disassembly of section .text: 00008000 <foo>: - 8000: e59f0004 ldr r0, \[pc, #4\] ; 800c <foo\+0xc> + 8000: e59f0004 ldr r0, \[pc, #4\] @ 800c <foo\+0xc> 8004: e79f0000 ldr r0, \[pc, r0\] 8008: e320f000 nop \{0\} 800c: 00008138 .word 0x00008138 - 8010: e59f0004 ldr r0, \[pc, #4\] ; 801c <foo\+0x1c> + 8010: e59f0004 ldr r0, \[pc, #4\] @ 801c <foo\+0x1c> 8014: e79f0000 ldr r0, \[pc, r0\] 8018: e320f000 nop \{0\} 801c: 00008128 .word 0x00008128 - 8020: e59f0004 ldr r0, \[pc, #4\] ; 802c <foo\+0x2c> + 8020: e59f0004 ldr r0, \[pc, #4\] @ 802c <foo\+0x2c> 8024: e320f000 nop \{0\} 8028: e320f000 nop \{0\} 802c: 0000000c .word 0x0000000c - 8030: e59f0004 ldr r0, \[pc, #4\] ; 803c <foo\+0x3c> - 8034: e1a00000 nop ; .* + 8030: e59f0004 ldr r0, \[pc, #4\] @ 803c <foo\+0x3c> + 8034: e1a00000 nop @ .* 8038: e320f000 nop \{0\} 803c: 0000000c .word 0x0000000c - 8040: e59f000c ldr r0, \[pc, #12\] ; 8054 <foo\+0x54> + 8040: e59f000c ldr r0, \[pc, #12\] @ 8054 <foo\+0x54> 8044: e08f0000 add r0, pc, r0 8048: e5901000 ldr r1, \[r0\] 804c: e1a00001 mov r0, r1 8050: e320f000 nop \{0\} 8054: 000080f8 .word 0x000080f8 - 8058: e59f000c ldr r0, \[pc, #12\] ; 806c <foo\+0x6c> + 8058: e59f000c ldr r0, \[pc, #12\] @ 806c <foo\+0x6c> 805c: e08f0000 add r0, pc, r0 8060: e5901000 ldr r1, \[r0\] 8064: e1a00001 mov r0, r1 8068: e320f000 nop \{0\} 806c: 000080e0 .word 0x000080e0 - 8070: e59f000c ldr r0, \[pc, #12\] ; 8084 <foo\+0x84> + 8070: e59f000c ldr r0, \[pc, #12\] @ 8084 <foo\+0x84> 8074: e320f000 nop \{0\} 8078: e320f000 nop \{0\} 807c: e320f000 nop \{0\} 8080: e320f000 nop \{0\} 8084: 0000000c .word 0x0000000c - 8088: e59f000c ldr r0, \[pc, #12\] ; 809c <foo\+0x9c> - 808c: e1a00000 nop ; .* - 8090: e1a00000 nop ; .* - 8094: e1a00000 nop ; .* + 8088: e59f000c ldr r0, \[pc, #12\] @ 809c <foo\+0x9c> + 808c: e1a00000 nop @ .* + 8090: e1a00000 nop @ .* + 8094: e1a00000 nop @ .* 8098: e320f000 nop \{0\} 809c: 0000000c .word 0x0000000c 000080a0 <bar>: - 80a0: 4801 ldr r0, \[pc, #4\] ; \(80a8 <bar\+0x8>\) + 80a0: 4801 ldr r0, \[pc, #4\] @ \(80a8 <bar\+0x8>\) 80a2: 4478 add r0, pc 80a4: 6800 ldr r0, \[r0, #0\] - 80a6: 46c0 nop ; .* + 80a6: 46c0 nop @ .* 80a8: 0000809e .word 0x0000809e - 80ac: 4801 ldr r0, \[pc, #4\] ; \(80b4 <bar\+0x14>\) + 80ac: 4801 ldr r0, \[pc, #4\] @ \(80b4 <bar\+0x14>\) 80ae: 4478 add r0, pc 80b0: 6800 ldr r0, \[r0, #0\] - 80b2: 46c0 nop ; \(mov r8, r8\) + 80b2: 46c0 nop @ \(mov r8, r8\) 80b4: 00008092 .word 0x00008092 - 80b8: 4801 ldr r0, \[pc, #4\] ; \(80c0 <bar\+0x20>\) + 80b8: 4801 ldr r0, \[pc, #4\] @ \(80c0 <bar\+0x20>\) 80ba: 4478 add r0, pc 80bc: 6800 ldr r0, \[r0, #0\] - 80be: 46c0 nop ; \(mov r8, r8\) + 80be: 46c0 nop @ \(mov r8, r8\) 80c0: 0000808a .word 0x0000808a - 80c4: 4801 ldr r0, \[pc, #4\] ; \(80cc <bar\+0x2c>\) - 80c6: 46c0 nop ; \(mov r8, r8\) - 80c8: 46c0 nop ; \(mov r8, r8\) + 80c4: 4801 ldr r0, \[pc, #4\] @ \(80cc <bar\+0x2c>\) + 80c6: 46c0 nop @ \(mov r8, r8\) + 80c8: 46c0 nop @ \(mov r8, r8\) 80ca: bf00 nop 80cc: 0000000c .word 0x0000000c - 80d0: 4801 ldr r0, \[pc, #4\] ; \(80d8 <bar\+0x38>\) + 80d0: 4801 ldr r0, \[pc, #4\] @ \(80d8 <bar\+0x38>\) 80d2: (f3af 8000)|(bf00 ) nop(.w)? #... - 80d6: 46c0 nop ; \(mov r8, r8\) + 80d6: 46c0 nop @ \(mov r8, r8\) 80d8: 0000000c .word 0x0000000c - 80dc: 4801 ldr r0, \[pc, #4\] ; \(80e4 <bar\+0x44>\) + 80dc: 4801 ldr r0, \[pc, #4\] @ \(80e4 <bar\+0x44>\) 80de: (f3af 8000)|(bf00 ) nop(.w)? #... - 80e2: 46c0 nop ; \(mov r8, r8\) + 80e2: 46c0 nop @ \(mov r8, r8\) 80e4: 00000014 .word 0x00000014 - 80e8: 4802 ldr r0, \[pc, #8\] ; \(80f4 <bar\+0x54>\) + 80e8: 4802 ldr r0, \[pc, #8\] @ \(80f4 <bar\+0x54>\) 80ea: 4478 add r0, pc 80ec: 6801 ldr r1, \[r0, #0\] 80ee: 1c08 adds r0, r1, #0 - 80f0: 46c0 nop ; \(mov r8, r8\) + 80f0: 46c0 nop @ \(mov r8, r8\) 80f2: bf00 nop 80f4: 00008056 .word 0x00008056 - 80f8: 4802 ldr r0, \[pc, #8\] ; \(8104 <bar\+0x64>\) + 80f8: 4802 ldr r0, \[pc, #8\] @ \(8104 <bar\+0x64>\) 80fa: 4478 add r0, pc 80fc: 6801 ldr r1, \[r0, #0\] 80fe: 4608 mov r0, r1 - 8100: 46c0 nop ; \(mov r8, r8\) + 8100: 46c0 nop @ \(mov r8, r8\) 8102: bf00 nop 8104: 00008046 .word 0x00008046 - 8108: 4802 ldr r0, \[pc, #8\] ; \(8114 <bar\+0x74>\) - 810a: 46c0 nop ; \(mov r8, r8\) - 810c: 46c0 nop ; \(mov r8, r8\) - 810e: 46c0 nop ; \(mov r8, r8\) - 8110: 46c0 nop ; \(mov r8, r8\) + 8108: 4802 ldr r0, \[pc, #8\] @ \(8114 <bar\+0x74>\) + 810a: 46c0 nop @ \(mov r8, r8\) + 810c: 46c0 nop @ \(mov r8, r8\) + 810e: 46c0 nop @ \(mov r8, r8\) + 8110: 46c0 nop @ \(mov r8, r8\) 8112: bf00 nop 8114: 0000000c .word 0x0000000c - 8118: 4802 ldr r0, \[pc, #8\] ; \(8124 <bar\+0x84>\) - 811a: 46c0 nop ; \(mov r8, r8\) - 811c: 46c0 nop ; \(mov r8, r8\) - 811e: 46c0 nop ; \(mov r8, r8\) - 8120: 46c0 nop ; \(mov r8, r8\) + 8118: 4802 ldr r0, \[pc, #8\] @ \(8124 <bar\+0x84>\) + 811a: 46c0 nop @ \(mov r8, r8\) + 811c: 46c0 nop @ \(mov r8, r8\) + 811e: 46c0 nop @ \(mov r8, r8\) + 8120: 46c0 nop @ \(mov r8, r8\) 8122: bf00 nop 8124: 0000000c .word 0x0000000c diff --git a/ld/testsuite/ld-arm/tls-descrelax.d b/ld/testsuite/ld-arm/tls-descrelax.d index c15c6ee..5d8c16f 100644 --- a/ld/testsuite/ld-arm/tls-descrelax.d +++ b/ld/testsuite/ld-arm/tls-descrelax.d @@ -6,103 +6,103 @@ start address 0x[0-9a-f]+ Disassembly of section .text: 00008000 <foo>: - 8000: e59f0004 ldr r0, \[pc, #4\] ; 800c <foo\+0xc> + 8000: e59f0004 ldr r0, \[pc, #4\] @ 800c <foo\+0xc> 8004: e79f0000 ldr r0, \[pc, r0\] - 8008: e1a00000 nop ; \(mov r0, r0\) + 8008: e1a00000 nop @ \(mov r0, r0\) 800c: 00008138 .word 0x00008138 - 8010: e59f0004 ldr r0, \[pc, #4\] ; 801c <foo\+0x1c> + 8010: e59f0004 ldr r0, \[pc, #4\] @ 801c <foo\+0x1c> 8014: e79f0000 ldr r0, \[pc, r0\] - 8018: e1a00000 nop ; \(mov r0, r0\) + 8018: e1a00000 nop @ \(mov r0, r0\) 801c: 00008128 .word 0x00008128 - 8020: e59f0004 ldr r0, \[pc, #4\] ; 802c <foo\+0x2c> - 8024: e1a00000 nop ; \(mov r0, r0\) - 8028: e1a00000 nop ; \(mov r0, r0\) + 8020: e59f0004 ldr r0, \[pc, #4\] @ 802c <foo\+0x2c> + 8024: e1a00000 nop @ \(mov r0, r0\) + 8028: e1a00000 nop @ \(mov r0, r0\) 802c: 0000000c .word 0x0000000c - 8030: e59f0004 ldr r0, \[pc, #4\] ; 803c <foo\+0x3c> - 8034: e1a00000 nop ; \(mov r0, r0\) - 8038: e1a00000 nop ; \(mov r0, r0\) + 8030: e59f0004 ldr r0, \[pc, #4\] @ 803c <foo\+0x3c> + 8034: e1a00000 nop @ \(mov r0, r0\) + 8038: e1a00000 nop @ \(mov r0, r0\) 803c: 0000000c .word 0x0000000c - 8040: e59f000c ldr r0, \[pc, #12\] ; 8054 <foo\+0x54> + 8040: e59f000c ldr r0, \[pc, #12\] @ 8054 <foo\+0x54> 8044: e08f0000 add r0, pc, r0 8048: e5901000 ldr r1, \[r0\] 804c: e1a00001 mov r0, r1 - 8050: e1a00000 nop ; \(mov r0, r0\) + 8050: e1a00000 nop @ \(mov r0, r0\) 8054: 000080f8 .word 0x000080f8 - 8058: e59f000c ldr r0, \[pc, #12\] ; 806c <foo\+0x6c> + 8058: e59f000c ldr r0, \[pc, #12\] @ 806c <foo\+0x6c> 805c: e08f0000 add r0, pc, r0 8060: e5901000 ldr r1, \[r0\] 8064: e1a00001 mov r0, r1 - 8068: e1a00000 nop ; \(mov r0, r0\) + 8068: e1a00000 nop @ \(mov r0, r0\) 806c: 000080e0 .word 0x000080e0 - 8070: e59f000c ldr r0, \[pc, #12\] ; 8084 <foo\+0x84> - 8074: e1a00000 nop ; \(mov r0, r0\) - 8078: e1a00000 nop ; \(mov r0, r0\) - 807c: e1a00000 nop ; \(mov r0, r0\) - 8080: e1a00000 nop ; \(mov r0, r0\) + 8070: e59f000c ldr r0, \[pc, #12\] @ 8084 <foo\+0x84> + 8074: e1a00000 nop @ \(mov r0, r0\) + 8078: e1a00000 nop @ \(mov r0, r0\) + 807c: e1a00000 nop @ \(mov r0, r0\) + 8080: e1a00000 nop @ \(mov r0, r0\) 8084: 0000000c .word 0x0000000c - 8088: e59f000c ldr r0, \[pc, #12\] ; 809c <foo\+0x9c> - 808c: e1a00000 nop ; \(mov r0, r0\) - 8090: e1a00000 nop ; \(mov r0, r0\) - 8094: e1a00000 nop ; \(mov r0, r0\) - 8098: e1a00000 nop ; \(mov r0, r0\) + 8088: e59f000c ldr r0, \[pc, #12\] @ 809c <foo\+0x9c> + 808c: e1a00000 nop @ \(mov r0, r0\) + 8090: e1a00000 nop @ \(mov r0, r0\) + 8094: e1a00000 nop @ \(mov r0, r0\) + 8098: e1a00000 nop @ \(mov r0, r0\) 809c: 0000000c .word 0x0000000c 000080a0 <bar>: - 80a0: 4801 ldr r0, \[pc, #4\] ; \(80a8 <bar\+0x8>\) + 80a0: 4801 ldr r0, \[pc, #4\] @ \(80a8 <bar\+0x8>\) 80a2: 4478 add r0, pc 80a4: 6800 ldr r0, \[r0, #0\] - 80a6: 46c0 nop ; \(mov r8, r8\) + 80a6: 46c0 nop @ \(mov r8, r8\) 80a8: 0000809e .word 0x0000809e - 80ac: 4801 ldr r0, \[pc, #4\] ; \(80b4 <bar\+0x14>\) + 80ac: 4801 ldr r0, \[pc, #4\] @ \(80b4 <bar\+0x14>\) 80ae: 4478 add r0, pc 80b0: 6800 ldr r0, \[r0, #0\] - 80b2: 46c0 nop ; \(mov r8, r8\) + 80b2: 46c0 nop @ \(mov r8, r8\) 80b4: 00008092 .word 0x00008092 - 80b8: 4801 ldr r0, \[pc, #4\] ; \(80c0 <bar\+0x20>\) + 80b8: 4801 ldr r0, \[pc, #4\] @ \(80c0 <bar\+0x20>\) 80ba: 4478 add r0, pc 80bc: 6800 ldr r0, \[r0, #0\] - 80be: 46c0 nop ; \(mov r8, r8\) + 80be: 46c0 nop @ \(mov r8, r8\) 80c0: 0000808a .word 0x0000808a - 80c4: 4801 ldr r0, \[pc, #4\] ; \(80cc <bar\+0x2c>\) - 80c6: 46c0 nop ; \(mov r8, r8\) - 80c8: 46c0 nop ; \(mov r8, r8\) - 80ca: 46c0 nop ; \(mov r8, r8\) + 80c4: 4801 ldr r0, \[pc, #4\] @ \(80cc <bar\+0x2c>\) + 80c6: 46c0 nop @ \(mov r8, r8\) + 80c8: 46c0 nop @ \(mov r8, r8\) + 80ca: 46c0 nop @ \(mov r8, r8\) 80cc: 0000000c .word 0x0000000c - 80d0: 4801 ldr r0, \[pc, #4\] ; \(80d8 <bar\+0x38>\) + 80d0: 4801 ldr r0, \[pc, #4\] @ \(80d8 <bar\+0x38>\) 80d2: bf00 nop 80d4: bf00 nop - 80d6: 46c0 nop ; \(mov r8, r8\) + 80d6: 46c0 nop @ \(mov r8, r8\) 80d8: 0000000c .word 0x0000000c - 80dc: 4801 ldr r0, \[pc, #4\] ; \(80e4 <bar\+0x44>\) + 80dc: 4801 ldr r0, \[pc, #4\] @ \(80e4 <bar\+0x44>\) 80de: bf00 nop 80e0: bf00 nop - 80e2: 46c0 nop ; \(mov r8, r8\) + 80e2: 46c0 nop @ \(mov r8, r8\) 80e4: 00000014 .word 0x00000014 - 80e8: 4802 ldr r0, \[pc, #8\] ; \(80f4 <bar\+0x54>\) + 80e8: 4802 ldr r0, \[pc, #8\] @ \(80f4 <bar\+0x54>\) 80ea: 4478 add r0, pc 80ec: 6801 ldr r1, \[r0, #0\] 80ee: 1c08 adds r0, r1, #0 - 80f0: 46c0 nop ; \(mov r8, r8\) - 80f2: 46c0 nop ; \(mov r8, r8\) + 80f0: 46c0 nop @ \(mov r8, r8\) + 80f2: 46c0 nop @ \(mov r8, r8\) 80f4: 00008056 .word 0x00008056 - 80f8: 4802 ldr r0, \[pc, #8\] ; \(8104 <bar\+0x64>\) + 80f8: 4802 ldr r0, \[pc, #8\] @ \(8104 <bar\+0x64>\) 80fa: 4478 add r0, pc 80fc: 6801 ldr r1, \[r0, #0\] 80fe: 4608 mov r0, r1 - 8100: 46c0 nop ; \(mov r8, r8\) - 8102: 46c0 nop ; \(mov r8, r8\) + 8100: 46c0 nop @ \(mov r8, r8\) + 8102: 46c0 nop @ \(mov r8, r8\) 8104: 00008046 .word 0x00008046 - 8108: 4802 ldr r0, \[pc, #8\] ; \(8114 <bar\+0x74>\) - 810a: 46c0 nop ; \(mov r8, r8\) - 810c: 46c0 nop ; \(mov r8, r8\) - 810e: 46c0 nop ; \(mov r8, r8\) - 8110: 46c0 nop ; \(mov r8, r8\) - 8112: 46c0 nop ; \(mov r8, r8\) + 8108: 4802 ldr r0, \[pc, #8\] @ \(8114 <bar\+0x74>\) + 810a: 46c0 nop @ \(mov r8, r8\) + 810c: 46c0 nop @ \(mov r8, r8\) + 810e: 46c0 nop @ \(mov r8, r8\) + 8110: 46c0 nop @ \(mov r8, r8\) + 8112: 46c0 nop @ \(mov r8, r8\) 8114: 0000000c .word 0x0000000c - 8118: 4802 ldr r0, \[pc, #8\] ; \(8124 <bar\+0x84>\) - 811a: 46c0 nop ; \(mov r8, r8\) - 811c: 46c0 nop ; \(mov r8, r8\) - 811e: 46c0 nop ; \(mov r8, r8\) - 8120: 46c0 nop ; \(mov r8, r8\) - 8122: 46c0 nop ; \(mov r8, r8\) + 8118: 4802 ldr r0, \[pc, #8\] @ \(8124 <bar\+0x84>\) + 811a: 46c0 nop @ \(mov r8, r8\) + 811c: 46c0 nop @ \(mov r8, r8\) + 811e: 46c0 nop @ \(mov r8, r8\) + 8120: 46c0 nop @ \(mov r8, r8\) + 8122: 46c0 nop @ \(mov r8, r8\) 8124: 0000000c .word 0x0000000c diff --git a/ld/testsuite/ld-arm/tls-descseq.d b/ld/testsuite/ld-arm/tls-descseq.d index 85e8150..87ea9ed 100644 --- a/ld/testsuite/ld-arm/tls-descseq.d +++ b/ld/testsuite/ld-arm/tls-descseq.d @@ -7,17 +7,17 @@ start address 0x[0-9a-f]+ Disassembly of section .plt: [0-9a-f]+ <.plt>: - [0-9a-f]+: e52de004 push {lr} ; .* - [0-9a-f]+: e59fe004 ldr lr, \[pc, #4\] ; .* + [0-9a-f]+: e52de004 push {lr} @ .* + [0-9a-f]+: e59fe004 ldr lr, \[pc, #4\] @ .* [0-9a-f]+: e08fe00e add lr, pc, lr [0-9a-f]+: e5bef008 ldr pc, \[lr, #8\]! [0-9a-f]+: 000080e4 .word 0x000080e4 [0-9a-f]+: e08e0000 add r0, lr, r0 [0-9a-f]+: e5901004 ldr r1, \[r0, #4\] [0-9a-f]+: e12fff11 bx r1 - [0-9a-f]+: e52d2004 push {r2} ; .* - [0-9a-f]+: e59f200c ldr r2, \[pc, #12\] ; .* - [0-9a-f]+: e59f100c ldr r1, \[pc, #12\] ; .* + [0-9a-f]+: e52d2004 push {r2} @ .* + [0-9a-f]+: e59f200c ldr r2, \[pc, #12\] @ .* + [0-9a-f]+: e59f100c ldr r1, \[pc, #12\] @ .* [0-9a-f]+: e79f2002 ldr r2, \[pc, r2\] [0-9a-f]+: e081100f add r1, r1, pc [0-9a-f]+: e12fff12 bx r2 @@ -27,18 +27,18 @@ Disassembly of section .plt: Disassembly of section .text: [0-9a-f]+ <foo>: - [0-9a-f]+: e59f000c ldr r0, \[pc, #12\] ; .* + [0-9a-f]+: e59f000c ldr r0, \[pc, #12\] @ .* [0-9a-f]+: e08f0000 add r0, pc, r0 [0-9a-f]+: e5901004 ldr r1, \[r0, #4\] [0-9a-f]+: e12fff31 blx r1 - [0-9a-f]+: e1a00000 nop ; .* + [0-9a-f]+: e1a00000 nop @ .* [0-9a-f]+: 000080b4 .word 0x000080b4 [0-9a-f]+ <bar>: - [0-9a-f]+: 4802 ldr r0, \[pc, #8\] ; .* + [0-9a-f]+: 4802 ldr r0, \[pc, #8\] @ .* [0-9a-f]+: 4478 add r0, pc [0-9a-f]+: 6841 ldr r1, \[r0, #4\] [0-9a-f]+: 4788 blx r1 - [0-9a-f]+: 46c0 nop ; .* - [0-9a-f]+: 46c0 nop ; .* + [0-9a-f]+: 46c0 nop @ .* + [0-9a-f]+: 46c0 nop @ .* [0-9a-f]+: 000080a2 .word 0x000080a2 diff --git a/ld/testsuite/ld-arm/tls-gdesc-neg.d b/ld/testsuite/ld-arm/tls-gdesc-neg.d index f4debb1..a09e158 100644 --- a/ld/testsuite/ld-arm/tls-gdesc-neg.d +++ b/ld/testsuite/ld-arm/tls-gdesc-neg.d @@ -7,17 +7,17 @@ start address 0x[0-9a-f]+ Disassembly of section .plt: 00008164 <.plt>: - 8164: e52de004 push {lr} ; .* - 8168: e59fe004 ldr lr, \[pc, #4\] ; .* + 8164: e52de004 push {lr} @ .* + 8168: e59fe004 ldr lr, \[pc, #4\] @ .* 816c: e08fe00e add lr, pc, lr 8170: e5bef008 ldr pc, \[lr, #8\]! 8174: 000080d8 .word 0x000080d8 8178: e08e0000 add r0, lr, r0 817c: e5901004 ldr r1, \[r0, #4\] 8180: e12fff11 bx r1 - 8184: e52d2004 push {r2} ; .* - 8188: e59f200c ldr r2, \[pc, #12\] ; .* - 818c: e59f100c ldr r1, \[pc, #12\] ; .* + 8184: e52d2004 push {r2} @ .* + 8188: e59f200c ldr r2, \[pc, #12\] @ .* + 818c: e59f100c ldr r1, \[pc, #12\] @ .* 8190: e79f2002 ldr r2, \[pc, r2\] 8194: e081100f add r1, r1, pc 8198: e12fff12 bx r2 @@ -27,13 +27,13 @@ Disassembly of section .plt: Disassembly of section .text: 000081a4 <foo>: - 81a4: e59f0000 ldr r0, \[pc\] ; .* + 81a4: e59f0000 ldr r0, \[pc\] @ .* 81a8: ea000000 b 81b0 <foo\+0xc> 81ac: 000080a4 .word 0x000080a4 81b0: fafffff0 blx 8178 <.plt\+0x14> 000081b4 <bar>: - 81b4: 4800 ldr r0, \[pc, #0\] ; .* + 81b4: 4800 ldr r0, \[pc, #0\] @ .* 81b6: e001 b.n 81bc <bar\+0x8> 81b8: 00008097 .word 0x00008097 81bc: f7ff efdc blx 8178 <.plt\+0x14> diff --git a/ld/testsuite/ld-arm/tls-gdesc.d b/ld/testsuite/ld-arm/tls-gdesc.d index 84ba48f..b11735a 100644 --- a/ld/testsuite/ld-arm/tls-gdesc.d +++ b/ld/testsuite/ld-arm/tls-gdesc.d @@ -7,17 +7,17 @@ start address 0x[0-9a-f]+ Disassembly of section .plt: [0-9a-f]+ <.plt>: - [0-9a-f]+: e52de004 push {lr} ; .* - [0-9a-f]+: e59fe004 ldr lr, \[pc, #4\] ; .* + [0-9a-f]+: e52de004 push {lr} @ .* + [0-9a-f]+: e59fe004 ldr lr, \[pc, #4\] @ .* [0-9a-f]+: e08fe00e add lr, pc, lr [0-9a-f]+: e5bef008 ldr pc, \[lr, #8\]! [0-9a-f]+: 000080e8 .word 0x000080e8 [0-9a-f]+: e08e0000 add r0, lr, r0 [0-9a-f]+: e5901004 ldr r1, \[r0, #4\] [0-9a-f]+: e12fff11 bx r1 - [0-9a-f]+: e52d2004 push {r2} ; .* - [0-9a-f]+: e59f200c ldr r2, \[pc, #12\] ; .* - [0-9a-f]+: e59f100c ldr r1, \[pc, #12\] ; .* + [0-9a-f]+: e52d2004 push {r2} @ .* + [0-9a-f]+: e59f200c ldr r2, \[pc, #12\] @ .* + [0-9a-f]+: e59f100c ldr r1, \[pc, #12\] @ .* [0-9a-f]+: e79f2002 ldr r2, \[pc, r2\] [0-9a-f]+: e081100f add r1, r1, pc [0-9a-f]+: e12fff12 bx r2 @@ -26,17 +26,17 @@ Disassembly of section .plt: Disassembly of section .text: [0-9a-f]+ <foo>: - [0-9a-f]+: e59f0004 ldr r0, \[pc, #4\] ; .* + [0-9a-f]+: e59f0004 ldr r0, \[pc, #4\] @ .* [0-9a-f]+: fafffff2 blx [0-9a-f]+ .* - [0-9a-f]+: e1a00000 nop ; .* + [0-9a-f]+: e1a00000 nop @ .* [0-9a-f]+: 000080c4 .word 0x000080c4 [0-9a-f]+ <bar>: - [0-9a-f]+: 4801 ldr r0, \[pc, #4\] ; .* + [0-9a-f]+: 4801 ldr r0, \[pc, #4\] @ .* [0-9a-f]+: f7ff efe0 blx [0-9a-f]+ .* - [0-9a-f]+: 46c0 nop ; .* + [0-9a-f]+: 46c0 nop @ .* [0-9a-f]+: 000080b5 .word 0x000080b5 - [0-9a-f]+: 4801 ldr r0, \[pc, #4\] ; .* + [0-9a-f]+: 4801 ldr r0, \[pc, #4\] @ .* [0-9a-f]+: f7ff efda blx [0-9a-f]+ .* - [0-9a-f]+: 46c0 nop ; .* + [0-9a-f]+: 46c0 nop @ .* [0-9a-f]+: 000080a1 .word 0x000080a1 diff --git a/ld/testsuite/ld-arm/tls-gdierelax.d b/ld/testsuite/ld-arm/tls-gdierelax.d index 6f79c80..ab6d181 100644 --- a/ld/testsuite/ld-arm/tls-gdierelax.d +++ b/ld/testsuite/ld-arm/tls-gdierelax.d @@ -7,14 +7,14 @@ start address 0x[0-9a-f]+ Disassembly of section .text: [0-9a-f]+ <foo>: - [0-9a-f]+: e59f0004 ldr r0, \[pc, #4\] ; .* + [0-9a-f]+: e59f0004 ldr r0, \[pc, #4\] @ .* [0-9a-f]+: e79f0000 ldr r0, \[pc, r0\] - [0-9a-f]+: e1a00000 nop ; .* + [0-9a-f]+: e1a00000 nop @ .* [0-9a-f]+: 00008020 .word 0x00008020 [0-9a-f]+ <bar>: - [0-9a-f]+: 4801 ldr r0, \[pc, #4\] ; .* + [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]+: 46c0 nop @ .* [0-9a-f]+: 00008016 .word 0x00008016 diff --git a/ld/testsuite/ld-arm/tls-gdierelax2.d b/ld/testsuite/ld-arm/tls-gdierelax2.d index 565f191..fad784f 100644 --- a/ld/testsuite/ld-arm/tls-gdierelax2.d +++ b/ld/testsuite/ld-arm/tls-gdierelax2.d @@ -7,17 +7,17 @@ start address 0x[0-9a-f]+ Disassembly of section .text: [0-9a-f]+ <foo>: - [0-9a-f]+: e1a00000 nop ; .* - [0-9a-f]+: e59f0004 ldr r0, \[pc, #4\] ; .* + [0-9a-f]+: e1a00000 nop @ .* + [0-9a-f]+: e59f0004 ldr r0, \[pc, #4\] @ .* [0-9a-f]+: e79f0000 ldr r0, \[pc, r0\] - [0-9a-f]+: e1a00000 nop ; .* + [0-9a-f]+: e1a00000 nop @ .* [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]+: 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]+: 46c0 nop @ .* [0-9a-f]+: 00008092 .word 0x00008092 [0-9a-f]+: 00008094 .word 0x00008094 diff --git a/ld/testsuite/ld-arm/tls-gdlerelax.d b/ld/testsuite/ld-arm/tls-gdlerelax.d index da3891e..a931350 100644 --- a/ld/testsuite/ld-arm/tls-gdlerelax.d +++ b/ld/testsuite/ld-arm/tls-gdlerelax.d @@ -7,7 +7,7 @@ start address 0x[0-9a-f]+ Disassembly of section .text: [0-9a-f]+ <foo>: - [0-9a-f]+: e1a00000 nop ; .* - [0-9a-f]+: e1a00000 nop ; .* + [0-9a-f]+: e1a00000 nop @ .* + [0-9a-f]+: e1a00000 nop @ .* [0-9a-f]+: e1a0f00e mov pc, lr [0-9a-f]+: 00000008 .word 0x00000008 diff --git a/ld/testsuite/ld-arm/tls-lib-loc.d b/ld/testsuite/ld-arm/tls-lib-loc.d index 9b64747..b1e4f97 100644 --- a/ld/testsuite/ld-arm/tls-lib-loc.d +++ b/ld/testsuite/ld-arm/tls-lib-loc.d @@ -7,17 +7,17 @@ start address 0x.* Disassembly of section .plt: [0-9a-f]+ <.plt>: - [0-9a-f]+: e52de004 push {lr} ; .* - [0-9a-f]+: e59fe004 ldr lr, \[pc, #4\] ; 8128 .* + [0-9a-f]+: e52de004 push {lr} @ .* + [0-9a-f]+: e59fe004 ldr lr, \[pc, #4\] @ 8128 .* [0-9a-f]+: e08fe00e add lr, pc, lr [0-9a-f]+: e5bef008 ldr pc, \[lr, #8\]! 8128: 000080cc .word 0x000080cc 812c: e08e0000 add r0, lr, r0 [0-9a-f]+: e5901004 ldr r1, \[r0, #4\] [0-9a-f]+: e12fff11 bx r1 - [0-9a-f]+: e52d2004 push {r2} ; .* - 813c: e59f200c ldr r2, \[pc, #12\] ; 8150 .* - [0-9a-f]+: e59f100c ldr r1, \[pc, #12\] ; 8154 .* + [0-9a-f]+: e52d2004 push {r2} @ .* + 813c: e59f200c ldr r2, \[pc, #12\] @ 8150 .* + [0-9a-f]+: e59f100c ldr r1, \[pc, #12\] @ 8154 .* [0-9a-f]+: e79f2002 ldr r2, \[pc, r2\] [0-9a-f]+: e081100f add r1, r1, pc [0-9a-f]+: e12fff12 bx r2 @@ -27,7 +27,7 @@ Disassembly of section .plt: Disassembly of section .text: [0-9a-f]+ <foo>: - [0-9a-f]+: e59f0004 ldr r0, \[pc, #4\] ; 8164 .* + [0-9a-f]+: e59f0004 ldr r0, \[pc, #4\] @ 8164 .* [0-9a-f]+: fafffff2 blx 812c <.*> - [0-9a-f]+: e1a00000 nop ; .* + [0-9a-f]+: e1a00000 nop @ .* 8164: 000080a0 .word 0x000080a0 diff --git a/ld/testsuite/ld-arm/tls-lib.d b/ld/testsuite/ld-arm/tls-lib.d index e72267f..30e212f 100644 --- a/ld/testsuite/ld-arm/tls-lib.d +++ b/ld/testsuite/ld-arm/tls-lib.d @@ -7,8 +7,8 @@ start address 0x.* Disassembly of section .text: .* <foo>: - .*: e1a00000 nop ; \(mov r0, r0\) - .*: e1a00000 nop ; \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) + .*: e1a00000 nop @ \(mov r0, r0\) .*: e1a0f00e mov pc, lr .*: 00010098 .word 0x00010098 .*: 0001008c .word 0x0001008c diff --git a/ld/testsuite/ld-arm/tls-longplt-lib.d b/ld/testsuite/ld-arm/tls-longplt-lib.d index ad34c55..89e083a 100644 --- a/ld/testsuite/ld-arm/tls-longplt-lib.d +++ b/ld/testsuite/ld-arm/tls-longplt-lib.d @@ -6,17 +6,17 @@ start address 0x.* Disassembly of section .plt: 00008170 <.plt>: -.*: e52de004 push {lr} ; .* -.*: e59fe004 ldr lr, \[pc, #4\] ; .* +.*: e52de004 push {lr} @ .* +.*: e59fe004 ldr lr, \[pc, #4\] @ .* .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: 000080e0 .word 0x000080e0 .*: e08e0000 add r0, lr, r0 .*: e5901004 ldr r1, \[r0, #4\] .*: e12fff11 bx r1 -.*: e52d2004 push {r2} ; .* -.*: e59f200c ldr r2, \[pc, #12\] ; .* -.*: e59f100c ldr r1, \[pc, #12\] ; .* +.*: e52d2004 push {r2} @ .* +.*: e59f200c ldr r2, \[pc, #12\] @ .* +.*: e59f100c ldr r1, \[pc, #12\] @ .* .*: e79f2002 ldr r2, \[pc, r2\] .*: e081100f add r1, r1, pc .*: e12fff12 bx r2 @@ -26,11 +26,11 @@ Disassembly of section .plt: Disassembly of section .text: 000081b0 <text>: -.*: e59f0004 ldr r0, \[pc, #4\] ; .* +.*: e59f0004 ldr r0, \[pc, #4\] @ .* .*: fafffff2 blx .* <\.plt\+0x14> -.*: e1a00000 nop ; .* +.*: e1a00000 nop @ .* .*: 000080b4 .word 0x000080b4 -.*: 4801 ldr r0, \[pc, #4\] ; .* +.*: 4801 ldr r0, \[pc, #4\] @ .* .*: f7ff efe0 blx .* <\.plt\+0x14> .*: bf00 nop .*: 000080a5 .word 0x000080a5 @@ -38,22 +38,22 @@ Disassembly of section .text: Disassembly of section .foo: 04001000 <foo>: -.*: e59f0004 ldr r0, \[pc, #4\] ; .* +.*: e59f0004 ldr r0, \[pc, #4\] @ .* .*: fa000009 blx 4001030 .* -.*: e1a00000 nop ; .* +.*: e1a00000 nop @ .* .*: fc00f264 .word 0xfc00f264 -.*: e59f0004 ldr r0, \[pc, #4\] ; .* +.*: e59f0004 ldr r0, \[pc, #4\] @ .* .*: fa000005 blx 4001030 .* -.*: e1a00000 nop ; .* +.*: e1a00000 nop @ .* .*: fc00f25c .word 0xfc00f25c -.*: 4801 ldr r0, \[pc, #4\] ; .* +.*: 4801 ldr r0, \[pc, #4\] @ .* .*: f000 e806 blx 4001030 .* .*: bf00 nop .*: fc00f245 .word 0xfc00f245 .*: 00000000 .word 0x00000000 04001030 <__unnamed_veneer>: -.*: e59f1000 ldr r1, \[pc\] ; .* +.*: e59f1000 ldr r1, \[pc\] @ .* .*: e08ff001 add pc, pc, r1 .*: fc007148 .word 0xfc007148 .*: 00000000 .word 0x00000000 diff --git a/ld/testsuite/ld-arm/tls-longplt.d b/ld/testsuite/ld-arm/tls-longplt.d index c7fad34..94339c4 100644 --- a/ld/testsuite/ld-arm/tls-longplt.d +++ b/ld/testsuite/ld-arm/tls-longplt.d @@ -6,17 +6,17 @@ start address 0x.* Disassembly of section .plt: 0000819c <.plt>: - 819c: e52de004 push {lr} ; .* - 81a0: e59fe004 ldr lr, \[pc, #4\] ; .* + 819c: e52de004 push {lr} @ .* + 81a0: e59fe004 ldr lr, \[pc, #4\] @ .* 81a4: e08fe00e add lr, pc, lr 81a8: e5bef008 ldr pc, \[lr, #8\]! 81ac: 00008100 .word 0x00008100 81b0: e08e0000 add r0, lr, r0 81b4: e5901004 ldr r1, \[r0, #4] 81b8: e12fff11 bx r1 - 81bc: e52d2004 push {r2} ; .* - 81c0: e59f200c ldr r2, \[pc, #12\] ; .* - 81c4: e59f100c ldr r1, \[pc, #12\] ; .* + 81bc: e52d2004 push {r2} @ .* + 81c0: e59f200c ldr r2, \[pc, #12\] @ .* + 81c4: e59f100c ldr r1, \[pc, #12\] @ .* 81c8: e79f2002 ldr r2, \[pc, r2\] 81cc: e081100f add r1, r1, pc 81d0: e12fff12 bx r2 @@ -26,11 +26,11 @@ Disassembly of section .plt: Disassembly of section .text: 000081dc <text>: - 81dc: e59f0004 ldr r0, \[pc, #4\] ; .* + 81dc: e59f0004 ldr r0, \[pc, #4\] @ .* 81e0: fafffff2 blx 81b0 .* - 81e4: e1a00000 nop ; .* + 81e4: e1a00000 nop @ .* 81e8: 000080d4 .word 0x000080d4 - 81ec: 4801 ldr r0, \[pc, #4\] ; .* + 81ec: 4801 ldr r0, \[pc, #4\] @ .* 81ee: f7ff efe0 blx 81b0 .* 81f2: bf00 nop 81f4: 000080c5 .word 0x000080c5 @@ -38,27 +38,27 @@ Disassembly of section .text: Disassembly of section .foo: 04001000 <foo>: - 4001000: e59f0004 ldr r0, \[pc, #4\] ; .* + 4001000: e59f0004 ldr r0, \[pc, #4\] @ .* 4001004: e79f0000 ldr r0, \[pc, r0\] - 4001008: e1a00000 nop ; .* + 4001008: e1a00000 nop @ .* 400100c: fc00f2b4 .word 0xfc00f2b4 - 4001010: e59f0004 ldr r0, \[pc, #4\] ; .* + 4001010: e59f0004 ldr r0, \[pc, #4\] @ .* 4001014: fa000005 blx 4001030 .* - 4001018: e1a00000 nop ; .* + 4001018: e1a00000 nop @ .* 400101c: fc00f2a0 .word 0xfc00f2a0 - 4001020: 4801 ldr r0, \[pc, #4\] ; .* + 4001020: 4801 ldr r0, \[pc, #4\] @ .* 4001022: f000 f809 bl 4001038 .* 4001026: bf00 nop 4001028: fc00f291 .word 0xfc00f291 400102c: 00000000 .word 0x00000000 04001030 <__unnamed_veneer>: - 4001030: e51ff004 ldr pc, \[pc, #-4\] ; .* + 4001030: e51ff004 ldr pc, \[pc, #-4\] @ .* 4001034: 000081b0 .word 0x000081b0 04001038 <__unnamed_veneer>: 4001038: 4778 bx pc 400103a: e7fd b.n .+ <.+> - 400103c: e51ff004 ldr pc, \[pc, #-4\] ; .* + 400103c: e51ff004 ldr pc, \[pc, #-4\] @ .* 4001040: 000081b0 .word 0x000081b0 4001044: 00000000 .word 0x00000000 diff --git a/ld/testsuite/ld-arm/tls-thumb1.d b/ld/testsuite/ld-arm/tls-thumb1.d index 41d5f8c..13fa1c3 100644 --- a/ld/testsuite/ld-arm/tls-thumb1.d +++ b/ld/testsuite/ld-arm/tls-thumb1.d @@ -6,17 +6,17 @@ start address 0x.* Disassembly of section .plt: 0000813c <.plt>: -.*: e52de004 push {lr} ; .* -.*: e59fe004 ldr lr, \[pc, #4\] ; .* +.*: e52de004 push {lr} @ .* +.*: e59fe004 ldr lr, \[pc, #4\] @ .* .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: 000080f0 .word 0x000080f0 .*: e08e0000 add r0, lr, r0 .*: e5901004 ldr r1, \[r0, #4\] .*: e12fff11 bx r1 -.*: e52d2004 push {r2} ; .* -.*: e59f200c ldr r2, \[pc, #12\] ; .* -.*: e59f100c ldr r1, \[pc, #12\] ; .* +.*: e52d2004 push {r2} @ .* +.*: e59f200c ldr r2, \[pc, #12\] @ .* +.*: e59f100c ldr r1, \[pc, #12\] @ .* .*: e79f2002 ldr r2, \[pc, r2\] .*: e081100f add r1, r1, pc .*: e12fff12 bx r2 @@ -26,49 +26,49 @@ Disassembly of section .plt: Disassembly of section .text: 00008180 <text>: -.*: e59f0004 ldr r0, \[pc, #4\] ; .* +.*: e59f0004 ldr r0, \[pc, #4\] @ .* .*: ebfffff1 bl .* <\.plt\+0x14> -.*: e1a00000 nop ; .* +.*: e1a00000 nop @ .* .*: 000080c0 .word 0x000080c0 -.*: 4801 ldr r0, \[pc, #4\] ; .* +.*: 4801 ldr r0, \[pc, #4\] @ .* .*: f000 f805 bl .* <__unnamed_veneer> -.*: 46c0 nop ; .* +.*: 46c0 nop @ .* .*: 000080b1 .word 0x000080b1 .*: 00000000 .word 0x00000000 000081a0 <__unnamed_veneer>: .*: 4778 bx pc .*: e7fd b.n .+ <.+> -.*: e59f1000 ldr r1, \[pc\] ; .* +.*: e59f1000 ldr r1, \[pc\] @ .* .*: e081f00f add pc, r1, pc .*: ffffffa0 .word 0xffffffa0 Disassembly of section .foo: 04001000 <foo>: -.*: e59f0004 ldr r0, \[pc, #4\] ; .* +.*: e59f0004 ldr r0, \[pc, #4\] @ .* .*: eb000009 bl 4001030 .* -.*: e1a00000 nop ; .* +.*: e1a00000 nop @ .* .*: fc00f240 .word 0xfc00f240 -.*: e59f0004 ldr r0, \[pc, #4\] ; .* +.*: e59f0004 ldr r0, \[pc, #4\] @ .* .*: eb000005 bl 4001030 .* -.*: e1a00000 nop ; .* +.*: e1a00000 nop @ .* .*: fc00f238 .word 0xfc00f238 -.*: 4801 ldr r0, \[pc, #4\] ; .* +.*: 4801 ldr r0, \[pc, #4\] @ .* .*: f000 f80b bl 400103c .* -.*: 46c0 nop ; .* +.*: 46c0 nop @ .* .*: fc00f221 .word 0xfc00f221 .*: 00000000 .word 0x00000000 04001030 <__unnamed_veneer>: -.*: e59f1000 ldr r1, \[pc\] ; .* +.*: e59f1000 ldr r1, \[pc\] @ .* .*: e08ff001 add pc, pc, r1 .*: fc007114 .word 0xfc007114 0400103c <__unnamed_veneer>: .*: 4778 bx pc .*: e7fd b.n .+ <.+> -.*: e59f1000 ldr r1, \[pc\] ; .* +.*: e59f1000 ldr r1, \[pc\] @ .* .*: e081f00f add pc, r1, pc .*: fc007104 .word 0xfc007104 .*: 00000000 .word 0x00000000 diff --git a/ld/testsuite/ld-arm/vxworks1-lib.dd b/ld/testsuite/ld-arm/vxworks1-lib.dd index 987def0..ec584e0 100644 --- a/ld/testsuite/ld-arm/vxworks1-lib.dd +++ b/ld/testsuite/ld-arm/vxworks1-lib.dd @@ -4,26 +4,26 @@ Disassembly of section \.plt: 00080800 <_PROCEDURE_LINKAGE_TABLE_>: - 80800: e59fc000 ldr ip, \[pc] ; 80808 <.*> + 80800: e59fc000 ldr ip, \[pc] @ 80808 <.*> 80804: e79cf009 ldr pc, \[ip, r9\] 80808: 0000000c .word 0x0000000c - 8080c: e59fc000 ldr ip, \[pc] ; 80814 <.*> + 8080c: e59fc000 ldr ip, \[pc] @ 80814 <.*> 80810: e599f008 ldr pc, \[r9, #8\] 80814: 00000000 .word 0x00000000 - 80818: e59fc000 ldr ip, \[pc] ; 80820 <.*> + 80818: e59fc000 ldr ip, \[pc] @ 80820 <.*> 8081c: e79cf009 ldr pc, \[ip, r9\] 80820: 00000010 .word 0x00000010 - 80824: e59fc000 ldr ip, \[pc] ; 8082c <.*> + 80824: e59fc000 ldr ip, \[pc] @ 8082c <.*> 80828: e599f008 ldr pc, \[r9, #8\] 8082c: 0000000c .word 0x0000000c Disassembly of section \.text: 00080c00 <foo>: 80c00: e92dc200 push {r9, lr, pc} - 80c04: e59f9024 ldr r9, \[pc, #36\] ; 80c30 <.*> + 80c04: e59f9024 ldr r9, \[pc, #36\] @ 80c30 <.*> 80c08: e5999000 ldr r9, \[r9\] 80c0c: e5999000 ldr r9, \[r9\] - 80c10: e59f001c ldr r0, \[pc, #28\] ; 80c34 <.*> + 80c10: e59f001c ldr r0, \[pc, #28\] @ 80c34 <.*> 80c14: e7991000 ldr r1, \[r9, r0\] 80c18: e2811001 add r1, r1, #1 80c1c: e7891000 str r1, \[r9, r0\] diff --git a/ld/testsuite/ld-arm/vxworks1.dd b/ld/testsuite/ld-arm/vxworks1.dd index 1637198..c7cd6e1 100644 --- a/ld/testsuite/ld-arm/vxworks1.dd +++ b/ld/testsuite/ld-arm/vxworks1.dd @@ -5,22 +5,22 @@ Disassembly of section \.plt: 00080800 <_PROCEDURE_LINKAGE_TABLE_>: 80800: e52dc008 str ip, \[sp, #-8\]! - 80804: e59fc000 ldr ip, \[pc] ; 8080c <.*> + 80804: e59fc000 ldr ip, \[pc] @ 8080c <.*> 80808: e59cf008 ldr pc, \[ip, #8\] 8080c: 00081400 .word 0x00081400 8080c: R_ARM_ABS32 _GLOBAL_OFFSET_TABLE_ - 80810: e59fc000 ldr ip, \[pc] ; 80818 <.*> + 80810: e59fc000 ldr ip, \[pc] @ 80818 <.*> 80814: e59cf000 ldr pc, \[ip\] 80818: 0008140c .word 0x0008140c 80818: R_ARM_ABS32 _GLOBAL_OFFSET_TABLE_\+0xc - 8081c: e59fc000 ldr ip, \[pc] ; 80824 <.*> + 8081c: e59fc000 ldr ip, \[pc] @ 80824 <.*> 80820: eafffff6 b 80800 <.*> 80824: 00000000 .word 0x00000000 - 80828: e59fc000 ldr ip, \[pc] ; 80830 <.*> + 80828: e59fc000 ldr ip, \[pc] @ 80830 <.*> 8082c: e59cf000 ldr pc, \[ip\] 80830: 00081410 .word 0x00081410 80830: R_ARM_ABS32 _GLOBAL_OFFSET_TABLE_\+0x10 - 80834: e59fc000 ldr ip, \[pc] ; 8083c <.*> + 80834: e59fc000 ldr ip, \[pc] @ 8083c <.*> 80838: eafffff0 b 80800 <.*> 8083c: 0000000c .word 0x0000000c Disassembly of section \.text: |