diff options
author | Alan Modra <amodra@gmail.com> | 2019-12-17 19:06:02 +1030 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2019-12-17 20:43:00 +1030 |
commit | 660df28acfa1b58c978d65d9cb26d37023f791ce (patch) | |
tree | ed6b67cf8188b675c32949db065d58f584bbaaea /ld/testsuite | |
parent | 260bcd09bfb98ebc5d8f0eb564edca21872e9f7f (diff) | |
download | binutils-660df28acfa1b58c978d65d9cb26d37023f791ce.zip binutils-660df28acfa1b58c978d65d9cb26d37023f791ce.tar.gz binutils-660df28acfa1b58c978d65d9cb26d37023f791ce.tar.bz2 |
Prefer object over notype symbols when disassembling
Changing objdump disassembly output like this always requires some
testsuite changes, with the avr and x64_64 changes simply due to
picking up better symbols, the whole point of the patch.
The mips changes are due to mips-sgi-irix changing STT_NOTYPE symbols
to STT_OBJECT, which objdump now chooses in preference to script
symbols. The problem is that objdump looks at the first symbol in the
section being disassembled, and if object type, just dumps out bytes
rather than disassembling. This results in new failures:
FAIL: JAL overflow 2
FAIL: undefined weak symbol overflow
FAIL: undefined weak symbol overflow (n32)
FAIL: undefined weak symbol overflow (n64)
So for mips-sgi-irix function symbols really do need to be function
type. I fixed a few more than just the required minimum to avoid the
above test fails.
binutils/
* objdump.c (compare_section): New static var.
(compare_symbols): Sort by current section only. Don't access
symbol name out of bounds when checking for file symbols.
Sort section symbols and object symbols.
(find_symbol_for_address): Remove bogus debugging and section
symbol test.
(disassemble_data): Move symbol sort from here..
(disassemble_section): ..to here. Set compare_section.
ld/
* testsuite/ld-avr/lds-mega.d: Adjust symbols to suit objdump change.
* testsuite/ld-avr/lds-tiny.d: Likewise.
* testsuite/ld-x86-64/load2.d: Likewise.
* testsuite/ld-mips-elf/compact-eh1.s: Give function symbols
function type.
* testsuite/ld-mips-elf/compact-eh1a.s: Likewise.
* testsuite/ld-mips-elf/compact-eh1b.s: Likewise.
* testsuite/ld-mips-elf/compact-eh2.s: Likewise.
* testsuite/ld-mips-elf/compact-eh3.s: Likewise.
* testsuite/ld-mips-elf/compact-eh3a.s: Likewise.
* testsuite/ld-mips-elf/eh-frame5.s: Likewise.
* testsuite/ld-mips-elf/ehdr_start-new.s: Likewise.
* testsuite/ld-mips-elf/ehdr_start-o32.s: Likewise.
* testsuite/ld-mips-elf/emit-relocs-1a.s: Likewise.
* testsuite/ld-mips-elf/jaloverflow-2.s: Likewise.
* testsuite/ld-mips-elf/jaloverflow.s: Likewise.
* testsuite/ld-mips-elf/mips16-call-global-1.s: Likewise.
* testsuite/ld-mips-elf/mips16-intermix-1.s: Likewise.
* testsuite/ld-mips-elf/mips16-pic-1b.s: Likewise.
* testsuite/ld-mips-elf/mips16-pic-4c.s: Likewise.
* testsuite/ld-mips-elf/no-shared-1-n64.s: Likewise.
* testsuite/ld-mips-elf/no-shared-1-o32.s: Likewise.
* testsuite/ld-mips-elf/pic-and-nonpic-1b-micromips.s: Likewise.
* testsuite/ld-mips-elf/pic-and-nonpic-1b.s: Likewise.
* testsuite/ld-mips-elf/pic-and-nonpic-2a.s: Likewise.
* testsuite/ld-mips-elf/pic-and-nonpic-3b.s: Likewise.
* testsuite/ld-mips-elf/pic-and-nonpic-4b.s: Likewise.
* testsuite/ld-mips-elf/pic-and-nonpic-5a.s: Likewise.
* testsuite/ld-mips-elf/pic-and-nonpic-6-n32c.s: Likewise.
* testsuite/ld-mips-elf/pic-and-nonpic-6-n64c.s: Likewise.
* testsuite/ld-mips-elf/pic-and-nonpic-6-o32c.s: Likewise.
* testsuite/ld-mips-elf/pie.s: Likewise.
* testsuite/ld-mips-elf/relax-jalr.s: Likewise.
* testsuite/ld-mips-elf/reloc-1a.s: Likewise.
* testsuite/ld-mips-elf/reloc-2a.s: Likewise.
* testsuite/ld-mips-elf/reloc-4.s: Likewise.
* testsuite/ld-mips-elf/reloc-5.s: Likewise.
* testsuite/ld-mips-elf/reloc-6b.s: Likewise.
* testsuite/ld-mips-elf/textrel-1.s: Likewise.
* testsuite/ld-mips-elf/undefweak-overflow.s: Likewise.
* testsuite/ld-mips-elf/undefweak-overflow.d: Adjust.
Diffstat (limited to 'ld/testsuite')
40 files changed, 73 insertions, 25 deletions
diff --git a/ld/testsuite/ld-avr/lds-mega.d b/ld/testsuite/ld-avr/lds-mega.d index 078bf73..1537b8f 100644 --- a/ld/testsuite/ld-avr/lds-mega.d +++ b/ld/testsuite/ld-avr/lds-mega.d @@ -11,7 +11,7 @@ Disassembly of section .text: 00000000 <main>: - 0: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <_edata> + 0: 80 91 00 01 lds r24, 0x0100 ; 0x800100 <myvar1> 4: 08 2e mov r0, r24 6: 00 0c add r0, r0 8: 99 0b sbc r25, r25 diff --git a/ld/testsuite/ld-avr/lds-tiny.d b/ld/testsuite/ld-avr/lds-tiny.d index 405546a..957606f 100644 --- a/ld/testsuite/ld-avr/lds-tiny.d +++ b/ld/testsuite/ld-avr/lds-tiny.d @@ -11,7 +11,7 @@ Disassembly of section .text: 00000000 <main>: - 0: 20 a1 lds r18, 0x40 ; 0x800040 <_edata> + 0: 20 a1 lds r18, 0x40 ; 0x800040 <myvar1> 2: 42 a1 lds r20, 0x42 ; 0x800042 <myvar2\+0x1> 4: 53 a1 lds r21, 0x43 ; 0x800043 <_end> 6: 08 95 ret diff --git a/ld/testsuite/ld-mips-elf/compact-eh1.s b/ld/testsuite/ld-mips-elf/compact-eh1.s index 941ac8f..81c30086 100644 --- a/ld/testsuite/ld-mips-elf/compact-eh1.s +++ b/ld/testsuite/ld-mips-elf/compact-eh1.s @@ -6,6 +6,7 @@ .cfi_personality_id 0x2 .cfi_lsda 0x1b,.LLSDA3 .global main + .type main, @function main: .LEHB0 = . jal compact1a diff --git a/ld/testsuite/ld-mips-elf/compact-eh1a.s b/ld/testsuite/ld-mips-elf/compact-eh1a.s index 3f5c7ec..3b12bfe 100644 --- a/ld/testsuite/ld-mips-elf/compact-eh1a.s +++ b/ld/testsuite/ld-mips-elf/compact-eh1a.s @@ -1,6 +1,7 @@ .cfi_sections .eh_frame_entry .section .text.compact1a,"ax",@progbits - .globl compact1a + .globl compact1a + .type compact1a, @function .cfi_startproc compact1a: sw $2,16($fp) diff --git a/ld/testsuite/ld-mips-elf/compact-eh1b.s b/ld/testsuite/ld-mips-elf/compact-eh1b.s index e96289a..1aabe5f 100644 --- a/ld/testsuite/ld-mips-elf/compact-eh1b.s +++ b/ld/testsuite/ld-mips-elf/compact-eh1b.s @@ -1,6 +1,7 @@ .cfi_sections .eh_frame_entry .section .text.compact1b,"ax",@progbits .globl compact1b + .type compact1b, @function .cfi_startproc compact1b: lw $31,44($sp) diff --git a/ld/testsuite/ld-mips-elf/compact-eh2.s b/ld/testsuite/ld-mips-elf/compact-eh2.s index b899e56..234297b 100644 --- a/ld/testsuite/ld-mips-elf/compact-eh2.s +++ b/ld/testsuite/ld-mips-elf/compact-eh2.s @@ -6,6 +6,7 @@ .cfi_personality_id 0x2 .cfi_lsda 0x1b,.LLSDA3 .global main + .type main, @function main: .LEHB0 = . move $4,$2 diff --git a/ld/testsuite/ld-mips-elf/compact-eh3.s b/ld/testsuite/ld-mips-elf/compact-eh3.s index 2bcf5ca..9ee7558 100644 --- a/ld/testsuite/ld-mips-elf/compact-eh3.s +++ b/ld/testsuite/ld-mips-elf/compact-eh3.s @@ -6,6 +6,7 @@ .cfi_personality_id 0x2 .cfi_lsda 0x1b,.LLSDA3 .global main + .type main, @function main: .LEHB0 = . move $4,$2 diff --git a/ld/testsuite/ld-mips-elf/compact-eh3a.s b/ld/testsuite/ld-mips-elf/compact-eh3a.s index 3780cf2..a1276ab 100644 --- a/ld/testsuite/ld-mips-elf/compact-eh3a.s +++ b/ld/testsuite/ld-mips-elf/compact-eh3a.s @@ -1,6 +1,7 @@ .cfi_sections .eh_frame_entry .section .text.compact3a,"ax",@progbits .globl compact3a + .type compact3a, @function .cfi_startproc compact3a: lw $31,44($sp) diff --git a/ld/testsuite/ld-mips-elf/eh-frame5.s b/ld/testsuite/ld-mips-elf/eh-frame5.s index 741a021..cf5a11c 100644 --- a/ld/testsuite/ld-mips-elf/eh-frame5.s +++ b/ld/testsuite/ld-mips-elf/eh-frame5.s @@ -2,6 +2,7 @@ .cfi_personality 0x0,local_pers .cfi_lsda 0x0,LSDA .ent f1 + .type f1, @function f1: nop .end f1 @@ -11,6 +12,7 @@ f1: .cfi_personality 0x0,hidden_pers .cfi_lsda 0x0,LSDA .ent f2 + .type f2, @function f2: nop .end f2 @@ -20,6 +22,7 @@ f2: .cfi_personality 0x0,global_pers .cfi_lsda 0x0,LSDA .ent f3 + .type f3, @function f3: nop .end f3 @@ -29,6 +32,7 @@ f3: .cfi_personality 0x0,extern_pers .cfi_lsda 0x0,LSDA .ent f4 + .type f4, @function f4: nop .end f4 @@ -38,6 +42,7 @@ f4: .cfi_personality 0x80,local_indirect_ptr .cfi_lsda 0x0,LSDA .ent f5 + .type f5, @function f5: nop .end f5 @@ -47,6 +52,7 @@ f5: .cfi_personality 0x80,hidden_indirect_ptr .cfi_lsda 0x0,LSDA .ent f6 + .type f6, @function f6: nop .end f6 @@ -56,6 +62,7 @@ f6: .cfi_personality 0x80,global_indirect_ptr .cfi_lsda 0x0,LSDA .ent f7 + .type f7, @function f7: nop .end f7 @@ -65,6 +72,7 @@ f7: .cfi_personality 0x80,extern_indirect_ptr .cfi_lsda 0x0,LSDA .ent f8 + .type f8, @function f8: nop .end f8 @@ -72,6 +80,7 @@ f8: .ent local_pers + .type local_pers, @function local_pers: nop .end local_pers @@ -79,12 +88,14 @@ local_pers: .globl hidden_pers .hidden hidden_pers .ent hidden_pers + .type hidden_pers, @function hidden_pers: nop .end hidden_pers .globl global_pers .ent global_pers + .type global_pers, @function global_pers: nop .end global_pers diff --git a/ld/testsuite/ld-mips-elf/ehdr_start-new.s b/ld/testsuite/ld-mips-elf/ehdr_start-new.s index 5ee00dc..ccf20db 100644 --- a/ld/testsuite/ld-mips-elf/ehdr_start-new.s +++ b/ld/testsuite/ld-mips-elf/ehdr_start-new.s @@ -2,6 +2,7 @@ .text .weak __ehdr_start .globl __start + .type __start, @function .ent __start .frame $29, 0, $31 .mask 0x00000000, 0 diff --git a/ld/testsuite/ld-mips-elf/ehdr_start-o32.s b/ld/testsuite/ld-mips-elf/ehdr_start-o32.s index 0973447..60a5854 100644 --- a/ld/testsuite/ld-mips-elf/ehdr_start-o32.s +++ b/ld/testsuite/ld-mips-elf/ehdr_start-o32.s @@ -2,6 +2,7 @@ .text .weak __ehdr_start .globl __start + .type __start, @function .ent __start .frame $29, 0, $31 .mask 0x00000000, 0 diff --git a/ld/testsuite/ld-mips-elf/emit-relocs-1a.s b/ld/testsuite/ld-mips-elf/emit-relocs-1a.s index 35c3a6f..c8fd7d6 100644 --- a/ld/testsuite/ld-mips-elf/emit-relocs-1a.s +++ b/ld/testsuite/ld-mips-elf/emit-relocs-1a.s @@ -1,6 +1,7 @@ .text .align 4 .globl _start + .type _start, @function _start: jr $31 diff --git a/ld/testsuite/ld-mips-elf/jaloverflow-2.s b/ld/testsuite/ld-mips-elf/jaloverflow-2.s index 71acf29..48ede45 100644 --- a/ld/testsuite/ld-mips-elf/jaloverflow-2.s +++ b/ld/testsuite/ld-mips-elf/jaloverflow-2.s @@ -2,6 +2,7 @@ # overflowing .globl start + .type start, @function .weak foo start: jal foo diff --git a/ld/testsuite/ld-mips-elf/jaloverflow.s b/ld/testsuite/ld-mips-elf/jaloverflow.s index 4dd98b8..e6de2e0 100644 --- a/ld/testsuite/ld-mips-elf/jaloverflow.s +++ b/ld/testsuite/ld-mips-elf/jaloverflow.s @@ -1,6 +1,7 @@ # This file gets linked to start at 0xffffff0, so the call is an overflow. .text .global start + .type start, @function .set noreorder start: nop diff --git a/ld/testsuite/ld-mips-elf/mips16-call-global-1.s b/ld/testsuite/ld-mips-elf/mips16-call-global-1.s index 4c6d0a4..485e77c 100644 --- a/ld/testsuite/ld-mips-elf/mips16-call-global-1.s +++ b/ld/testsuite/ld-mips-elf/mips16-call-global-1.s @@ -1,6 +1,7 @@ .set mips16 .globl __start + .type __start, @function .ent __start .align 4 __start: diff --git a/ld/testsuite/ld-mips-elf/mips16-intermix-1.s b/ld/testsuite/ld-mips-elf/mips16-intermix-1.s index c596619..56527ea 100644 --- a/ld/testsuite/ld-mips-elf/mips16-intermix-1.s +++ b/ld/testsuite/ld-mips-elf/mips16-intermix-1.s @@ -1,6 +1,7 @@ .text .align 2 .globl __start + .type __start, @function .set nomips16 .ent __start __start: diff --git a/ld/testsuite/ld-mips-elf/mips16-pic-1b.s b/ld/testsuite/ld-mips-elf/mips16-pic-1b.s index 9a17072..1fc03c4 100644 --- a/ld/testsuite/ld-mips-elf/mips16-pic-1b.s +++ b/ld/testsuite/ld-mips-elf/mips16-pic-1b.s @@ -12,6 +12,7 @@ callpic used21,mips16 .globl __start + .type __start, @function .ent __start .set nomips16 __start: diff --git a/ld/testsuite/ld-mips-elf/mips16-pic-4c.s b/ld/testsuite/ld-mips-elf/mips16-pic-4c.s index 338d378..985a7f1 100644 --- a/ld/testsuite/ld-mips-elf/mips16-pic-4c.s +++ b/ld/testsuite/ld-mips-elf/mips16-pic-4c.s @@ -7,6 +7,7 @@ .section .mips16.call.f2, "ax", @progbits .ent __call + .type __call, @function __call: la $25,f2 jr $25 @@ -18,6 +19,7 @@ __call: .section .mips16.call.fp.f3, "ax", @progbits .ent __call_fp + .type __call_fp, @function __call_fp: la $25,f3 jr $25 diff --git a/ld/testsuite/ld-mips-elf/no-shared-1-n64.s b/ld/testsuite/ld-mips-elf/no-shared-1-n64.s index 8eedf12..c63b8c8 100644 --- a/ld/testsuite/ld-mips-elf/no-shared-1-n64.s +++ b/ld/testsuite/ld-mips-elf/no-shared-1-n64.s @@ -1,6 +1,7 @@ .abicalls .text .globl __start + .type __start, @function .ent __start __start: lui $2,%hi(__gnu_local_gp) diff --git a/ld/testsuite/ld-mips-elf/no-shared-1-o32.s b/ld/testsuite/ld-mips-elf/no-shared-1-o32.s index f00fc4b..80be39b 100644 --- a/ld/testsuite/ld-mips-elf/no-shared-1-o32.s +++ b/ld/testsuite/ld-mips-elf/no-shared-1-o32.s @@ -1,6 +1,7 @@ .abicalls .text .globl __start + .type __start, @function .ent __start __start: lui $2,%hi(__gnu_local_gp) diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-1b-micromips.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1b-micromips.s index 1eff309..abd0156 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-1b-micromips.s +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1b-micromips.s @@ -1,6 +1,7 @@ .abicalls .option pic0 .global __start + .type __start, @function .set micromips .ent __start __start: diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-1b.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1b.s index 5739fef..2615f24a 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-1b.s +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1b.s @@ -1,6 +1,7 @@ .abicalls .option pic0 .global __start + .type __start, @function .ent __start __start: jal f1 diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-2a.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-2a.s index 45a490f..f360b0e 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-2a.s +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-2a.s @@ -1,6 +1,7 @@ .abicalls .option pic0 .global __start + .type __start, @function .ent __start __start: jal foo diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.s index 571c774..2a9ad89 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.s +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.s @@ -1,6 +1,7 @@ .abicalls .option pic0 .global __start + .type __start, @function .ent __start __start: jal foo @@ -8,6 +9,7 @@ __start: .end __start .global ext + .type ext, @function .ent ext ext: lui $gp,%hi(__gnu_local_gp) diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.s index 7e25bf4..863a01b 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.s +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.s @@ -1,6 +1,7 @@ .abicalls .option pic0 .global __start + .type __start, @function .ent __start __start: lui $2,%hi(obj1) diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-5a.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5a.s index 7452f5e..e85655f 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-5a.s +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5a.s @@ -1,6 +1,7 @@ .abicalls .option pic0 .global __start + .type __start, @function .ent __start __start: lui $2,%hi(foo) diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32c.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32c.s index 578626a..3d5660c 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32c.s +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32c.s @@ -2,6 +2,7 @@ .option pic0 .set noreorder .global __start + .type __start, @function .ent __start __start: jal f1 diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64c.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64c.s index 578626a..3d5660c 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64c.s +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64c.s @@ -2,6 +2,7 @@ .option pic0 .set noreorder .global __start + .type __start, @function .ent __start __start: jal f1 diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32c.s b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32c.s index 578626a..3d5660c 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32c.s +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32c.s @@ -2,6 +2,7 @@ .option pic0 .set noreorder .global __start + .type __start, @function .ent __start __start: jal f1 diff --git a/ld/testsuite/ld-mips-elf/pie.s b/ld/testsuite/ld-mips-elf/pie.s index c7f2b20..442de01 100644 --- a/ld/testsuite/ld-mips-elf/pie.s +++ b/ld/testsuite/ld-mips-elf/pie.s @@ -1,5 +1,6 @@ .abicalls .global __start + .type __start, @function .ent __start __start: jr $31 diff --git a/ld/testsuite/ld-mips-elf/relax-jalr.s b/ld/testsuite/ld-mips-elf/relax-jalr.s index ba7ea1a..b8478fa 100644 --- a/ld/testsuite/ld-mips-elf/relax-jalr.s +++ b/ld/testsuite/ld-mips-elf/relax-jalr.s @@ -1,6 +1,7 @@ -.globl __start + .globl __start + .type __start, @function .space 8 -.ent __start + .ent __start __start: .Lstart: .space 16 @@ -9,7 +10,7 @@ __start: jal __start .space 64 jal .Lstart -.end __start + .end __start # make objdump print ... .space 8 diff --git a/ld/testsuite/ld-mips-elf/reloc-1a.s b/ld/testsuite/ld-mips-elf/reloc-1a.s index 5fcd4bb..2d1c9f1 100644 --- a/ld/testsuite/ld-mips-elf/reloc-1a.s +++ b/ld/testsuite/ld-mips-elf/reloc-1a.s @@ -1,4 +1,5 @@ .globl _start + .type _start, @function .globl sdg .set noreorder .ent tstarta diff --git a/ld/testsuite/ld-mips-elf/reloc-2a.s b/ld/testsuite/ld-mips-elf/reloc-2a.s index 0ea830a..570b724 100644 --- a/ld/testsuite/ld-mips-elf/reloc-2a.s +++ b/ld/testsuite/ld-mips-elf/reloc-2a.s @@ -1,4 +1,5 @@ .globl _start + .type _start, @function .globl sdg .set noreorder .ent tstarta diff --git a/ld/testsuite/ld-mips-elf/reloc-4.s b/ld/testsuite/ld-mips-elf/reloc-4.s index 061fa80..d379e05 100644 --- a/ld/testsuite/ld-mips-elf/reloc-4.s +++ b/ld/testsuite/ld-mips-elf/reloc-4.s @@ -1,5 +1,6 @@ .text .globl _start + .type _start, @function _start: li.d $f2,1.10000000000000000000e0 diff --git a/ld/testsuite/ld-mips-elf/reloc-5.s b/ld/testsuite/ld-mips-elf/reloc-5.s index a4b31b7..25c722a 100644 --- a/ld/testsuite/ld-mips-elf/reloc-5.s +++ b/ld/testsuite/ld-mips-elf/reloc-5.s @@ -1,5 +1,6 @@ .text .globl _start + .type _start, @function _start: lw $2, %gp_rel(i)($28) diff --git a/ld/testsuite/ld-mips-elf/reloc-6b.s b/ld/testsuite/ld-mips-elf/reloc-6b.s index ae4e9bc..e75060e 100644 --- a/ld/testsuite/ld-mips-elf/reloc-6b.s +++ b/ld/testsuite/ld-mips-elf/reloc-6b.s @@ -1,4 +1,5 @@ .globl __start .text + .type __start, @function .globl gs .text __start: gs: diff --git a/ld/testsuite/ld-mips-elf/textrel-1.s b/ld/testsuite/ld-mips-elf/textrel-1.s index f6b4a6a..43143f7 100644 --- a/ld/testsuite/ld-mips-elf/textrel-1.s +++ b/ld/testsuite/ld-mips-elf/textrel-1.s @@ -1,4 +1,5 @@ .globl foo + .type foo, @function foo: .cfi_startproc nop diff --git a/ld/testsuite/ld-mips-elf/undefweak-overflow.d b/ld/testsuite/ld-mips-elf/undefweak-overflow.d index bbed997..72fcc65 100644 --- a/ld/testsuite/ld-mips-elf/undefweak-overflow.d +++ b/ld/testsuite/ld-mips-elf/undefweak-overflow.d @@ -3,38 +3,38 @@ #ld: -Ttext=0x20000000 -e start #objdump: -dr --show-raw-insn #... -[0-9a-f]+ <_ftext>: -[ 0-9a-f]+: d85fffff beqzc v0,20000000 <_ftext> +[0-9a-f]+ <start>: +[ 0-9a-f]+: d85fffff beqzc v0,20000000 <start> [ 0-9a-f]+: 00000000 nop -[ 0-9a-f]+: f85ffffd bnezc v0,20000000 <_ftext> -[ 0-9a-f]+: ec4ffffd lwpc v0,20000000 <_ftext> -[ 0-9a-f]+: ec5bfffe ldpc v0,20000000 <_ftext> -[ 0-9a-f]+: cbfffffa bc 20000000 <_ftext> -[ 0-9a-f]+: 1000fff9 b 20000000 <_ftext> +[ 0-9a-f]+: f85ffffd bnezc v0,20000000 <start> +[ 0-9a-f]+: ec4ffffd lwpc v0,20000000 <start> +[ 0-9a-f]+: ec5bfffe ldpc v0,20000000 <start> +[ 0-9a-f]+: cbfffffa bc 20000000 <start> +[ 0-9a-f]+: 1000fff9 b 20000000 <start> [ 0-9a-f]+: 00000000 nop -[ 0-9a-f]+: 0411fff7 bal 20000000 <_ftext> +[ 0-9a-f]+: 0411fff7 bal 20000000 <start> [ 0-9a-f]+: 3c...... lui a0,0x.... -[ 0-9a-f]+: 0c000000 jal 20000000 <_ftext> +[ 0-9a-f]+: 0c000000 jal 20000000 <start> [ 0-9a-f]+: 00000000 nop -[ 0-9a-f]+: 08000000 j 20000000 <_ftext> +[ 0-9a-f]+: 08000000 j 20000000 <start> [ 0-9a-f]+: 00000000 nop [0-9a-f]+ <micro>: -[ 0-9a-f]+: 8e63 beqz a0,20000000 <_ftext> +[ 0-9a-f]+: 8e63 beqz a0,20000000 <start> [ 0-9a-f]+: 0c00 nop -[ 0-9a-f]+: cfe1 b 20000000 <_ftext> +[ 0-9a-f]+: cfe1 b 20000000 <start> [ 0-9a-f]+: 0c00 nop -[ 0-9a-f]+: 9400 ffde b 20000000 <_ftext> +[ 0-9a-f]+: 9400 ffde b 20000000 <start> [ 0-9a-f]+: 0c00 nop -[ 0-9a-f]+: 4060 ffdb bal 20000000 <_ftext> +[ 0-9a-f]+: 4060 ffdb bal 20000000 <start> [ 0-9a-f]+: 0000 0000 nop -[ 0-9a-f]+: f400 0000 jal 20000000 <_ftext> +[ 0-9a-f]+: f400 0000 jal 20000000 <start> [ 0-9a-f]+: 0000 0000 nop -[ 0-9a-f]+: d400 0000 j 20000000 <_ftext> +[ 0-9a-f]+: d400 0000 j 20000000 <start> [ 0-9a-f]+: 0c00 nop [0-9a-f]+ <mips16>: -[ 0-9a-f]+: f7df 1010 b 20000000 <_ftext> -[ 0-9a-f]+: 1800 0000 jal 20000000 <_ftext> +[ 0-9a-f]+: f7df 1010 b 20000000 <start> +[ 0-9a-f]+: 1800 0000 jal 20000000 <start> [ 0-9a-f]+: 6500 nop #pass diff --git a/ld/testsuite/ld-mips-elf/undefweak-overflow.s b/ld/testsuite/ld-mips-elf/undefweak-overflow.s index d439d7c..a8370ac 100644 --- a/ld/testsuite/ld-mips-elf/undefweak-overflow.s +++ b/ld/testsuite/ld-mips-elf/undefweak-overflow.s @@ -3,6 +3,7 @@ .module mips64r6 .globl start + .type start, @function .weak foo start: .set noreorder diff --git a/ld/testsuite/ld-x86-64/load2.d b/ld/testsuite/ld-x86-64/load2.d index f76ba9d..0ae721c 100644 --- a/ld/testsuite/ld-x86-64/load2.d +++ b/ld/testsuite/ld-x86-64/load2.d @@ -14,5 +14,5 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 48 8d 05 ([0-9a-f]{2} ){4} * lea -0x[a-f0-9]+\(%rip\),%rax # [a-f0-9]+ <foo> [ ]*[a-f0-9]+: 4c 8d 1d ([0-9a-f]{2} ){4} * lea 0x[a-f0-9]+\(%rip\),%r11 # [a-f0-9]+ <bar> [ ]*[a-f0-9]+: 48 8d 05 ([0-9a-f]{2} ){4} * lea 0x[a-f0-9]+\(%rip\),%rax # [a-f0-9]+ <__start_my_section> -[ ]*[a-f0-9]+: 4c 8d 1d ([0-9a-f]{2} ){4} * lea 0x[a-f0-9]+\(%rip\),%r11 # [a-f0-9]+ <__stop_my_section> +[ ]*[a-f0-9]+: 4c 8d 1d ([0-9a-f]{2} ){4} * lea 0x[a-f0-9]+\(%rip\),%r11 # [a-f0-9]+ <(__stop_my_section|pad)> #pass |