From 99262e37efe7767e8d07aabdddf793dadc14c3ce Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Mon, 6 Aug 2012 21:28:45 +0000 Subject: [PATCH] gas/testsuite/ * gas/mips/mips.exp: Set has_newabi for all Linux targets. * gas/mips/cfi-n64-1.d: Adjust for targets that do not infer the ISA from the ABI. * gas/mips/elf-rel-got-n32.d: Likewise. * gas/mips/elf-rel-got-n64.d: Likewise. * gas/mips/elf-rel-xgot-n32.d: Likewise. * gas/mips/elf-rel-xgot-n64.d: Likewise. * gas/mips/elf-rel18.d: Likewise. * gas/mips/elf-rel28-n32.d: Likewise. * gas/mips/elf-rel28-n64.d: Likewise. * gas/mips/jal-newabi.d: Likewise. * gas/mips/ldstla-n64-shared.d: Likewise. * gas/mips/ldstla-n64-sym32.d: Likewise. * gas/mips/ldstla-n64.d: Likewise. * gas/mips/macro-warn-1-n32.d: Likewise. * gas/mips/macro-warn-2-n32.d: Likewise. * gas/mips/n32-consec.d: Likewise. ld/testsuite/ * ld-mips-elf/mips-elf.exp: Set has_newabi for all Linux targets. Adjust abi_asflags for targets that do not infer the ISA from the ABI. * ld-mips-elf/eh-frame1-n32.d: Adjust for targets that do not infer the ISA from the ABI. * ld-mips-elf/eh-frame1-n64.d: Likewise. * ld-mips-elf/eh-frame2-n32.d: Likewise. * ld-mips-elf/eh-frame2-n64.d: Likewise. * ld-mips-elf/elf-rel-got-n32-embed.d: Likewise. * ld-mips-elf/elf-rel-got-n32.d: Likewise. * ld-mips-elf/elf-rel-got-n64-embed.d: Likewise. * ld-mips-elf/elf-rel-got-n64-linux.d: Likewise. * ld-mips-elf/elf-rel-got-n64.d: Likewise. * ld-mips-elf/elf-rel-xgot-n32-embed.d: Likewise. * ld-mips-elf/elf-rel-xgot-n32.d: Likewise. * ld-mips-elf/elf-rel-xgot-n64-embed.d: Likewise. * ld-mips-elf/elf-rel-xgot-n64-linux.d: Likewise. * ld-mips-elf/elf-rel-xgot-n64.d: Likewise. * ld-mips-elf/emit-relocs-1.d: Likewise. * ld-mips-elf/got-page-2.d: Likewise. * ld-mips-elf/no-shared-1-n32.d: Likewise. * ld-mips-elf/no-shared-1-n64.d: Likewise. * ld-mips-elf/rel32-n32.d: Likewise. * ld-mips-elf/rel64.d: Likewise. * ld-mips-elf/relax-jalr-n32-shared.d: Likewise. * ld-mips-elf/relax-jalr-n32.d: Likewise. * ld-mips-elf/relax-jalr-n64-shared.d: Likewise. * ld-mips-elf/relax-jalr-n64.d: Likewise. * ld-mips-elf/reloc-1-n32.d: Likewise. * ld-mips-elf/reloc-1-n64.d: Likewise. * ld-mips-elf/textrel-1.d: Likewise. --- gas/testsuite/ChangeLog | 20 +++++++++++ gas/testsuite/gas/mips/cfi-n64-1.d | 2 +- gas/testsuite/gas/mips/elf-rel-got-n32.d | 2 +- gas/testsuite/gas/mips/elf-rel-got-n64.d | 2 +- gas/testsuite/gas/mips/elf-rel-xgot-n32.d | 2 +- gas/testsuite/gas/mips/elf-rel-xgot-n64.d | 2 +- gas/testsuite/gas/mips/elf-rel18.d | 2 +- gas/testsuite/gas/mips/elf-rel28-n32.d | 2 +- gas/testsuite/gas/mips/elf-rel28-n64.d | 2 +- gas/testsuite/gas/mips/jal-newabi.d | 2 +- gas/testsuite/gas/mips/ldstla-n64-shared.d | 2 +- gas/testsuite/gas/mips/ldstla-n64-sym32.d | 2 +- gas/testsuite/gas/mips/ldstla-n64.d | 2 +- gas/testsuite/gas/mips/macro-warn-1-n32.d | 2 +- gas/testsuite/gas/mips/macro-warn-2-n32.d | 2 +- gas/testsuite/gas/mips/mips.exp | 2 +- gas/testsuite/gas/mips/n32-consec.d | 2 +- ld/testsuite/ChangeLog | 34 +++++++++++++++++++ ld/testsuite/ld-mips-elf/eh-frame1-n32.d | 2 +- ld/testsuite/ld-mips-elf/eh-frame1-n64.d | 2 +- ld/testsuite/ld-mips-elf/eh-frame2-n32.d | 2 +- ld/testsuite/ld-mips-elf/eh-frame2-n64.d | 2 +- .../ld-mips-elf/elf-rel-got-n32-embed.d | 2 +- ld/testsuite/ld-mips-elf/elf-rel-got-n32.d | 2 +- .../ld-mips-elf/elf-rel-got-n64-embed.d | 2 +- .../ld-mips-elf/elf-rel-got-n64-linux.d | 2 +- ld/testsuite/ld-mips-elf/elf-rel-got-n64.d | 2 +- .../ld-mips-elf/elf-rel-xgot-n32-embed.d | 2 +- ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d | 2 +- .../ld-mips-elf/elf-rel-xgot-n64-embed.d | 2 +- .../ld-mips-elf/elf-rel-xgot-n64-linux.d | 2 +- ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d | 2 +- ld/testsuite/ld-mips-elf/emit-relocs-1.d | 4 +-- ld/testsuite/ld-mips-elf/got-page-2.d | 2 +- ld/testsuite/ld-mips-elf/mips-elf.exp | 6 ++-- ld/testsuite/ld-mips-elf/no-shared-1-n32.d | 2 +- ld/testsuite/ld-mips-elf/no-shared-1-n64.d | 2 +- ld/testsuite/ld-mips-elf/rel32-n32.d | 2 +- ld/testsuite/ld-mips-elf/rel64.d | 2 +- .../ld-mips-elf/relax-jalr-n32-shared.d | 2 +- ld/testsuite/ld-mips-elf/relax-jalr-n32.d | 2 +- .../ld-mips-elf/relax-jalr-n64-shared.d | 2 +- ld/testsuite/ld-mips-elf/relax-jalr-n64.d | 2 +- ld/testsuite/ld-mips-elf/reloc-1-n32.d | 4 +-- ld/testsuite/ld-mips-elf/reloc-1-n64.d | 4 +-- ld/testsuite/ld-mips-elf/textrel-1.d | 2 +- 46 files changed, 103 insertions(+), 49 deletions(-) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index d279b2e7199..80c03cfc252 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,23 @@ +2012-08-06 Maciej W. Rozycki + + * gas/mips/mips.exp: Set has_newabi for all Linux targets. + * gas/mips/cfi-n64-1.d: Adjust for targets that do not infer the + ISA from the ABI. + * gas/mips/elf-rel-got-n32.d: Likewise. + * gas/mips/elf-rel-got-n64.d: Likewise. + * gas/mips/elf-rel-xgot-n32.d: Likewise. + * gas/mips/elf-rel-xgot-n64.d: Likewise. + * gas/mips/elf-rel18.d: Likewise. + * gas/mips/elf-rel28-n32.d: Likewise. + * gas/mips/elf-rel28-n64.d: Likewise. + * gas/mips/jal-newabi.d: Likewise. + * gas/mips/ldstla-n64-shared.d: Likewise. + * gas/mips/ldstla-n64-sym32.d: Likewise. + * gas/mips/ldstla-n64.d: Likewise. + * gas/mips/macro-warn-1-n32.d: Likewise. + * gas/mips/macro-warn-2-n32.d: Likewise. + * gas/mips/n32-consec.d: Likewise. + 2012-08-06 Maciej W. Rozycki * gas/mips/mips.exp: Set has_newabi for mips*-sde-elf* too. diff --git a/gas/testsuite/gas/mips/cfi-n64-1.d b/gas/testsuite/gas/mips/cfi-n64-1.d index 808b3dae809..29d58ffb82b 100644 --- a/gas/testsuite/gas/mips/cfi-n64-1.d +++ b/gas/testsuite/gas/mips/cfi-n64-1.d @@ -1,4 +1,4 @@ -#as: -64 -EB +#as: -march=from-abi -64 -EB #objdump: -sj.eh_frame .* diff --git a/gas/testsuite/gas/mips/elf-rel-got-n32.d b/gas/testsuite/gas/mips/elf-rel-got-n32.d index 41c2c3ea2fc..45584444205 100644 --- a/gas/testsuite/gas/mips/elf-rel-got-n32.d +++ b/gas/testsuite/gas/mips/elf-rel-got-n32.d @@ -1,6 +1,6 @@ #objdump: -dr --prefix-addresses --show-raw-insn #name: MIPS ELF got reloc n32 -#as: -n32 -KPIC +#as: -march=from-abi -n32 -KPIC .*: +file format elf32-n.*mips.* diff --git a/gas/testsuite/gas/mips/elf-rel-got-n64.d b/gas/testsuite/gas/mips/elf-rel-got-n64.d index 9b971c011fd..0a6c7e4118f 100644 --- a/gas/testsuite/gas/mips/elf-rel-got-n64.d +++ b/gas/testsuite/gas/mips/elf-rel-got-n64.d @@ -1,6 +1,6 @@ #objdump: -dr --prefix-addresses --show-raw-insn #name: MIPS ELF got reloc n64 -#as: -64 -KPIC +#as: -march=from-abi -64 -KPIC .*: +file format elf64-.*mips.* diff --git a/gas/testsuite/gas/mips/elf-rel-xgot-n32.d b/gas/testsuite/gas/mips/elf-rel-xgot-n32.d index b40e802ca39..cec8fc4e69d 100644 --- a/gas/testsuite/gas/mips/elf-rel-xgot-n32.d +++ b/gas/testsuite/gas/mips/elf-rel-xgot-n32.d @@ -1,6 +1,6 @@ #objdump: -dr --prefix-addresses --show-raw-insn #name: MIPS ELF xgot reloc n32 -#as: -n32 -KPIC -xgot +#as: -march=from-abi -n32 -KPIC -xgot #source: elf-rel-got-n32.s .*: +file format elf32-n.*mips.* diff --git a/gas/testsuite/gas/mips/elf-rel-xgot-n64.d b/gas/testsuite/gas/mips/elf-rel-xgot-n64.d index fd98c9c3428..9c4ecd3a3f7 100644 --- a/gas/testsuite/gas/mips/elf-rel-xgot-n64.d +++ b/gas/testsuite/gas/mips/elf-rel-xgot-n64.d @@ -1,6 +1,6 @@ #objdump: -dr --prefix-addresses --show-raw-insn #name: MIPS ELF xgot reloc n64 -#as: -64 -KPIC -xgot +#as: -march=from-abi -64 -KPIC -xgot #source: elf-rel-got-n64.s .*: +file format elf64-.*mips.* diff --git a/gas/testsuite/gas/mips/elf-rel18.d b/gas/testsuite/gas/mips/elf-rel18.d index fa467a42cd4..87b9d92400e 100644 --- a/gas/testsuite/gas/mips/elf-rel18.d +++ b/gas/testsuite/gas/mips/elf-rel18.d @@ -1,5 +1,5 @@ #readelf: --relocs -#as: -mabi=n32 -KPIC +#as: -march=from-abi -mabi=n32 -KPIC Relocation section '\.rela\.text' at offset .* contains 4 entries: Offset Info Type Sym.Value Sym. Name \+ Addend diff --git a/gas/testsuite/gas/mips/elf-rel28-n32.d b/gas/testsuite/gas/mips/elf-rel28-n32.d index dbca20bf6e9..b8ac5206c37 100644 --- a/gas/testsuite/gas/mips/elf-rel28-n32.d +++ b/gas/testsuite/gas/mips/elf-rel28-n32.d @@ -1,5 +1,5 @@ #source: elf-rel28.s -#as: -n32 +#as: -march=from-abi -n32 #objdump: -dr #name: MIPS ELF reloc 28 (n32) diff --git a/gas/testsuite/gas/mips/elf-rel28-n64.d b/gas/testsuite/gas/mips/elf-rel28-n64.d index be38e7d9cd1..dd647ed56ac 100644 --- a/gas/testsuite/gas/mips/elf-rel28-n64.d +++ b/gas/testsuite/gas/mips/elf-rel28-n64.d @@ -1,5 +1,5 @@ #source: elf-rel28.s -#as: -64 +#as: -march=from-abi -64 #objdump: -dr #name: MIPS ELF reloc 28 (n64) diff --git a/gas/testsuite/gas/mips/jal-newabi.d b/gas/testsuite/gas/mips/jal-newabi.d index 77a0b2b71c1..c49abc4f3d4 100644 --- a/gas/testsuite/gas/mips/jal-newabi.d +++ b/gas/testsuite/gas/mips/jal-newabi.d @@ -1,6 +1,6 @@ #objdump: -dr --prefix-addresses --show-raw-insn #name: MIPS ELF NewABI jal -#as: -n32 -KPIC -xgot +#as: -march=from-abi -n32 -KPIC -xgot .*: +file format elf32-n.*mips.* diff --git a/gas/testsuite/gas/mips/ldstla-n64-shared.d b/gas/testsuite/gas/mips/ldstla-n64-shared.d index ede34a5bc77..43ec0fd667a 100644 --- a/gas/testsuite/gas/mips/ldstla-n64-shared.d +++ b/gas/testsuite/gas/mips/ldstla-n64-shared.d @@ -1,5 +1,5 @@ #objdump: -d -#as: -KPIC -64 +#as: -march=from-abi -KPIC -64 #name: MIPS ld-st-la constants (ABI n64, shared) #source: ldstla-n64.s diff --git a/gas/testsuite/gas/mips/ldstla-n64-sym32.d b/gas/testsuite/gas/mips/ldstla-n64-sym32.d index 066d7499055..3f547dbccc6 100644 --- a/gas/testsuite/gas/mips/ldstla-n64-sym32.d +++ b/gas/testsuite/gas/mips/ldstla-n64-sym32.d @@ -1,5 +1,5 @@ #objdump: -dr -#as: -64 -msym32 -G8 -EB +#as: -march=from-abi -64 -msym32 -G8 -EB #name: MIPS ld-st-la with sym32 #source: ldstla-sym32.s diff --git a/gas/testsuite/gas/mips/ldstla-n64.d b/gas/testsuite/gas/mips/ldstla-n64.d index dd028fce00a..99c903359e6 100644 --- a/gas/testsuite/gas/mips/ldstla-n64.d +++ b/gas/testsuite/gas/mips/ldstla-n64.d @@ -1,5 +1,5 @@ #objdump: -d -#as: -64 +#as: -march=from-abi -64 #name: MIPS ld-st-la constants (ABI n64) #source: ldstla-n64.s diff --git a/gas/testsuite/gas/mips/macro-warn-1-n32.d b/gas/testsuite/gas/mips/macro-warn-1-n32.d index 08ea8d8694a..60c10d1f8ff 100644 --- a/gas/testsuite/gas/mips/macro-warn-1-n32.d +++ b/gas/testsuite/gas/mips/macro-warn-1-n32.d @@ -1,4 +1,4 @@ -#as: -n32 -KPIC +#as: -march=from-abi -n32 -KPIC #source: macro-warn-1.s #stderr: macro-warn-1-n32.l #objdump: -p diff --git a/gas/testsuite/gas/mips/macro-warn-2-n32.d b/gas/testsuite/gas/mips/macro-warn-2-n32.d index 7a8c20638bf..49454d022c2 100644 --- a/gas/testsuite/gas/mips/macro-warn-2-n32.d +++ b/gas/testsuite/gas/mips/macro-warn-2-n32.d @@ -1,4 +1,4 @@ -#as: -n32 -KPIC +#as: -march=from-abi -n32 -KPIC #source: macro-warn-2.s #objdump: -p #pass diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp index f2b585c5d86..1cc4b6fb28c 100644 --- a/gas/testsuite/gas/mips/mips.exp +++ b/gas/testsuite/gas/mips/mips.exp @@ -458,7 +458,7 @@ if { [istarget mips*-*-vxworks*] } { set ecoff [expr [istarget *-*-ecoff*] || [istarget *-*-ultrix*] || [istarget *-*-irix\[1-4\]*] ] set aout [expr [istarget *-*-bsd*] || [istarget *-*-openbsd*] ] set addr32 [expr [istarget mipstx39*-*-*] || [istarget mips-*-linux*] || [istarget mipsel-*-linux*] || [istarget mips*-*-ecoff]] - set has_newabi [expr [istarget *-*-irix6*] || [istarget mips64*-*-linux*] || [istarget mips*-sde-elf*]] + set has_newabi [expr [istarget *-*-irix6*] || [istarget mips*-*-linux*] || [istarget mips*-sde-elf*]] set no_mips16 [expr !$elf] set no_micromips [expr !$elf] diff --git a/gas/testsuite/gas/mips/n32-consec.d b/gas/testsuite/gas/mips/n32-consec.d index 355d92e3b19..806857e8162 100644 --- a/gas/testsuite/gas/mips/n32-consec.d +++ b/gas/testsuite/gas/mips/n32-consec.d @@ -1,4 +1,4 @@ -#as: -n32 +#as: -march=from-abi -n32 #objdump: -Dr --prefix-addresses #name: n32 consecutive unrelated relocations diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 49bcaf9f97f..7f93d4dbdd0 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,37 @@ +2012-08-06 Maciej W. Rozycki + + * ld-mips-elf/mips-elf.exp: Set has_newabi for all Linux targets. + Adjust abi_asflags for targets that do not infer the ISA from the + ABI. + * ld-mips-elf/eh-frame1-n32.d: Adjust for targets that do not + infer the ISA from the ABI. + * ld-mips-elf/eh-frame1-n64.d: Likewise. + * ld-mips-elf/eh-frame2-n32.d: Likewise. + * ld-mips-elf/eh-frame2-n64.d: Likewise. + * ld-mips-elf/elf-rel-got-n32-embed.d: Likewise. + * ld-mips-elf/elf-rel-got-n32.d: Likewise. + * ld-mips-elf/elf-rel-got-n64-embed.d: Likewise. + * ld-mips-elf/elf-rel-got-n64-linux.d: Likewise. + * ld-mips-elf/elf-rel-got-n64.d: Likewise. + * ld-mips-elf/elf-rel-xgot-n32-embed.d: Likewise. + * ld-mips-elf/elf-rel-xgot-n32.d: Likewise. + * ld-mips-elf/elf-rel-xgot-n64-embed.d: Likewise. + * ld-mips-elf/elf-rel-xgot-n64-linux.d: Likewise. + * ld-mips-elf/elf-rel-xgot-n64.d: Likewise. + * ld-mips-elf/emit-relocs-1.d: Likewise. + * ld-mips-elf/got-page-2.d: Likewise. + * ld-mips-elf/no-shared-1-n32.d: Likewise. + * ld-mips-elf/no-shared-1-n64.d: Likewise. + * ld-mips-elf/rel32-n32.d: Likewise. + * ld-mips-elf/rel64.d: Likewise. + * ld-mips-elf/relax-jalr-n32-shared.d: Likewise. + * ld-mips-elf/relax-jalr-n32.d: Likewise. + * ld-mips-elf/relax-jalr-n64-shared.d: Likewise. + * ld-mips-elf/relax-jalr-n64.d: Likewise. + * ld-mips-elf/reloc-1-n32.d: Likewise. + * ld-mips-elf/reloc-1-n64.d: Likewise. + * ld-mips-elf/textrel-1.d: Likewise. + 2012-08-06 Maciej W. Rozycki * ld-mips-elf/reloc-1-n32.d: Add -EB to GAS flags. diff --git a/ld/testsuite/ld-mips-elf/eh-frame1-n32.d b/ld/testsuite/ld-mips-elf/eh-frame1-n32.d index a460512a978..0542ebd6978 100644 --- a/ld/testsuite/ld-mips-elf/eh-frame1-n32.d +++ b/ld/testsuite/ld-mips-elf/eh-frame1-n32.d @@ -1,7 +1,7 @@ #name: MIPS eh-frame 1, n32 #source: eh-frame1.s #source: eh-frame1.s -#as: -EB -n32 --defsym alignment=2 --defsym fill=0x40 +#as: -march=from-abi -EB -n32 --defsym alignment=2 --defsym fill=0x40 #readelf: --relocs -wf #ld: -shared -melf32btsmipn32 -Teh-frame1.ld #warning: fde encoding in.*prevents \.eh_frame_hdr table being created. diff --git a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d index c77315f9cb4..f0c4dcdbf7e 100644 --- a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d +++ b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d @@ -1,7 +1,7 @@ #name: MIPS eh-frame 1, n64 #source: eh-frame1.s #source: eh-frame1.s -#as: -EB -64 --defsym alignment=3 --defsym fill=0x40 +#as: -march=from-abi -EB -64 --defsym alignment=3 --defsym fill=0x40 #readelf: --relocs -wf #ld: -shared -melf64btsmip -Teh-frame1.ld #warning: fde encoding in.*prevents \.eh_frame_hdr table being created. diff --git a/ld/testsuite/ld-mips-elf/eh-frame2-n32.d b/ld/testsuite/ld-mips-elf/eh-frame2-n32.d index e2649559153..cda44097f7b 100644 --- a/ld/testsuite/ld-mips-elf/eh-frame2-n32.d +++ b/ld/testsuite/ld-mips-elf/eh-frame2-n32.d @@ -1,7 +1,7 @@ #name: MIPS eh-frame 2, n32 #source: eh-frame1.s #source: eh-frame1.s -#as: -EB -n32 --defsym alignment=2 --defsym fill=0 +#as: -march=from-abi -EB -n32 --defsym alignment=2 --defsym fill=0 #readelf: --relocs -wf #ld: -shared -melf32btsmipn32 -Teh-frame1.ld #warning: fde encoding in.*prevents \.eh_frame_hdr table being created. diff --git a/ld/testsuite/ld-mips-elf/eh-frame2-n64.d b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d index 237c3d46f9c..80a092cc55d 100644 --- a/ld/testsuite/ld-mips-elf/eh-frame2-n64.d +++ b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d @@ -1,7 +1,7 @@ #name: MIPS eh-frame 2, n64 #source: eh-frame1.s #source: eh-frame1.s -#as: -EB -64 --defsym alignment=3 --defsym fill=0 +#as: -march=from-abi -EB -64 --defsym alignment=3 --defsym fill=0 #readelf: --relocs -wf #ld: -shared -melf64btsmip -Teh-frame1.ld #warning: fde encoding in.*prevents \.eh_frame_hdr table being created. diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n32-embed.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n32-embed.d index 69c8b7fe29a..d492998be81 100644 --- a/ld/testsuite/ld-mips-elf/elf-rel-got-n32-embed.d +++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n32-embed.d @@ -1,5 +1,5 @@ #name: MIPS ELF got reloc n32 -#as: -EB -n32 -KPIC +#as: -march=from-abi -EB -n32 -KPIC #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s #ld: #objdump: -D --show-raw-insn diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d index 1b21726d130..535a538e712 100644 --- a/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d +++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n32.d @@ -1,5 +1,5 @@ #name: MIPS ELF got reloc n32 -#as: -EB -n32 -KPIC +#as: -march=from-abi -EB -n32 -KPIC #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s #ld: #objdump: -D --show-raw-insn diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n64-embed.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-embed.d index 07a97f905f6..f2719f07140 100644 --- a/ld/testsuite/ld-mips-elf/elf-rel-got-n64-embed.d +++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-embed.d @@ -1,5 +1,5 @@ #name: MIPS ELF got reloc n64 -#as: -EB -64 -KPIC +#as: -march=from-abi -EB -64 -KPIC #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s #ld: #objdump: -D --show-raw-insn diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d index c8d59098d2d..c1c332645fc 100644 --- a/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d +++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-linux.d @@ -1,5 +1,5 @@ #name: MIPS ELF got reloc n64 -#as: -EB -64 -KPIC +#as: -march=from-abi -EB -64 -KPIC #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s #ld: #objdump: -D --show-raw-insn diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d index 32589fb9114..55dd7ae65ef 100644 --- a/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d +++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n64.d @@ -1,5 +1,5 @@ #name: MIPS ELF got reloc n64 -#as: -EB -64 -KPIC +#as: -march=from-abi -EB -64 -KPIC #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s #ld: #objdump: -D --show-raw-insn diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32-embed.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32-embed.d index edcbbf07ab6..1d0c045d041 100644 --- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32-embed.d +++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32-embed.d @@ -1,5 +1,5 @@ #name: MIPS ELF xgot reloc n32 -#as: -EB -n32 -KPIC -xgot +#as: -march=from-abi -EB -n32 -KPIC -xgot #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s #ld: #objdump: -D --show-raw-insn diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d index e8a3aec17ee..4e105aa0ab0 100644 --- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d +++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n32.d @@ -1,5 +1,5 @@ #name: MIPS ELF xgot reloc n32 -#as: -EB -n32 -KPIC -xgot +#as: -march=from-abi -EB -n32 -KPIC -xgot #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s #ld: #objdump: -D --show-raw-insn diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-embed.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-embed.d index 4c5a07d6d5e..6da691c575f 100644 --- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-embed.d +++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-embed.d @@ -1,5 +1,5 @@ #name: MIPS ELF xgot reloc n64 -#as: -EB -64 -KPIC -xgot +#as: -march=from-abi -EB -64 -KPIC -xgot #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s #ld: #objdump: -D --show-raw-insn diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d index 58e496f696f..be446f0579e 100644 --- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d +++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-linux.d @@ -1,5 +1,5 @@ #name: MIPS ELF xgot reloc n64 -#as: -EB -64 -KPIC -xgot +#as: -march=from-abi -EB -64 -KPIC -xgot #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s #ld: #objdump: -D --show-raw-insn diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d index 5e6a7f9fc04..6a9ea40513b 100644 --- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d +++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d @@ -1,5 +1,5 @@ #name: MIPS ELF xgot reloc n64 -#as: -EB -64 -KPIC -xgot +#as: -march=from-abi -EB -64 -KPIC -xgot #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s #ld: #objdump: -D --show-raw-insn diff --git a/ld/testsuite/ld-mips-elf/emit-relocs-1.d b/ld/testsuite/ld-mips-elf/emit-relocs-1.d index 520d40181d3..bff7c70e83d 100644 --- a/ld/testsuite/ld-mips-elf/emit-relocs-1.d +++ b/ld/testsuite/ld-mips-elf/emit-relocs-1.d @@ -1,6 +1,6 @@ #name: Emit relocs 1 -#source: emit-relocs-1a.s -mabi=n32 -EB -#source: emit-relocs-1b.s -mabi=n32 -EB +#source: emit-relocs-1a.s -march=from-abi -mabi=n32 -EB +#source: emit-relocs-1b.s -march=from-abi -mabi=n32 -EB #ld: -q -T emit-relocs-1.ld -melf32btsmipn32 #objdump: -sr diff --git a/ld/testsuite/ld-mips-elf/got-page-2.d b/ld/testsuite/ld-mips-elf/got-page-2.d index ad198d0219c..9cdefeb5949 100644 --- a/ld/testsuite/ld-mips-elf/got-page-2.d +++ b/ld/testsuite/ld-mips-elf/got-page-2.d @@ -1,6 +1,6 @@ #name: GOT page test 2 #source: got-page-2.s -#as: -EB -n32 +#as: -march=from-abi -EB -n32 #ld: -T got-page-1.ld -shared -melf32btsmipn32 #readelf: -d # diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp index dc4554df16f..d9430fffaa8 100644 --- a/ld/testsuite/ld-mips-elf/mips-elf.exp +++ b/ld/testsuite/ld-mips-elf/mips-elf.exp @@ -54,15 +54,15 @@ if {![istarget mips*-*-*] || ![is_elf_format]} { } set has_newabi [expr [istarget *-*-irix6*] \ - || [istarget mips64*-*-linux*] \ + || [istarget mips*-*-linux*] \ || [istarget mips*-sde-elf*]] set linux_gnu [expr [istarget mips*-*-linux*]] set embedded_elf [expr [istarget mips*-*-elf]] # Set defaults. set abi_asflags(o32) "" -set abi_asflags(n32) "-n32 -EB" -set abi_asflags(n64) "-64 -EB" +set abi_asflags(n32) "-march=from-abi -n32 -EB" +set abi_asflags(n64) "-march=from-abi -64 -EB" set abi_ldflags(o32) "" set abi_ldflags(n32) -melf32bmipn32 set abi_ldflags(n64) -melf64bmip diff --git a/ld/testsuite/ld-mips-elf/no-shared-1-n32.d b/ld/testsuite/ld-mips-elf/no-shared-1-n32.d index a28b22e8aa7..04c466ea431 100644 --- a/ld/testsuite/ld-mips-elf/no-shared-1-n32.d +++ b/ld/testsuite/ld-mips-elf/no-shared-1-n32.d @@ -1,4 +1,4 @@ -#as: -mabi=n32 -EB +#as: -march=from-abi -mabi=n32 -EB #source: no-shared-1-o32.s #ld: -melf32btsmipn32 -T no-shared-1.ld #objdump: -dr -j.text -j.data -j.got diff --git a/ld/testsuite/ld-mips-elf/no-shared-1-n64.d b/ld/testsuite/ld-mips-elf/no-shared-1-n64.d index ea74ebb07fb..0c919217f3c 100644 --- a/ld/testsuite/ld-mips-elf/no-shared-1-n64.d +++ b/ld/testsuite/ld-mips-elf/no-shared-1-n64.d @@ -1,4 +1,4 @@ -#as: -mabi=64 -EB +#as: -march=from-abi -mabi=64 -EB #ld: -melf64btsmip -T no-shared-1.ld #objdump: -dr -j.text -j.data -j.got diff --git a/ld/testsuite/ld-mips-elf/rel32-n32.d b/ld/testsuite/ld-mips-elf/rel32-n32.d index aae33b3575e..995161561a0 100644 --- a/ld/testsuite/ld-mips-elf/rel32-n32.d +++ b/ld/testsuite/ld-mips-elf/rel32-n32.d @@ -1,6 +1,6 @@ #name: MIPS rel32 n32 #source: rel32.s -#as: -KPIC -EB -n32 +#as: -march=from-abi -KPIC -EB -n32 #readelf: -x .text -r #ld: -shared -melf32btsmipn32 diff --git a/ld/testsuite/ld-mips-elf/rel64.d b/ld/testsuite/ld-mips-elf/rel64.d index 4279e282044..01bffa39084 100644 --- a/ld/testsuite/ld-mips-elf/rel64.d +++ b/ld/testsuite/ld-mips-elf/rel64.d @@ -1,6 +1,6 @@ #name: MIPS rel64 n64 #source: rel64.s -#as: -KPIC -EB -64 +#as: -march=from-abi -KPIC -EB -64 #readelf: -x .text -r #ld: -shared -melf64btsmip diff --git a/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d b/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d index c9288c1d1ad..3b564412d5c 100644 --- a/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d +++ b/ld/testsuite/ld-mips-elf/relax-jalr-n32-shared.d @@ -1,6 +1,6 @@ #name: MIPS relax-jalr-shared n32 #source: relax-jalr.s -#as: -KPIC -n32 -EB +#as: -march=from-abi -KPIC -n32 -EB #objdump: --prefix-addresses -d --show-raw-insn #ld: --relax -shared -melf32btsmipn32 diff --git a/ld/testsuite/ld-mips-elf/relax-jalr-n32.d b/ld/testsuite/ld-mips-elf/relax-jalr-n32.d index 2478b5211bd..3a4b0b6bb9d 100644 --- a/ld/testsuite/ld-mips-elf/relax-jalr-n32.d +++ b/ld/testsuite/ld-mips-elf/relax-jalr-n32.d @@ -1,6 +1,6 @@ #name: MIPS relax-jalr n32 #source: relax-jalr.s -#as: -KPIC -n32 -EB +#as: -march=from-abi -KPIC -n32 -EB #objdump: --prefix-addresses -d --show-raw-insn #ld: --relax -melf32btsmipn32 diff --git a/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d b/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d index e26d5f15466..c0138ea06f9 100644 --- a/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d +++ b/ld/testsuite/ld-mips-elf/relax-jalr-n64-shared.d @@ -1,6 +1,6 @@ #name: MIPS relax-jalr-shared n64 #source: relax-jalr.s -#as: -KPIC -64 -EB +#as: -march=from-abi -KPIC -64 -EB #objdump: --prefix-addresses -d --show-raw-insn #ld: --relax -shared -melf64btsmip diff --git a/ld/testsuite/ld-mips-elf/relax-jalr-n64.d b/ld/testsuite/ld-mips-elf/relax-jalr-n64.d index 9e169747e88..6b4f3f5992b 100644 --- a/ld/testsuite/ld-mips-elf/relax-jalr-n64.d +++ b/ld/testsuite/ld-mips-elf/relax-jalr-n64.d @@ -1,6 +1,6 @@ #name: MIPS relax-jalr n64 #source: relax-jalr.s -#as: -KPIC -64 -EB +#as: -march=from-abi -KPIC -64 -EB #objdump: --prefix-addresses -d --show-raw-insn #ld: --relax -melf64btsmip diff --git a/ld/testsuite/ld-mips-elf/reloc-1-n32.d b/ld/testsuite/ld-mips-elf/reloc-1-n32.d index 57773bb067b..e9f38e5576b 100644 --- a/ld/testsuite/ld-mips-elf/reloc-1-n32.d +++ b/ld/testsuite/ld-mips-elf/reloc-1-n32.d @@ -1,5 +1,5 @@ -#source: reloc-1a.s -mabi=n32 -EB -#source: reloc-1b.s -mabi=n32 -EB +#source: reloc-1a.s -march=from-abi -mabi=n32 -EB +#source: reloc-1b.s -march=from-abi -mabi=n32 -EB #ld: -r #readelf: --relocs diff --git a/ld/testsuite/ld-mips-elf/reloc-1-n64.d b/ld/testsuite/ld-mips-elf/reloc-1-n64.d index 6057c833777..b76f818822a 100644 --- a/ld/testsuite/ld-mips-elf/reloc-1-n64.d +++ b/ld/testsuite/ld-mips-elf/reloc-1-n64.d @@ -1,5 +1,5 @@ -#source: reloc-1a.s -mabi=64 -EB -#source: reloc-1b.s -mabi=64 -EB +#source: reloc-1a.s -march=from-abi -mabi=64 -EB +#source: reloc-1b.s -march=from-abi -mabi=64 -EB #ld: -r #readelf: --relocs diff --git a/ld/testsuite/ld-mips-elf/textrel-1.d b/ld/testsuite/ld-mips-elf/textrel-1.d index b0615b57125..801c5861e3e 100644 --- a/ld/testsuite/ld-mips-elf/textrel-1.d +++ b/ld/testsuite/ld-mips-elf/textrel-1.d @@ -1,6 +1,6 @@ #name: MIPS textrel-1 #source: textrel-1.s -#as: -EB -n32 +#as: -march=from-abi -EB -n32 #ld: -shared -melf32btsmipn32 #readelf: -d -- 2.30.2