From 3c0afdb789887984f13efd7a4c47ce8de265b02d Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Thu, 15 Jun 2023 04:45:03 +0100 Subject: Revert "MIPS: fix -gnuabi64 testsuite" This reverts commit cb81e84c72933a7fad10b75b7e270d92d8d65251. It was applied unapproved. --- ld/testsuite/ld-mips-elf/compact-eh6.d | 6 +++--- ld/testsuite/ld-mips-elf/got-dump-1.d | 22 +++++++++++----------- ld/testsuite/ld-mips-elf/got-page-1.ld | 2 +- ld/testsuite/ld-mips-elf/got-page-3.d | 11 +++++------ ld/testsuite/ld-mips-elf/jaloverflow-2.d | 2 +- ld/testsuite/ld-mips-elf/jalx-1.d | 10 +++++----- ld/testsuite/ld-mips-elf/mips-elf.exp | 28 +++------------------------- ld/testsuite/ld-mips-elf/reloc-estimate-1.d | 4 ++-- 8 files changed, 31 insertions(+), 54 deletions(-) (limited to 'ld/testsuite/ld-mips-elf') diff --git a/ld/testsuite/ld-mips-elf/compact-eh6.d b/ld/testsuite/ld-mips-elf/compact-eh6.d index 66b21b1..e81285a 100644 --- a/ld/testsuite/ld-mips-elf/compact-eh6.d +++ b/ld/testsuite/ld-mips-elf/compact-eh6.d @@ -8,6 +8,6 @@ Hex dump of section \'\.eh_frame_hdr\': - 0x[0-9a-f]+ 021b0000 00000005 ffffff[0-9a-f]+ 0000006[08].* - 0x[0-9a-f]+ ffffff[0-9a-f]+ 015d5d01 ffffff[0-9a-f]+ 0000002[9d].* - 0x[0-9a-f]+ ffffff[0-9a-f]+ 0000003[59] ffffff[0-9a-f]+ 015d5d01.* + 0x[0-9a-f]+ 021b0000 00000005 ffffff[0-9a-f]+ 00000060.* + 0x[0-9a-f]+ ffffff[0-9a-f]+ 015d5d01 ffffff[0-9a-f]+ 00000029.* + 0x[0-9a-f]+ ffffff[0-9a-f]+ 00000035 ffffff[0-9a-f]+ 015d5d01.* diff --git a/ld/testsuite/ld-mips-elf/got-dump-1.d b/ld/testsuite/ld-mips-elf/got-dump-1.d index 00c976c..b14adff 100644 --- a/ld/testsuite/ld-mips-elf/got-dump-1.d +++ b/ld/testsuite/ld-mips-elf/got-dump-1.d @@ -5,21 +5,21 @@ #readelf: -A Primary GOT: - Canonical gp value: 0+068000 + Canonical gp value: 00068000 Reserved entries: - * Address * Access * Initial Purpose - 0+060010 -32752\(gp\) 0+000000 Lazy resolver - 0+06001[48] -3274[48]\(gp\) 8000000+ Module pointer \(GNU extension\) + Address Access Initial Purpose + 00060010 -32752\(gp\) 00000000 Lazy resolver + 00060014 -32748\(gp\) 80000000 Module pointer \(GNU extension\) Local entries: - * Address * Access * Initial - 0+0600(18|20) -327(44|36)\(gp\) 0+060000 - 0+0600(1c|28) -327(40|28)\(gp\) 0+060004 + Address Access Initial + 00060018 -32744\(gp\) 00060000 + 0006001c -32740\(gp\) 00060004 Global entries: - * Address * Access * Initial * Sym.Val. Type * Ndx Name - 0+0600(2|3)0 -327(36|20)\(gp\) 0+050020 0+050020 FUNC UND extern - 0+0600(24|38) -327(32|12)\(gp\) 0+050000 0+050000 FUNC 7 glob - 0+0600(28|40) -327(28|04)\(gp\) 0+000000 0+000000 NOTYPE UND undef + Address Access Initial Sym.Val. Type Ndx Name + 00060020 -32736\(gp\) 00050020 00050020 FUNC UND extern + 00060024 -32732\(gp\) 00050000 00050000 FUNC 7 glob + 00060028 -32728\(gp\) 00000000 00000000 NOTYPE UND undef diff --git a/ld/testsuite/ld-mips-elf/got-page-1.ld b/ld/testsuite/ld-mips-elf/got-page-1.ld index b87abbf..cfe7c1f 100644 --- a/ld/testsuite/ld-mips-elf/got-page-1.ld +++ b/ld/testsuite/ld-mips-elf/got-page-1.ld @@ -22,7 +22,7 @@ SECTIONS . = ALIGN (0x400); .bss : { *(.bss .bss.*) } - /DISCARD/ : { *(.reginfo) *(.MIPS.abiflags) *(.MIPS.options) } + /DISCARD/ : { *(.reginfo) *(.MIPS.abiflags) } } VERSION diff --git a/ld/testsuite/ld-mips-elf/got-page-3.d b/ld/testsuite/ld-mips-elf/got-page-3.d index 430dd22..913b0c9 100644 --- a/ld/testsuite/ld-mips-elf/got-page-3.d +++ b/ld/testsuite/ld-mips-elf/got-page-3.d @@ -5,7 +5,6 @@ #as: -mips3 #ld: -T got-page-1.ld -shared #objdump: -dr -#xfail: mips*64*-linux-gnuabi64 # # got-page-3a.s and got-page-3b.s should get assigned the same GOT, # with a page estimate of 10. Thus the first page entry has offset @@ -16,12 +15,12 @@ # The first global symbol should therefore be at offset -32744. # #... - *.* lw a0,-32744\(gp\) - *.* addiu a0,a0,.* +.* lw a0,-32744\(gp\) +.* addiu a0,a0,.* #... - *.* lw a1,-32704\(gp\) +.* lw a1,-32704\(gp\) #... - *.* : +.* : #... - *.* lw a1,-32744\(gp\) +.* lw a1,-32744\(gp\) #pass diff --git a/ld/testsuite/ld-mips-elf/jaloverflow-2.d b/ld/testsuite/ld-mips-elf/jaloverflow-2.d index bff776e..b40f428 100644 --- a/ld/testsuite/ld-mips-elf/jaloverflow-2.d +++ b/ld/testsuite/ld-mips-elf/jaloverflow-2.d @@ -4,5 +4,5 @@ #ld: -Ttext=0x20000000 -e start #objdump: -dr #... - *0*20000000: 0c000000.* +0*20000000: 0c000000.* #pass diff --git a/ld/testsuite/ld-mips-elf/jalx-1.d b/ld/testsuite/ld-mips-elf/jalx-1.d index 37cad5d..80c3be2 100644 --- a/ld/testsuite/ld-mips-elf/jalx-1.d +++ b/ld/testsuite/ld-mips-elf/jalx-1.d @@ -7,10 +7,10 @@ Disassembly of section \.text: -0*88000000 : - *88000000: f200 0002 jalx 88000008 - *88000004: 0000 0000 nop +88000000 : +88000000: f200 0002 jalx 88000008 +88000004: 0000 0000 nop -0*88000008 : - *88000008: 00851821 addu v1,a0,a1 +88000008 : +88000008: 00851821 addu v1,a0,a1 \.\.\. diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp index ee0522b..ff9635e 100644 --- a/ld/testsuite/ld-mips-elf/mips-elf.exp +++ b/ld/testsuite/ld-mips-elf/mips-elf.exp @@ -182,25 +182,6 @@ set abi_ldflags(eabi) "" # Override as needed. if {[istarget *-*-openbsd*] } { set irixemul 0 -} elseif { [istarget mips*64*-*-linux*-gnuabi64] } { - set abi_asflags(o32) -32 - set abi_asflags(o32l) "-32 -march=from-abi" - set abi_asflags(n32) "-n32" - set abi_asflags(n32l) "-n32 -march=from-abi" - set abi_asflags(n64) "" - set abi_asflags(n64l) "-64 -march=from-abi" - if [istarget *el-*-*] { - set abi_ldflags(o32) -melf32ltsmip - set abi_ldflags(o32l) -melf32ltsmip - set abi_ldflags(n32) -melf32ltsmipn32 - set abi_ldflags(n32l) -melf32ltsmipn32 - } else { - set abi_ldflags(o32) -melf32btsmip - set abi_ldflags(o32l) -melf32btsmip - set abi_ldflags(n32) -melf32btsmipn32 - set abi_ldflags(n32l) -melf32btsmipn32 - } - set irixemul 0 } elseif { [istarget mips*64*-*-linux*] } { set abi_asflags(o32) -32 set abi_asflags(o32l) "-32 -march=from-abi" @@ -911,8 +892,7 @@ if { $linux_gnu } { } run_dump_test "got-dump-1" run_dump_test_n64 "got-dump-2" noarch - run_dump_test_n32 "reloc-estimate-1" - run_dump_test_o32 "reloc-estimate-1" + run_dump_test "reloc-estimate-1" } run_dump_test_n32 "emit-relocs-1" {{as -EB} {ld -EB}} @@ -1100,8 +1080,7 @@ if { $has_abi(o32) } { run_ld_link_tests $mips16_intermix_test } -run_dump_test_o32 "mips16-local-stubs-1" -run_dump_test_n32 "mips16-local-stubs-1" +run_dump_test "mips16-local-stubs-1" set mips16_fp_stub_test [list \ [list "Floating-point stub for mips16 functions" \ @@ -1127,8 +1106,7 @@ foreach firstfpabi [list 4 5 6 7 ] { } foreach firstfpabi [list 0 1 2 3 ] { foreach secondfpabi [list 0 1 2 3 8 9] { - run_dump_test_o32 "attr-gnu-4-${firstfpabi}${secondfpabi}" - run_dump_test_n32 "attr-gnu-4-${firstfpabi}${secondfpabi}" + run_dump_test "attr-gnu-4-${firstfpabi}${secondfpabi}" } } diff --git a/ld/testsuite/ld-mips-elf/reloc-estimate-1.d b/ld/testsuite/ld-mips-elf/reloc-estimate-1.d index fa536f9..fcca55a 100644 --- a/ld/testsuite/ld-mips-elf/reloc-estimate-1.d +++ b/ld/testsuite/ld-mips-elf/reloc-estimate-1.d @@ -8,8 +8,8 @@ DYNAMIC RELOCATION RECORDS OFFSET +TYPE +VALUE -0+000000 R_MIPS_NONE \*ABS\* -0+010000 R_MIPS_REL32 foo@@V2 +00000000 R_MIPS_NONE \*ABS\* +00010000 R_MIPS_REL32 foo@@V2 # The address must be 0x810. We should only ever allocate one dynamic -- cgit v1.1