From 85e290dc1252d77e726c0892b197be449b34bd16 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 7 Jan 2020 09:29:54 +1030 Subject: [PATCH] Re: Prefer object over notype symbols when disassembling Reverts unnecessary mips testsuite changes made by commit 660df28acf. * testsuite/ld-mips-elf/eh-frame5.s, * testsuite/ld-mips-elf/ehdr_start-new.s, * testsuite/ld-mips-elf/ehdr_start-o32.s, * testsuite/ld-mips-elf/mips16-call-global-1.s, * testsuite/ld-mips-elf/mips16-intermix-1.s, * testsuite/ld-mips-elf/mips16-pic-1b.s, * testsuite/ld-mips-elf/mips16-pic-4c.s, * testsuite/ld-mips-elf/no-shared-1-n64.s, * testsuite/ld-mips-elf/no-shared-1-o32.s, * testsuite/ld-mips-elf/pic-and-nonpic-1b-micromips.s, * testsuite/ld-mips-elf/pic-and-nonpic-1b.s, * testsuite/ld-mips-elf/pic-and-nonpic-2a.s, * testsuite/ld-mips-elf/pic-and-nonpic-3b.s, * testsuite/ld-mips-elf/pic-and-nonpic-4b.s, * testsuite/ld-mips-elf/pic-and-nonpic-5a.s, * testsuite/ld-mips-elf/pic-and-nonpic-6-n32c.s, * testsuite/ld-mips-elf/pic-and-nonpic-6-n64c.s, * testsuite/ld-mips-elf/pic-and-nonpic-6-o32c.s, * testsuite/ld-mips-elf/pie.s, * testsuite/ld-mips-elf/relax-jalr.s: Revert 2019-12-17 change. --- ld/ChangeLog | 23 +++++++++++++++++++ ld/testsuite/ld-mips-elf/eh-frame5.s | 11 --------- ld/testsuite/ld-mips-elf/ehdr_start-new.s | 1 - ld/testsuite/ld-mips-elf/ehdr_start-o32.s | 1 - .../ld-mips-elf/mips16-call-global-1.s | 1 - ld/testsuite/ld-mips-elf/mips16-intermix-1.s | 1 - ld/testsuite/ld-mips-elf/mips16-pic-1b.s | 1 - ld/testsuite/ld-mips-elf/mips16-pic-4c.s | 2 -- ld/testsuite/ld-mips-elf/no-shared-1-n64.s | 1 - ld/testsuite/ld-mips-elf/no-shared-1-o32.s | 1 - .../ld-mips-elf/pic-and-nonpic-1b-micromips.s | 1 - ld/testsuite/ld-mips-elf/pic-and-nonpic-1b.s | 1 - ld/testsuite/ld-mips-elf/pic-and-nonpic-2a.s | 1 - ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.s | 2 -- ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.s | 1 - ld/testsuite/ld-mips-elf/pic-and-nonpic-5a.s | 1 - .../ld-mips-elf/pic-and-nonpic-6-n32c.s | 1 - .../ld-mips-elf/pic-and-nonpic-6-n64c.s | 1 - .../ld-mips-elf/pic-and-nonpic-6-o32c.s | 1 - ld/testsuite/ld-mips-elf/pie.s | 1 - ld/testsuite/ld-mips-elf/relax-jalr.s | 7 +++--- 21 files changed, 26 insertions(+), 35 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index a9871938ef1..7ff108cbb0c 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,26 @@ +2020-01-07 Alan Modra + + * testsuite/ld-mips-elf/eh-frame5.s, + * testsuite/ld-mips-elf/ehdr_start-new.s, + * testsuite/ld-mips-elf/ehdr_start-o32.s, + * testsuite/ld-mips-elf/mips16-call-global-1.s, + * testsuite/ld-mips-elf/mips16-intermix-1.s, + * testsuite/ld-mips-elf/mips16-pic-1b.s, + * testsuite/ld-mips-elf/mips16-pic-4c.s, + * testsuite/ld-mips-elf/no-shared-1-n64.s, + * testsuite/ld-mips-elf/no-shared-1-o32.s, + * testsuite/ld-mips-elf/pic-and-nonpic-1b-micromips.s, + * testsuite/ld-mips-elf/pic-and-nonpic-1b.s, + * testsuite/ld-mips-elf/pic-and-nonpic-2a.s, + * testsuite/ld-mips-elf/pic-and-nonpic-3b.s, + * testsuite/ld-mips-elf/pic-and-nonpic-4b.s, + * testsuite/ld-mips-elf/pic-and-nonpic-5a.s, + * testsuite/ld-mips-elf/pic-and-nonpic-6-n32c.s, + * testsuite/ld-mips-elf/pic-and-nonpic-6-n64c.s, + * testsuite/ld-mips-elf/pic-and-nonpic-6-o32c.s, + * testsuite/ld-mips-elf/pie.s, + * testsuite/ld-mips-elf/relax-jalr.s: Revert 2019-12-17 change. + 2020-01-06 Nick Clifton PR 25327 diff --git a/ld/testsuite/ld-mips-elf/eh-frame5.s b/ld/testsuite/ld-mips-elf/eh-frame5.s index cf5a11c37ab..741a021685d 100644 --- a/ld/testsuite/ld-mips-elf/eh-frame5.s +++ b/ld/testsuite/ld-mips-elf/eh-frame5.s @@ -2,7 +2,6 @@ .cfi_personality 0x0,local_pers .cfi_lsda 0x0,LSDA .ent f1 - .type f1, @function f1: nop .end f1 @@ -12,7 +11,6 @@ f1: .cfi_personality 0x0,hidden_pers .cfi_lsda 0x0,LSDA .ent f2 - .type f2, @function f2: nop .end f2 @@ -22,7 +20,6 @@ f2: .cfi_personality 0x0,global_pers .cfi_lsda 0x0,LSDA .ent f3 - .type f3, @function f3: nop .end f3 @@ -32,7 +29,6 @@ f3: .cfi_personality 0x0,extern_pers .cfi_lsda 0x0,LSDA .ent f4 - .type f4, @function f4: nop .end f4 @@ -42,7 +38,6 @@ f4: .cfi_personality 0x80,local_indirect_ptr .cfi_lsda 0x0,LSDA .ent f5 - .type f5, @function f5: nop .end f5 @@ -52,7 +47,6 @@ f5: .cfi_personality 0x80,hidden_indirect_ptr .cfi_lsda 0x0,LSDA .ent f6 - .type f6, @function f6: nop .end f6 @@ -62,7 +56,6 @@ f6: .cfi_personality 0x80,global_indirect_ptr .cfi_lsda 0x0,LSDA .ent f7 - .type f7, @function f7: nop .end f7 @@ -72,7 +65,6 @@ f7: .cfi_personality 0x80,extern_indirect_ptr .cfi_lsda 0x0,LSDA .ent f8 - .type f8, @function f8: nop .end f8 @@ -80,7 +72,6 @@ f8: .ent local_pers - .type local_pers, @function local_pers: nop .end local_pers @@ -88,14 +79,12 @@ 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 ccf20db024a..5ee00dc4add 100644 --- a/ld/testsuite/ld-mips-elf/ehdr_start-new.s +++ b/ld/testsuite/ld-mips-elf/ehdr_start-new.s @@ -2,7 +2,6 @@ .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 60a5854b9b8..09734473fa3 100644 --- a/ld/testsuite/ld-mips-elf/ehdr_start-o32.s +++ b/ld/testsuite/ld-mips-elf/ehdr_start-o32.s @@ -2,7 +2,6 @@ .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/mips16-call-global-1.s b/ld/testsuite/ld-mips-elf/mips16-call-global-1.s index 485e77c31ef..4c6d0a43aae 100644 --- a/ld/testsuite/ld-mips-elf/mips16-call-global-1.s +++ b/ld/testsuite/ld-mips-elf/mips16-call-global-1.s @@ -1,7 +1,6 @@ .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 56527ea217b..c596619c949 100644 --- a/ld/testsuite/ld-mips-elf/mips16-intermix-1.s +++ b/ld/testsuite/ld-mips-elf/mips16-intermix-1.s @@ -1,7 +1,6 @@ .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 1fc03c40eb7..9a17072f2e4 100644 --- a/ld/testsuite/ld-mips-elf/mips16-pic-1b.s +++ b/ld/testsuite/ld-mips-elf/mips16-pic-1b.s @@ -12,7 +12,6 @@ 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 985a7f150d5..338d378d756 100644 --- a/ld/testsuite/ld-mips-elf/mips16-pic-4c.s +++ b/ld/testsuite/ld-mips-elf/mips16-pic-4c.s @@ -7,7 +7,6 @@ .section .mips16.call.f2, "ax", @progbits .ent __call - .type __call, @function __call: la $25,f2 jr $25 @@ -19,7 +18,6 @@ __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 c63b8c879c4..8eedf12157b 100644 --- a/ld/testsuite/ld-mips-elf/no-shared-1-n64.s +++ b/ld/testsuite/ld-mips-elf/no-shared-1-n64.s @@ -1,7 +1,6 @@ .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 80be39bf36a..f00fc4ba915 100644 --- a/ld/testsuite/ld-mips-elf/no-shared-1-o32.s +++ b/ld/testsuite/ld-mips-elf/no-shared-1-o32.s @@ -1,7 +1,6 @@ .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 abd01568912..1eff3093c8b 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,7 +1,6 @@ .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 2615f24a224..5739fef104d 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-1b.s +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1b.s @@ -1,7 +1,6 @@ .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 f360b0eb2df..45a490f945a 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-2a.s +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-2a.s @@ -1,7 +1,6 @@ .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 2a9ad89dee6..571c774cdf7 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.s +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.s @@ -1,7 +1,6 @@ .abicalls .option pic0 .global __start - .type __start, @function .ent __start __start: jal foo @@ -9,7 +8,6 @@ __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 863a01b02cc..7e25bf48bf4 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.s +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.s @@ -1,7 +1,6 @@ .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 e85655fbe1a..7452f5e8e3a 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-5a.s +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5a.s @@ -1,7 +1,6 @@ .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 3d5660c2ade..578626a18ca 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,7 +2,6 @@ .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 3d5660c2ade..578626a18ca 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,7 +2,6 @@ .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 3d5660c2ade..578626a18ca 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,7 +2,6 @@ .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 442de015006..c7f2b206b9f 100644 --- a/ld/testsuite/ld-mips-elf/pie.s +++ b/ld/testsuite/ld-mips-elf/pie.s @@ -1,6 +1,5 @@ .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 b8478faef02..ba7ea1a04dd 100644 --- a/ld/testsuite/ld-mips-elf/relax-jalr.s +++ b/ld/testsuite/ld-mips-elf/relax-jalr.s @@ -1,7 +1,6 @@ - .globl __start - .type __start, @function +.globl __start .space 8 - .ent __start +.ent __start __start: .Lstart: .space 16 @@ -10,7 +9,7 @@ __start: jal __start .space 64 jal .Lstart - .end __start +.end __start # make objdump print ... .space 8 -- 2.30.2