From 78da84f9940586202deb4e43decea6d32d237080 Mon Sep 17 00:00:00 2001
From: "Maciej W. Rozycki" <macro@mips.com>
Date: Thu, 12 Jul 2018 20:01:44 +0100
Subject: [PATCH] MIPS/LD/testsuite: Correct mips-elf.exp test ABI/emul/endian
 arrangement

Similarly to commit 86b24e15c45b ("MIPS/LD/testsuite: Correct
comm-data.exp test ABI/emul/endian arrangement") update the mips-elf.exp
test script to:

- correctly select emulations for targets using non-traditional MIPS
  emulations,

- correctly select ABIs for targets that do not support all of them,

- use the default endianness selection where possible to benefit targets
  that support only one,

- simplify test invocation by providing ABI-specific `run_dump_test'
  wrappers, specifically `run_dump_test_o32', `run_dump_test_n32',
  `run_dump_test_n64' and `run_dump_test_eabi', which remove the need to
  use conditionals across the Expect script or to repeat ABI-specific
  GAS and LD flags with each invocation,

removing numerous test failures for `mips-sgi-irix6', `mips64-openbsd',
`mips64el-openbsd' and `mips64el-ps2-elf' targets and broadening
coverage for several MIPS targets.

There are some new failures for the `mips64el-ps2-elf' target with tests
that were not previously run for that target:

FAIL: MIPS16 link branch to absolute expression (n32)
FAIL: MIPS16 link branch to absolute expression 1 (n32)
FAIL: MIPS16 link branch to absolute expression 2 (n32)
FAIL: microMIPS link branch to absolute expression (n32)
FAIL: MIPS ELF got reloc n32
FAIL: MIPS ELF xgot reloc n32
FAIL: undefined weak symbol overflow (n32)
FAIL: R_MIPS16_HI16 and R_MIPS16_LO16 relocs n32
FAIL: ld-mips-elf/attr-gnu-4-0-n32-ph
FAIL: ld-mips-elf/attr-gnu-4-1-n32-ph
FAIL: ld-mips-elf/attr-gnu-4-2-n32-ph
FAIL: ld-mips-elf/attr-gnu-4-3-n32-ph
FAIL: MIPSr6 JALR reloc unaligned/cross-mode link test (n32)

which are mostly due to dump discrepancies caused by mapping differences
coming from the default linker scripts used by these test cases, or
sometimes because of the specific MIPS processor architecture recorded
in the ELF file taking precedence over the general MIPS ISA level also
recorded.  Finally, the R_MIPS16_HI16/R_MIPS16_LO16 relocation test
failure is a preexisting issue with the IRIX style emulation.

These failures will have to be addressed separately.

	ld/
	* testsuite/ld-mips-elf/mips-elf.exp (run_dump_test_abi)
	(run_dump_test_o32, run_dump_test_n32, run_dump_test_n64)
	(run_dump_test_eabi): New procedures.
	(has_newabi, has_elf32): Remove variables.
	(has_abi): New associative array variable.
	(abi_asflags, abi_ldflags): Update settings across targets.
	(irixemul): New variable.
	Replace `run_dump_test' calls where applicable throughout with
	`run_dump_test_o32', `run_dump_test_n32', `run_dump_test_n64'
	and `run_dump_test_eabi' as appropriate.  Remove explicit
	passing of `abi_asflags' and `abi_ldflags'.  Use `noarch' for
	tests that require their own architecture setting.  Force the
	big endianness for tests that require it.  Select the endianness
	required for `objdump invocation with the `reloc-2' test.
	Conditionalize tests run via `run_ld_link_tests' on the ABI
	required and use the ABI list from the `has_abi' array where
	appropriate.
	* testsuite/ld-mips-elf/attr-gnu-4-0-n32-ph.d: Remove ABI and
	endianness selection options from `ld' and `source' tags.  Relax
	output format matching.
	* testsuite/ld-mips-elf/attr-gnu-4-0-n64-ph.d: Likewise.
	* testsuite/ld-mips-elf/attr-gnu-4-1-n32-ph.d: Likewise.
	* testsuite/ld-mips-elf/attr-gnu-4-1-n64-ph.d: Likewise.
	* testsuite/ld-mips-elf/attr-gnu-4-2-n32-ph.d: Likewise.
	* testsuite/ld-mips-elf/attr-gnu-4-2-n64-ph.d: Likewise.
	* testsuite/ld-mips-elf/attr-gnu-4-3-n32-ph.d: Likewise.
	* testsuite/ld-mips-elf/attr-gnu-4-3-n64-ph.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-addend-micromips-n32.d: Remove
	ABI and endianness selection options from `as', `ld', `source'
	tags, and also the `-march=from-abi' option.  Remove the `as'
	tag where it would become empty.
	* testsuite/ld-mips-elf/bal-jalx-addend-micromips-n64.d:
	Likewise.
	* testsuite/ld-mips-elf/bal-jalx-addend-micromips.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-addend-n32.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-addend-n64.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-addend.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-local-micromips-n32.d:
	Likewise.
	* testsuite/ld-mips-elf/bal-jalx-local-micromips-n64.d:
	Likewise.
	* testsuite/ld-mips-elf/bal-jalx-local-micromips.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-local-n32.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-local-n64.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-local.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n32.d:
	Likewise.
	* testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n64.d:
	Likewise.
	* testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips.d:
	Likewise.
	* testsuite/ld-mips-elf/bal-jalx-pic-ignore-n32.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-pic-ignore-n64.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-pic-ignore.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-pic-micromips.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-pic-n32.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-pic-n64.d: Likewise.
	* testsuite/ld-mips-elf/bal-jalx-pic.d: Likewise.
	* testsuite/ld-mips-elf/branch-absolute-addend-n32.d: Likewise.
	* testsuite/ld-mips-elf/branch-absolute-addend-n64.d: Likewise.
	* testsuite/ld-mips-elf/branch-absolute-addend.d: Likewise.
	* testsuite/ld-mips-elf/branch-absolute-n32.d: Likewise.
	* testsuite/ld-mips-elf/branch-absolute-n64.d: Likewise.
	* testsuite/ld-mips-elf/branch-absolute.d: Likewise.
	* testsuite/ld-mips-elf/dyn-sec64.d: Likewise.
	* testsuite/ld-mips-elf/eh-frame1-n32.d: Likewise.
	* testsuite/ld-mips-elf/eh-frame1-n64.d: Likewise.
	* testsuite/ld-mips-elf/eh-frame2-n32.d: Likewise.
	* testsuite/ld-mips-elf/eh-frame2-n64.d: Likewise.
	* testsuite/ld-mips-elf/elf-rel-got-n32-embed.d: Likewise.
	* testsuite/ld-mips-elf/elf-rel-got-n32.d: Likewise.
	* testsuite/ld-mips-elf/elf-rel-got-n64-embed.d: Likewise.
	* testsuite/ld-mips-elf/elf-rel-got-n64-irix.d: Likewise.
	* testsuite/ld-mips-elf/elf-rel-got-n64.d: Likewise.
	* testsuite/ld-mips-elf/elf-rel-xgot-n32-embed.d: Likewise.
	* testsuite/ld-mips-elf/elf-rel-xgot-n32.d: Likewise.
	* testsuite/ld-mips-elf/elf-rel-xgot-n64-embed.d: Likewise.
	* testsuite/ld-mips-elf/elf-rel-xgot-n64-irix.d: Likewise.
	* testsuite/ld-mips-elf/elf-rel-xgot-n64.d: Likewise.
	* testsuite/ld-mips-elf/emit-relocs-1.d: Likewise.
	* testsuite/ld-mips-elf/got-dump-2.d: Likewise.
	* testsuite/ld-mips-elf/got-page-2.d: Likewise.
	* testsuite/ld-mips-elf/jal-global-overflow-0.d: Likewise.
	* testsuite/ld-mips-elf/jal-global-overflow-1.d: Likewise.
	* testsuite/ld-mips-elf/jal-local-overflow-0.d: Likewise.
	* testsuite/ld-mips-elf/jal-local-overflow-1.d: Likewise.
	* testsuite/ld-mips-elf/jalbal.d: Likewise.
	* testsuite/ld-mips-elf/jalx-addend-n32.d: Likewise.
	* testsuite/ld-mips-elf/jalx-addend-n64.d: Likewise.
	* testsuite/ld-mips-elf/jalx-addend.d: Likewise.
	* testsuite/ld-mips-elf/jalx-local-n32.d: Likewise.
	* testsuite/ld-mips-elf/jalx-local-n64.d: Likewise.
	* testsuite/ld-mips-elf/jalx-local.d: Likewise.
	* testsuite/ld-mips-elf/jr-to-b-1.d: Likewise.
	* testsuite/ld-mips-elf/jr-to-b-2.d: Likewise.
	* testsuite/ld-mips-elf/lsi-4010-isa.d: Likewise.
	* testsuite/ld-mips-elf/micromips-branch-absolute-addend-n32.d:
	Likewise.
	* testsuite/ld-mips-elf/micromips-branch-absolute-addend-n64.d:
	Likewise.
	* testsuite/ld-mips-elf/micromips-branch-absolute-addend.d:
	Likewise.
	* testsuite/ld-mips-elf/micromips-branch-absolute-n32.d:
	Likewise.
	* testsuite/ld-mips-elf/micromips-branch-absolute-n64.d:
	Likewise.
	* testsuite/ld-mips-elf/micromips-branch-absolute.d: Likewise.
	* testsuite/ld-mips-elf/mips16-branch-2.d: Likewise.
	* testsuite/ld-mips-elf/mips16-branch-3.d: Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute-1.d: Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute-2.d: Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute-addend-1.d:
	Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute-addend-n32-1.d:
	Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute-addend-n32.d:
	Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute-addend-n64-1.d:
	Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute-addend-n64.d:
	Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute-addend.d:
	Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute-n32-1.d:
	Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute-n32-2.d:
	Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute-n32.d: Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute-n64-1.d:
	Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute-n64-2.d:
	Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute-n64.d: Likewise.
	* testsuite/ld-mips-elf/mips16-branch-absolute.d: Likewise.
	* testsuite/ld-mips-elf/mips16-branch-addend-2.d: Likewise.
	* testsuite/ld-mips-elf/mips16-branch-addend-3.d: Likewise.
	* testsuite/ld-mips-elf/mips16-hilo-n32.d: Likewise.
	* testsuite/ld-mips-elf/mips16-pcrel-0.d: Likewise.
	* testsuite/ld-mips-elf/mips16-pcrel-1.d: Likewise.
	* testsuite/ld-mips-elf/mips16-pcrel-addend-2.d: Likewise.
	* testsuite/ld-mips-elf/mips16-pcrel-addend-6.d: Likewise.
	* testsuite/ld-mips-elf/mips16-pcrel-n32-0.d: Likewise.
	* testsuite/ld-mips-elf/mips16-pcrel-n32-1.d: Likewise.
	* testsuite/ld-mips-elf/mips16-pcrel-n64-sym32-0.d: Likewise.
	* testsuite/ld-mips-elf/mips16-pcrel-n64-sym32-1.d: Likewise.
	* testsuite/ld-mips-elf/mips16e2-pcrel-0.d: Likewise.
	* testsuite/ld-mips-elf/mips16e2-pcrel-1.d: Likewise.
	* testsuite/ld-mips-elf/mips16e2-pcrel-addend-2.d: Likewise.
	* testsuite/ld-mips-elf/mips16e2-pcrel-addend-6.d: Likewise.
	* testsuite/ld-mips-elf/mips16e2-pcrel-n32-0.d: Likewise.
	* testsuite/ld-mips-elf/mips16e2-pcrel-n32-1.d: Likewise.
	* testsuite/ld-mips-elf/mips16e2-pcrel-n64-sym32-0.d: Likewise.
	* testsuite/ld-mips-elf/mips16e2-pcrel-n64-sym32-1.d: Likewise.
	* testsuite/ld-mips-elf/multi-got-1.d: Likewise.
	* testsuite/ld-mips-elf/multi-got-hidden-1.d: Likewise.
	* testsuite/ld-mips-elf/multi-got-hidden-2.d: Likewise.
	* testsuite/ld-mips-elf/multi-got-no-shared.d: Likewise.
	* testsuite/ld-mips-elf/no-shared-1-n32.d: Likewise.
	* testsuite/ld-mips-elf/no-shared-1-n64.d: Likewise.
	* testsuite/ld-mips-elf/no-shared-1-o32.d: Likewise.
	* testsuite/ld-mips-elf/pic-and-nonpic-2.d: Likewise.
	* testsuite/ld-mips-elf/pic-and-nonpic-3-error.d: Likewise.
	* testsuite/ld-mips-elf/pic-and-nonpic-4-error.d: Likewise.
	* testsuite/ld-mips-elf/pie-n32.d: Likewise.
	* testsuite/ld-mips-elf/pie-n64.d: Likewise.
	* testsuite/ld-mips-elf/pie-o32.d: Likewise.
	* testsuite/ld-mips-elf/rel32-n32.d: Likewise.
	* testsuite/ld-mips-elf/rel32-o32.d: Likewise.
	* testsuite/ld-mips-elf/rel64.d: Likewise.
	* testsuite/ld-mips-elf/relax-jalr-n32.d: Likewise.
	* testsuite/ld-mips-elf/reloc-1-n32.d: Likewise.
	* testsuite/ld-mips-elf/reloc-1-n64.d: Likewise.
	* testsuite/ld-mips-elf/reloc-2.d: Likewise.
	* testsuite/ld-mips-elf/reloc-3-n32.d: Likewise.
	* testsuite/ld-mips-elf/reloc-local-overflow.d: Likewise.
	* testsuite/ld-mips-elf/textrel-1.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-branch-2.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-branch-ignore-2.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-branch-ignore-micromips.d:
	Likewise.
	* testsuite/ld-mips-elf/unaligned-branch-ignore-mips16.d:
	Likewise.
	* testsuite/ld-mips-elf/unaligned-branch-ignore-r6-1.d:
	Likewise.
	* testsuite/ld-mips-elf/unaligned-branch-micromips.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-branch-mips16.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-branch-r6-1.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-branch-r6-2.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-branch.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-jalx-addend-0.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-jalx-addend-1.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-jalx-addend-2.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-jalx-addend-3.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-0.d:
	Likewise.
	* testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-1.d:
	Likewise.
	* testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-0.d:
	Likewise.
	* testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-1.d:
	Likewise.
	* testsuite/ld-mips-elf/unaligned-jump-micromips.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-jump-mips16.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-jump.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-ldpc-0.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-ldpc-1.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-lwpc-0.d: Likewise.
	* testsuite/ld-mips-elf/unaligned-lwpc-1.d: Likewise.
---
 ld/ChangeLog                                  | 213 ++++
 .../ld-mips-elf/attr-gnu-4-0-n32-ph.d         |   6 +-
 .../ld-mips-elf/attr-gnu-4-0-n64-ph.d         |   6 +-
 .../ld-mips-elf/attr-gnu-4-1-n32-ph.d         |   6 +-
 .../ld-mips-elf/attr-gnu-4-1-n64-ph.d         |   6 +-
 .../ld-mips-elf/attr-gnu-4-2-n32-ph.d         |   6 +-
 .../ld-mips-elf/attr-gnu-4-2-n64-ph.d         |   6 +-
 .../ld-mips-elf/attr-gnu-4-3-n32-ph.d         |   6 +-
 .../ld-mips-elf/attr-gnu-4-3-n64-ph.d         |   6 +-
 .../bal-jalx-addend-micromips-n32.d           |   3 +-
 .../bal-jalx-addend-micromips-n64.d           |   3 +-
 .../ld-mips-elf/bal-jalx-addend-micromips.d   |   3 +-
 .../ld-mips-elf/bal-jalx-addend-n32.d         |   3 +-
 .../ld-mips-elf/bal-jalx-addend-n64.d         |   3 +-
 ld/testsuite/ld-mips-elf/bal-jalx-addend.d    |   3 +-
 .../bal-jalx-local-micromips-n32.d            |   3 +-
 .../bal-jalx-local-micromips-n64.d            |   3 +-
 .../ld-mips-elf/bal-jalx-local-micromips.d    |   3 +-
 ld/testsuite/ld-mips-elf/bal-jalx-local-n32.d |   3 +-
 ld/testsuite/ld-mips-elf/bal-jalx-local-n64.d |   3 +-
 ld/testsuite/ld-mips-elf/bal-jalx-local.d     |   3 +-
 .../bal-jalx-pic-ignore-micromips-n32.d       |   3 +-
 .../bal-jalx-pic-ignore-micromips-n64.d       |   3 +-
 .../bal-jalx-pic-ignore-micromips.d           |   3 +-
 .../ld-mips-elf/bal-jalx-pic-ignore-n32.d     |   3 +-
 .../ld-mips-elf/bal-jalx-pic-ignore-n64.d     |   3 +-
 .../ld-mips-elf/bal-jalx-pic-ignore.d         |   3 +-
 .../ld-mips-elf/bal-jalx-pic-micromips-n32.d  |   3 +-
 .../ld-mips-elf/bal-jalx-pic-micromips-n64.d  |   3 +-
 .../ld-mips-elf/bal-jalx-pic-micromips.d      |   3 +-
 ld/testsuite/ld-mips-elf/bal-jalx-pic-n32.d   |   3 +-
 ld/testsuite/ld-mips-elf/bal-jalx-pic-n64.d   |   3 +-
 ld/testsuite/ld-mips-elf/bal-jalx-pic.d       |   3 +-
 .../ld-mips-elf/branch-absolute-addend-n32.d  |   3 +-
 .../ld-mips-elf/branch-absolute-addend-n64.d  |   3 +-
 .../ld-mips-elf/branch-absolute-addend.d      |   3 +-
 .../ld-mips-elf/branch-absolute-n32.d         |   3 +-
 .../ld-mips-elf/branch-absolute-n64.d         |   3 +-
 ld/testsuite/ld-mips-elf/branch-absolute.d    |   3 +-
 ld/testsuite/ld-mips-elf/dyn-sec64.d          |   4 +-
 ld/testsuite/ld-mips-elf/eh-frame1-n32.d      |   4 +-
 ld/testsuite/ld-mips-elf/eh-frame1-n64.d      |   4 +-
 ld/testsuite/ld-mips-elf/eh-frame2-n32.d      |   4 +-
 ld/testsuite/ld-mips-elf/eh-frame2-n64.d      |   4 +-
 .../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-irix.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-irix.d       |   2 +-
 ld/testsuite/ld-mips-elf/elf-rel-xgot-n64.d   |   2 +-
 ld/testsuite/ld-mips-elf/emit-relocs-1.d      |   6 +-
 ld/testsuite/ld-mips-elf/got-dump-2.d         |   4 +-
 ld/testsuite/ld-mips-elf/got-page-2.d         |   3 +-
 .../ld-mips-elf/jal-global-overflow-0.d       |   3 +-
 .../ld-mips-elf/jal-global-overflow-1.d       |   3 +-
 .../ld-mips-elf/jal-local-overflow-0.d        |   3 +-
 .../ld-mips-elf/jal-local-overflow-1.d        |   3 +-
 ld/testsuite/ld-mips-elf/jalbal.d             |   4 +-
 ld/testsuite/ld-mips-elf/jalx-addend-n32.d    |   3 +-
 ld/testsuite/ld-mips-elf/jalx-addend-n64.d    |   3 +-
 ld/testsuite/ld-mips-elf/jalx-addend.d        |   3 +-
 ld/testsuite/ld-mips-elf/jalx-local-n32.d     |   3 +-
 ld/testsuite/ld-mips-elf/jalx-local-n64.d     |   3 +-
 ld/testsuite/ld-mips-elf/jalx-local.d         |   3 +-
 ld/testsuite/ld-mips-elf/jr-to-b-1.d          |   4 +-
 ld/testsuite/ld-mips-elf/jr-to-b-2.d          |   4 +-
 ld/testsuite/ld-mips-elf/lsi-4010-isa.d       |   4 +-
 .../micromips-branch-absolute-addend-n32.d    |   3 +-
 .../micromips-branch-absolute-addend-n64.d    |   3 +-
 .../micromips-branch-absolute-addend.d        |   3 +-
 .../micromips-branch-absolute-n32.d           |   3 +-
 .../micromips-branch-absolute-n64.d           |   3 +-
 .../ld-mips-elf/micromips-branch-absolute.d   |   3 +-
 ld/testsuite/ld-mips-elf/mips-elf.exp         | 950 ++++++++++--------
 ld/testsuite/ld-mips-elf/mips16-branch-2.d    |   3 +-
 ld/testsuite/ld-mips-elf/mips16-branch-3.d    |   3 +-
 .../ld-mips-elf/mips16-branch-absolute-1.d    |   3 +-
 .../ld-mips-elf/mips16-branch-absolute-2.d    |   3 +-
 .../mips16-branch-absolute-addend-1.d         |   3 +-
 .../mips16-branch-absolute-addend-n32-1.d     |   3 +-
 .../mips16-branch-absolute-addend-n32.d       |   3 +-
 .../mips16-branch-absolute-addend-n64-1.d     |   3 +-
 .../mips16-branch-absolute-addend-n64.d       |   3 +-
 .../mips16-branch-absolute-addend.d           |   3 +-
 .../mips16-branch-absolute-n32-1.d            |   3 +-
 .../mips16-branch-absolute-n32-2.d            |   3 +-
 .../ld-mips-elf/mips16-branch-absolute-n32.d  |   3 +-
 .../mips16-branch-absolute-n64-1.d            |   3 +-
 .../mips16-branch-absolute-n64-2.d            |   3 +-
 .../ld-mips-elf/mips16-branch-absolute-n64.d  |   3 +-
 .../ld-mips-elf/mips16-branch-absolute.d      |   3 +-
 .../ld-mips-elf/mips16-branch-addend-2.d      |   3 +-
 .../ld-mips-elf/mips16-branch-addend-3.d      |   3 +-
 ld/testsuite/ld-mips-elf/mips16-hilo-n32.d    |   3 +-
 ld/testsuite/ld-mips-elf/mips16-pcrel-0.d     |   3 +-
 ld/testsuite/ld-mips-elf/mips16-pcrel-1.d     |   4 +-
 .../ld-mips-elf/mips16-pcrel-addend-2.d       |   3 +-
 .../ld-mips-elf/mips16-pcrel-addend-6.d       |   4 +-
 ld/testsuite/ld-mips-elf/mips16-pcrel-n32-0.d |   3 +-
 ld/testsuite/ld-mips-elf/mips16-pcrel-n32-1.d |   3 +-
 .../ld-mips-elf/mips16-pcrel-n64-sym32-0.d    |   4 +-
 .../ld-mips-elf/mips16-pcrel-n64-sym32-1.d    |   4 +-
 ld/testsuite/ld-mips-elf/mips16e2-pcrel-0.d   |   4 +-
 ld/testsuite/ld-mips-elf/mips16e2-pcrel-1.d   |   4 +-
 .../ld-mips-elf/mips16e2-pcrel-addend-2.d     |   4 +-
 .../ld-mips-elf/mips16e2-pcrel-addend-6.d     |   4 +-
 .../ld-mips-elf/mips16e2-pcrel-n32-0.d        |   4 +-
 .../ld-mips-elf/mips16e2-pcrel-n32-1.d        |   4 +-
 .../ld-mips-elf/mips16e2-pcrel-n64-sym32-0.d  |   4 +-
 .../ld-mips-elf/mips16e2-pcrel-n64-sym32-1.d  |   4 +-
 ld/testsuite/ld-mips-elf/multi-got-1.d        |   4 +-
 ld/testsuite/ld-mips-elf/multi-got-hidden-1.d |   4 +-
 ld/testsuite/ld-mips-elf/multi-got-hidden-2.d |   4 +-
 .../ld-mips-elf/multi-got-no-shared.d         |   4 +-
 ld/testsuite/ld-mips-elf/no-shared-1-n32.d    |   3 +-
 ld/testsuite/ld-mips-elf/no-shared-1-n64.d    |   3 +-
 ld/testsuite/ld-mips-elf/no-shared-1-o32.d    |   3 +-
 ld/testsuite/ld-mips-elf/pic-and-nonpic-2.d   |   3 +-
 .../ld-mips-elf/pic-and-nonpic-3-error.d      |   4 +-
 .../ld-mips-elf/pic-and-nonpic-4-error.d      |   4 +-
 ld/testsuite/ld-mips-elf/pie-n32.d            |   3 +-
 ld/testsuite/ld-mips-elf/pie-n64.d            |   3 +-
 ld/testsuite/ld-mips-elf/pie-o32.d            |   3 +-
 ld/testsuite/ld-mips-elf/rel32-n32.d          |   4 +-
 ld/testsuite/ld-mips-elf/rel32-o32.d          |   4 +-
 ld/testsuite/ld-mips-elf/rel64.d              |   4 +-
 ld/testsuite/ld-mips-elf/relax-jalr-n32.d     |   4 +-
 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/reloc-2.d            |   6 +-
 ld/testsuite/ld-mips-elf/reloc-3-n32.d        |   4 +-
 .../ld-mips-elf/reloc-local-overflow.d        |   3 +-
 ld/testsuite/ld-mips-elf/textrel-1.d          |   3 +-
 ld/testsuite/ld-mips-elf/unaligned-branch-2.d |   3 +-
 .../ld-mips-elf/unaligned-branch-ignore-2.d   |   3 +-
 .../unaligned-branch-ignore-micromips.d       |   3 +-
 .../unaligned-branch-ignore-mips16.d          |   3 +-
 .../unaligned-branch-ignore-r6-1.d            |   3 +-
 .../ld-mips-elf/unaligned-branch-micromips.d  |   3 +-
 .../ld-mips-elf/unaligned-branch-mips16.d     |   3 +-
 .../ld-mips-elf/unaligned-branch-r6-1.d       |   3 +-
 .../ld-mips-elf/unaligned-branch-r6-2.d       |   4 +-
 ld/testsuite/ld-mips-elf/unaligned-branch.d   |   4 +-
 .../ld-mips-elf/unaligned-jalx-addend-0.d     |   3 +-
 .../ld-mips-elf/unaligned-jalx-addend-1.d     |   3 +-
 .../ld-mips-elf/unaligned-jalx-addend-2.d     |   3 +-
 .../ld-mips-elf/unaligned-jalx-addend-3.d     |   3 +-
 .../unaligned-jalx-addend-micromips-0.d       |   3 +-
 .../unaligned-jalx-addend-micromips-1.d       |   3 +-
 .../unaligned-jalx-addend-mips16-0.d          |   3 +-
 .../unaligned-jalx-addend-mips16-1.d          |   3 +-
 .../ld-mips-elf/unaligned-jump-micromips.d    |   3 +-
 .../ld-mips-elf/unaligned-jump-mips16.d       |   3 +-
 ld/testsuite/ld-mips-elf/unaligned-jump.d     |   3 +-
 ld/testsuite/ld-mips-elf/unaligned-ldpc-0.d   |   4 +-
 ld/testsuite/ld-mips-elf/unaligned-ldpc-1.d   |   4 +-
 ld/testsuite/ld-mips-elf/unaligned-lwpc-0.d   |   4 +-
 ld/testsuite/ld-mips-elf/unaligned-lwpc-1.d   |   4 +-
 162 files changed, 947 insertions(+), 757 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 042c35813a..f5af858e55 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,216 @@
+2018-07-12  Maciej W. Rozycki  <macro@mips.com>
+
+	* testsuite/ld-mips-elf/mips-elf.exp (run_dump_test_abi)
+	(run_dump_test_o32, run_dump_test_n32, run_dump_test_n64)
+	(run_dump_test_eabi): New procedures.
+	(has_newabi, has_elf32): Remove variables.
+	(has_abi): New associative array variable.
+	(abi_asflags, abi_ldflags): Update settings across targets.
+	(irixemul): New variable.
+	Replace `run_dump_test' calls where applicable throughout with
+	`run_dump_test_o32', `run_dump_test_n32', `run_dump_test_n64'
+	and `run_dump_test_eabi' as appropriate.  Remove explicit
+	passing of `abi_asflags' and `abi_ldflags'.  Use `noarch' for
+	tests that require their own architecture setting.  Force the
+	big endianness for tests that require it.  Select the endianness
+	required for `objdump invocation with the `reloc-2' test.
+	Conditionalize tests run via `run_ld_link_tests' on the ABI
+	required and use the ABI list from the `has_abi' array where
+	appropriate.
+	* testsuite/ld-mips-elf/attr-gnu-4-0-n32-ph.d: Remove ABI and
+	endianness selection options from `ld' and `source' tags.  Relax
+	output format matching.
+	* testsuite/ld-mips-elf/attr-gnu-4-0-n64-ph.d: Likewise.
+	* testsuite/ld-mips-elf/attr-gnu-4-1-n32-ph.d: Likewise.
+	* testsuite/ld-mips-elf/attr-gnu-4-1-n64-ph.d: Likewise.
+	* testsuite/ld-mips-elf/attr-gnu-4-2-n32-ph.d: Likewise.
+	* testsuite/ld-mips-elf/attr-gnu-4-2-n64-ph.d: Likewise.
+	* testsuite/ld-mips-elf/attr-gnu-4-3-n32-ph.d: Likewise.
+	* testsuite/ld-mips-elf/attr-gnu-4-3-n64-ph.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-addend-micromips-n32.d: Remove
+	ABI and endianness selection options from `as', `ld', `source'
+	tags, and also the `-march=from-abi' option.  Remove the `as'
+	tag where it would become empty.
+	* testsuite/ld-mips-elf/bal-jalx-addend-micromips-n64.d:
+	Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-addend-micromips.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-addend-n32.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-addend-n64.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-addend.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-local-micromips-n32.d:
+	Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-local-micromips-n64.d:
+	Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-local-micromips.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-local-n32.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-local-n64.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-local.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n32.d:
+	Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n64.d:
+	Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips.d:
+	Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-pic-ignore-n32.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-pic-ignore-n64.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-pic-ignore.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-pic-micromips.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-pic-n32.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-pic-n64.d: Likewise.
+	* testsuite/ld-mips-elf/bal-jalx-pic.d: Likewise.
+	* testsuite/ld-mips-elf/branch-absolute-addend-n32.d: Likewise.
+	* testsuite/ld-mips-elf/branch-absolute-addend-n64.d: Likewise.
+	* testsuite/ld-mips-elf/branch-absolute-addend.d: Likewise.
+	* testsuite/ld-mips-elf/branch-absolute-n32.d: Likewise.
+	* testsuite/ld-mips-elf/branch-absolute-n64.d: Likewise.
+	* testsuite/ld-mips-elf/branch-absolute.d: Likewise.
+	* testsuite/ld-mips-elf/dyn-sec64.d: Likewise.
+	* testsuite/ld-mips-elf/eh-frame1-n32.d: Likewise.
+	* testsuite/ld-mips-elf/eh-frame1-n64.d: Likewise.
+	* testsuite/ld-mips-elf/eh-frame2-n32.d: Likewise.
+	* testsuite/ld-mips-elf/eh-frame2-n64.d: Likewise.
+	* testsuite/ld-mips-elf/elf-rel-got-n32-embed.d: Likewise.
+	* testsuite/ld-mips-elf/elf-rel-got-n32.d: Likewise.
+	* testsuite/ld-mips-elf/elf-rel-got-n64-embed.d: Likewise.
+	* testsuite/ld-mips-elf/elf-rel-got-n64-irix.d: Likewise.
+	* testsuite/ld-mips-elf/elf-rel-got-n64.d: Likewise.
+	* testsuite/ld-mips-elf/elf-rel-xgot-n32-embed.d: Likewise.
+	* testsuite/ld-mips-elf/elf-rel-xgot-n32.d: Likewise.
+	* testsuite/ld-mips-elf/elf-rel-xgot-n64-embed.d: Likewise.
+	* testsuite/ld-mips-elf/elf-rel-xgot-n64-irix.d: Likewise.
+	* testsuite/ld-mips-elf/elf-rel-xgot-n64.d: Likewise.
+	* testsuite/ld-mips-elf/emit-relocs-1.d: Likewise.
+	* testsuite/ld-mips-elf/got-dump-2.d: Likewise.
+	* testsuite/ld-mips-elf/got-page-2.d: Likewise.
+	* testsuite/ld-mips-elf/jal-global-overflow-0.d: Likewise.
+	* testsuite/ld-mips-elf/jal-global-overflow-1.d: Likewise.
+	* testsuite/ld-mips-elf/jal-local-overflow-0.d: Likewise.
+	* testsuite/ld-mips-elf/jal-local-overflow-1.d: Likewise.
+	* testsuite/ld-mips-elf/jalbal.d: Likewise.
+	* testsuite/ld-mips-elf/jalx-addend-n32.d: Likewise.
+	* testsuite/ld-mips-elf/jalx-addend-n64.d: Likewise.
+	* testsuite/ld-mips-elf/jalx-addend.d: Likewise.
+	* testsuite/ld-mips-elf/jalx-local-n32.d: Likewise.
+	* testsuite/ld-mips-elf/jalx-local-n64.d: Likewise.
+	* testsuite/ld-mips-elf/jalx-local.d: Likewise.
+	* testsuite/ld-mips-elf/jr-to-b-1.d: Likewise.
+	* testsuite/ld-mips-elf/jr-to-b-2.d: Likewise.
+	* testsuite/ld-mips-elf/lsi-4010-isa.d: Likewise.
+	* testsuite/ld-mips-elf/micromips-branch-absolute-addend-n32.d:
+	Likewise.
+	* testsuite/ld-mips-elf/micromips-branch-absolute-addend-n64.d:
+	Likewise.
+	* testsuite/ld-mips-elf/micromips-branch-absolute-addend.d:
+	Likewise.
+	* testsuite/ld-mips-elf/micromips-branch-absolute-n32.d:
+	Likewise.
+	* testsuite/ld-mips-elf/micromips-branch-absolute-n64.d:
+	Likewise.
+	* testsuite/ld-mips-elf/micromips-branch-absolute.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-2.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-3.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute-1.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute-2.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute-addend-1.d:
+	Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute-addend-n32-1.d:
+	Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute-addend-n32.d:
+	Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute-addend-n64-1.d:
+	Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute-addend-n64.d:
+	Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute-addend.d:
+	Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute-n32-1.d:
+	Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute-n32-2.d:
+	Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute-n32.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute-n64-1.d:
+	Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute-n64-2.d:
+	Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute-n64.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-absolute.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-addend-2.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-branch-addend-3.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-hilo-n32.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-pcrel-0.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-pcrel-1.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-pcrel-addend-2.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-pcrel-addend-6.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-pcrel-n32-0.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-pcrel-n32-1.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-pcrel-n64-sym32-0.d: Likewise.
+	* testsuite/ld-mips-elf/mips16-pcrel-n64-sym32-1.d: Likewise.
+	* testsuite/ld-mips-elf/mips16e2-pcrel-0.d: Likewise.
+	* testsuite/ld-mips-elf/mips16e2-pcrel-1.d: Likewise.
+	* testsuite/ld-mips-elf/mips16e2-pcrel-addend-2.d: Likewise.
+	* testsuite/ld-mips-elf/mips16e2-pcrel-addend-6.d: Likewise.
+	* testsuite/ld-mips-elf/mips16e2-pcrel-n32-0.d: Likewise.
+	* testsuite/ld-mips-elf/mips16e2-pcrel-n32-1.d: Likewise.
+	* testsuite/ld-mips-elf/mips16e2-pcrel-n64-sym32-0.d: Likewise.
+	* testsuite/ld-mips-elf/mips16e2-pcrel-n64-sym32-1.d: Likewise.
+	* testsuite/ld-mips-elf/multi-got-1.d: Likewise.
+	* testsuite/ld-mips-elf/multi-got-hidden-1.d: Likewise.
+	* testsuite/ld-mips-elf/multi-got-hidden-2.d: Likewise.
+	* testsuite/ld-mips-elf/multi-got-no-shared.d: Likewise.
+	* testsuite/ld-mips-elf/no-shared-1-n32.d: Likewise.
+	* testsuite/ld-mips-elf/no-shared-1-n64.d: Likewise.
+	* testsuite/ld-mips-elf/no-shared-1-o32.d: Likewise.
+	* testsuite/ld-mips-elf/pic-and-nonpic-2.d: Likewise.
+	* testsuite/ld-mips-elf/pic-and-nonpic-3-error.d: Likewise.
+	* testsuite/ld-mips-elf/pic-and-nonpic-4-error.d: Likewise.
+	* testsuite/ld-mips-elf/pie-n32.d: Likewise.
+	* testsuite/ld-mips-elf/pie-n64.d: Likewise.
+	* testsuite/ld-mips-elf/pie-o32.d: Likewise.
+	* testsuite/ld-mips-elf/rel32-n32.d: Likewise.
+	* testsuite/ld-mips-elf/rel32-o32.d: Likewise.
+	* testsuite/ld-mips-elf/rel64.d: Likewise.
+	* testsuite/ld-mips-elf/relax-jalr-n32.d: Likewise.
+	* testsuite/ld-mips-elf/reloc-1-n32.d: Likewise.
+	* testsuite/ld-mips-elf/reloc-1-n64.d: Likewise.
+	* testsuite/ld-mips-elf/reloc-2.d: Likewise.
+	* testsuite/ld-mips-elf/reloc-3-n32.d: Likewise.
+	* testsuite/ld-mips-elf/reloc-local-overflow.d: Likewise.
+	* testsuite/ld-mips-elf/textrel-1.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-branch-2.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-branch-ignore-2.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-branch-ignore-micromips.d:
+	Likewise.
+	* testsuite/ld-mips-elf/unaligned-branch-ignore-mips16.d:
+	Likewise.
+	* testsuite/ld-mips-elf/unaligned-branch-ignore-r6-1.d:
+	Likewise.
+	* testsuite/ld-mips-elf/unaligned-branch-micromips.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-branch-mips16.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-branch-r6-1.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-branch-r6-2.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-branch.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-jalx-addend-0.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-jalx-addend-1.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-jalx-addend-2.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-jalx-addend-3.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-0.d:
+	Likewise.
+	* testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-1.d:
+	Likewise.
+	* testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-0.d:
+	Likewise.
+	* testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-1.d:
+	Likewise.
+	* testsuite/ld-mips-elf/unaligned-jump-micromips.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-jump-mips16.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-jump.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-ldpc-0.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-ldpc-1.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-lwpc-0.d: Likewise.
+	* testsuite/ld-mips-elf/unaligned-lwpc-1.d: Likewise.
+
 2018-07-12  Maciej W. Rozycki  <macro@mips.com>
 
 	* testsuite/ld-mips-elf/mips-elf.exp: Limit reloc 6 tests to
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-0-n32-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-0-n32-ph.d
index 0fb6988f58..9451ad7ae2 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-0-n32-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-0-n32-ph.d
@@ -1,8 +1,8 @@
-#source: attr-gnu-4-0.s -mips3 -n32 -EB
-#ld: -melf32btsmipn32 -e 0
+#source: attr-gnu-4-0.s -mips3
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf32-ntradbigmips
+[^:]*:     file format elf32-n.*mips.*
 
 Program Header:
 0x70000003 off    0x000000.. vaddr 0x100000.. paddr 0x100000.. align 2\*\*3
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-0-n64-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-0-n64-ph.d
index f2760252ef..69770b76a3 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-0-n64-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-0-n64-ph.d
@@ -1,8 +1,8 @@
-#source: attr-gnu-4-0.s -mips3 -64 -EB
-#ld: -melf64btsmip -e 0
+#source: attr-gnu-4-0.s -mips3
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf64-tradbigmips
+[^:]*:     file format elf64-.*mips.*
 
 Program Header:
 0x70000003 off    0x00000000000000b0 vaddr 0x00000001200000b0 paddr 0x00000001200000b0 align 2\*\*3
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-1-n32-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-1-n32-ph.d
index d83c8597be..bd250e087b 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-1-n32-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-1-n32-ph.d
@@ -1,8 +1,8 @@
-#source: empty.s -mips3 -n32 -EB
-#ld: -melf32btsmipn32 -e 0
+#source: empty.s -mips3
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf32-ntradbigmips
+[^:]*:     file format elf32-n.*mips.*
 
 Program Header:
 0x70000003 off    0x000000.. vaddr 0x100000.. paddr 0x100000.. align 2\*\*3
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-1-n64-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-1-n64-ph.d
index 157f3e6585..9d5acaf043 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-1-n64-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-1-n64-ph.d
@@ -1,8 +1,8 @@
-#source: empty.s -mips3 -64 -EB
-#ld: -melf64btsmip -e 0
+#source: empty.s -mips3
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf64-tradbigmips
+[^:]*:     file format elf64-.*mips.*
 
 Program Header:
 0x70000003 off    0x00000000000000b0 vaddr 0x00000001200000b0 paddr 0x00000001200000b0 align 2\*\*3
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-2-n32-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-2-n32-ph.d
index 5a048048f2..96428ae66c 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-2-n32-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-2-n32-ph.d
@@ -1,8 +1,8 @@
-#source: empty.s -mips3 -n32 -msingle-float -EB
-#ld: -melf32btsmipn32 -e 0
+#source: empty.s -mips3 -msingle-float
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf32-ntradbigmips
+[^:]*:     file format elf32-n.*mips.*
 
 Program Header:
 0x70000003 off    0x000000.. vaddr 0x100000.. paddr 0x100000.. align 2\*\*3
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-2-n64-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-2-n64-ph.d
index 88b4ff9e80..a5404d9ca9 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-2-n64-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-2-n64-ph.d
@@ -1,8 +1,8 @@
-#source: empty.s -mips3 -64 -msingle-float -EB
-#ld: -melf64btsmip -e 0
+#source: empty.s -mips3 -msingle-float
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf64-tradbigmips
+[^:]*:     file format elf64-.*mips.*
 
 Program Header:
 0x70000003 off    0x00000000000000b0 vaddr 0x00000001200000b0 paddr 0x00000001200000b0 align 2\*\*3
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-3-n32-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-3-n32-ph.d
index 5a048048f2..96428ae66c 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-3-n32-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-3-n32-ph.d
@@ -1,8 +1,8 @@
-#source: empty.s -mips3 -n32 -msingle-float -EB
-#ld: -melf32btsmipn32 -e 0
+#source: empty.s -mips3 -msingle-float
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf32-ntradbigmips
+[^:]*:     file format elf32-n.*mips.*
 
 Program Header:
 0x70000003 off    0x000000.. vaddr 0x100000.. paddr 0x100000.. align 2\*\*3
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-3-n64-ph.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-3-n64-ph.d
index 3731dc4a25..01010aa931 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-3-n64-ph.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-3-n64-ph.d
@@ -1,8 +1,8 @@
-#source: empty.s -mips3 -64 -msoft-float -EB
-#ld: -melf64btsmip -e 0
+#source: empty.s -mips3 -msoft-float
+#ld: -e 0
 #objdump: -p
 
-[^:]*:     file format elf64-tradbigmips
+[^:]*:     file format elf64-.*mips.*
 
 Program Header:
 0x70000003 off    0x00000000000000b0 vaddr 0x00000001200000b0 paddr 0x00000001200000b0 align 2\*\*3
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-addend-micromips-n32.d b/ld/testsuite/ld-mips-elf/bal-jalx-addend-micromips-n32.d
index 9c7aca5b4a..a4c08c200d 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-addend-micromips-n32.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-addend-micromips-n32.d
@@ -1,6 +1,5 @@
 #name: microMIPS BAL/JALX addend calculation (n32)
 #source: ../../../gas/testsuite/gas/mips/branch-addend-micromips.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #dump: bal-jalx-addend-micromips.d
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-addend-micromips-n64.d b/ld/testsuite/ld-mips-elf/bal-jalx-addend-micromips-n64.d
index e254c65820..b5b83235b9 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-addend-micromips-n64.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-addend-micromips-n64.d
@@ -1,6 +1,5 @@
 #name: microMIPS BAL/JALX addend calculation (n64)
 #source: ../../../gas/testsuite/gas/mips/branch-addend-micromips.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #dump: bal-jalx-addend-micromips.d
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-addend-micromips.d b/ld/testsuite/ld-mips-elf/bal-jalx-addend-micromips.d
index e066f5d8fe..4560ea0540 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-addend-micromips.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-addend-micromips.d
@@ -1,7 +1,6 @@
 #name: microMIPS BAL/JALX addend calculation
 #source: ../../../gas/testsuite/gas/mips/branch-addend-micromips.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*mips.*
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-addend-n32.d b/ld/testsuite/ld-mips-elf/bal-jalx-addend-n32.d
index a425effe4f..628758e7a2 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-addend-n32.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-addend-n32.d
@@ -1,6 +1,5 @@
 #name: MIPS BAL/JALX addend calculation (n32)
 #source: ../../../gas/testsuite/gas/mips/branch-addend.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #dump: bal-jalx-addend.d
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-addend-n64.d b/ld/testsuite/ld-mips-elf/bal-jalx-addend-n64.d
index 0b7a013467..0e620a012f 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-addend-n64.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-addend-n64.d
@@ -1,6 +1,5 @@
 #name: MIPS BAL/JALX addend calculation (n64)
 #source: ../../../gas/testsuite/gas/mips/branch-addend.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #dump: bal-jalx-addend.d
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-addend.d b/ld/testsuite/ld-mips-elf/bal-jalx-addend.d
index 91012f9166..c38675a50d 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-addend.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-addend.d
@@ -1,7 +1,6 @@
 #name: MIPS BAL/JALX addend calculation
 #source: ../../../gas/testsuite/gas/mips/branch-addend.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*mips.*
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-local-micromips-n32.d b/ld/testsuite/ld-mips-elf/bal-jalx-local-micromips-n32.d
index 16fcb0af43..0fdbe65719 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-local-micromips-n32.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-local-micromips-n32.d
@@ -1,6 +1,5 @@
 #name: microMIPS BAL to JALX conversion for local symbol (n32)
 #source: ../../../gas/testsuite/gas/mips/branch-local-7.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #dump: bal-jalx-local-micromips.d
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-local-micromips-n64.d b/ld/testsuite/ld-mips-elf/bal-jalx-local-micromips-n64.d
index d13a9ea024..326dbb6c77 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-local-micromips-n64.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-local-micromips-n64.d
@@ -1,6 +1,5 @@
 #name: microMIPS BAL to JALX conversion for local symbol (n64)
 #source: ../../../gas/testsuite/gas/mips/branch-local-7.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #dump: bal-jalx-local-micromips.d
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-local-micromips.d b/ld/testsuite/ld-mips-elf/bal-jalx-local-micromips.d
index e944d3b611..29e7d60b05 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-local-micromips.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-local-micromips.d
@@ -1,7 +1,6 @@
 #name: microMIPS BAL to JALX conversion for local symbol
 #source: ../../../gas/testsuite/gas/mips/branch-local-7.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*mips.*
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-local-n32.d b/ld/testsuite/ld-mips-elf/bal-jalx-local-n32.d
index adaa798470..edd8456370 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-local-n32.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-local-n32.d
@@ -1,6 +1,5 @@
 #name: MIPS BAL to JALX conversion for local symbol (n32)
 #source: ../../../gas/testsuite/gas/mips/branch-local-4.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #dump: bal-jalx-local.d
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-local-n64.d b/ld/testsuite/ld-mips-elf/bal-jalx-local-n64.d
index e94f290a3f..ca71361f83 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-local-n64.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-local-n64.d
@@ -1,6 +1,5 @@
 #name: MIPS BAL to JALX conversion for local symbol (n64)
 #source: ../../../gas/testsuite/gas/mips/branch-local-4.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #dump: bal-jalx-local.d
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-local.d b/ld/testsuite/ld-mips-elf/bal-jalx-local.d
index 599cf26909..059ea86f69 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-local.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-local.d
@@ -1,7 +1,6 @@
 #name: MIPS BAL to JALX conversion for local symbol
 #source: ../../../gas/testsuite/gas/mips/branch-local-4.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*mips.*
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n32.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n32.d
index 6ebc06b18e..c2bcf14753 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n32.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n32.d
@@ -1,7 +1,6 @@
 #name: microMIPS BAL/JALX in PIC mode (ignore branch ISA, n32)
 #source: ../../../gas/testsuite/gas/mips/branch-addend-micromips.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa
+#ld: -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa
 #objdump: -dr --prefix-addresses --show-raw-insn
 #target: [check_shared_lib_support]
 #dump: bal-jalx-pic-ignore-micromips.d
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n64.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n64.d
index a3b42d19ff..596de0df5c 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n64.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips-n64.d
@@ -1,7 +1,6 @@
 #name: microMIPS BAL/JALX in PIC mode (ignore branch ISA, n64)
 #source: ../../../gas/testsuite/gas/mips/branch-addend-micromips.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa
+#ld: -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa
 #objdump: -dr --prefix-addresses --show-raw-insn
 #target: [check_shared_lib_support]
 #dump: bal-jalx-pic-ignore-micromips.d
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips.d
index 06f7c3c6c0..dcf8bb8a39 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-micromips.d
@@ -1,7 +1,6 @@
 #name: microMIPS BAL/JALX in PIC mode (ignore branch ISA)
 #source: ../../../gas/testsuite/gas/mips/branch-addend-micromips.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa
+#ld: -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa
 #objdump: -dr --prefix-addresses --show-raw-insn
 #target: [check_shared_lib_support]
 
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n32.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n32.d
index 6602a51512..876d6d5a8b 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n32.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n32.d
@@ -1,7 +1,6 @@
 #name: MIPS BAL/JALX in PIC mode (ignore branch ISA, n32)
 #source: ../../../gas/testsuite/gas/mips/branch-addend.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa
+#ld: -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa
 #objdump: -dr --prefix-addresses --show-raw-insn
 #target: [check_shared_lib_support]
 #dump: bal-jalx-pic-ignore.d
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n64.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n64.d
index c6be6932be..2b924947cb 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n64.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore-n64.d
@@ -1,7 +1,6 @@
 #name: MIPS BAL/JALX in PIC mode (ignore branch ISA, n64)
 #source: ../../../gas/testsuite/gas/mips/branch-addend.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa
+#ld: -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa
 #objdump: -dr --prefix-addresses --show-raw-insn
 #target: [check_shared_lib_support]
 #dump: bal-jalx-pic-ignore.d
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore.d
index 203c48333a..bb0568b836 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-ignore.d
@@ -1,7 +1,6 @@
 #name: MIPS BAL/JALX in PIC mode (ignore branch ISA)
 #source: ../../../gas/testsuite/gas/mips/branch-addend.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa
+#ld: -Ttext 0x1c000000 -e 0x1c000000 -shared --ignore-branch-isa
 #objdump: -dr --prefix-addresses --show-raw-insn
 #target: [check_shared_lib_support]
 
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d
index bd45be580f..81b57396de 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d
@@ -1,7 +1,6 @@
 #name: microMIPS BAL/JALX in PIC mode (n32)
 #source: ../../../gas/testsuite/gas/mips/branch-addend-micromips.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared
+#ld: -Ttext 0x1c000000 -e 0x1c000000 -shared
 #target: [check_shared_lib_support]
 #error: \A[^\n]*: in function `bar':\n
 #error:   \(\.text\+0x1014\): unsupported branch between ISA modes\Z
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d
index 4817d0b6a8..5d23ddb513 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d
@@ -1,7 +1,6 @@
 #name: microMIPS BAL/JALX in PIC mode (n64)
 #source: ../../../gas/testsuite/gas/mips/branch-addend-micromips.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared
+#ld: -Ttext 0x1c000000 -e 0x1c000000 -shared
 #target: [check_shared_lib_support]
 #error: \A[^\n]*: in function `bar':\n
 #error:   \(\.text\+0x1014\): unsupported branch between ISA modes\Z
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips.d
index 70b2ee7216..fd8ca876da 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-micromips.d
@@ -1,7 +1,6 @@
 #name: microMIPS BAL/JALX in PIC mode
 #source: ../../../gas/testsuite/gas/mips/branch-addend-micromips.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared
+#ld: -Ttext 0x1c000000 -e 0x1c000000 -shared
 #target: [check_shared_lib_support]
 #error: \A[^\n]*: in function `bar':\n
 #error:   \(\.text\+0x1014\): unsupported branch between ISA modes\Z
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-n32.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-n32.d
index 215c3308bd..b830654580 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-n32.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-n32.d
@@ -1,7 +1,6 @@
 #name: MIPS BAL/JALX in PIC mode (n32)
 #source: ../../../gas/testsuite/gas/mips/branch-addend.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared
+#ld: -Ttext 0x1c000000 -e 0x1c000000 -shared
 #target: [check_shared_lib_support]
 #error: \A[^\n]*: in function `bar':\n
 #error:   \(\.text\+0x1014\): unsupported branch between ISA modes\Z
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic-n64.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic-n64.d
index decd6eafcc..c7e33c1471 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic-n64.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic-n64.d
@@ -1,7 +1,6 @@
 #name: MIPS BAL/JALX in PIC mode (n64)
 #source: ../../../gas/testsuite/gas/mips/branch-addend.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared
+#ld: -Ttext 0x1c000000 -e 0x1c000000 -shared
 #target: [check_shared_lib_support]
 #error: \A[^\n]*: in function `bar':\n
 #error:   \(\.text\+0x1014\): unsupported branch between ISA modes\Z
diff --git a/ld/testsuite/ld-mips-elf/bal-jalx-pic.d b/ld/testsuite/ld-mips-elf/bal-jalx-pic.d
index 483608ad59..3af8901290 100644
--- a/ld/testsuite/ld-mips-elf/bal-jalx-pic.d
+++ b/ld/testsuite/ld-mips-elf/bal-jalx-pic.d
@@ -1,7 +1,6 @@
 #name: MIPS BAL/JALX in PIC mode
 #source: ../../../gas/testsuite/gas/mips/branch-addend.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 -shared
+#ld: -Ttext 0x1c000000 -e 0x1c000000 -shared
 #target: [check_shared_lib_support]
 #error: \A[^\n]*: in function `bar':\n
 #error:   \(\.text\+0x1014\): unsupported branch between ISA modes\Z
diff --git a/ld/testsuite/ld-mips-elf/branch-absolute-addend-n32.d b/ld/testsuite/ld-mips-elf/branch-absolute-addend-n32.d
index 82fd6c69ba..10b18922ca 100644
--- a/ld/testsuite/ld-mips-elf/branch-absolute-addend-n32.d
+++ b/ld/testsuite/ld-mips-elf/branch-absolute-addend-n32.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS link branch to absolute expression with addend (n32)
 #source: ../../../gas/testsuite/gas/mips/branch-absolute-addend.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x12340000 -e foo
+#ld: -Ttext 0x12340000 -e foo
 #dump: branch-absolute-addend.d
diff --git a/ld/testsuite/ld-mips-elf/branch-absolute-addend-n64.d b/ld/testsuite/ld-mips-elf/branch-absolute-addend-n64.d
index 9bb7c8f3fa..241056febd 100644
--- a/ld/testsuite/ld-mips-elf/branch-absolute-addend-n64.d
+++ b/ld/testsuite/ld-mips-elf/branch-absolute-addend-n64.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS link branch to absolute expression with addend (n64)
 #source: ../../../gas/testsuite/gas/mips/branch-absolute-addend.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0x12340000 -e foo
+#ld: -Ttext 0x12340000 -e foo
 #dump: branch-absolute-addend.d
diff --git a/ld/testsuite/ld-mips-elf/branch-absolute-addend.d b/ld/testsuite/ld-mips-elf/branch-absolute-addend.d
index 063962b685..2481327501 100644
--- a/ld/testsuite/ld-mips-elf/branch-absolute-addend.d
+++ b/ld/testsuite/ld-mips-elf/branch-absolute-addend.d
@@ -1,8 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS link branch to absolute expression with addend
 #source: ../../../gas/testsuite/gas/mips/branch-absolute-addend.s
-#as: -EB -32
-#ld: -EB -Ttext 0x12340000 -e foo
+#ld: -Ttext 0x12340000 -e foo
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/branch-absolute-n32.d b/ld/testsuite/ld-mips-elf/branch-absolute-n32.d
index b1ecf64a5c..9be6c0bbec 100644
--- a/ld/testsuite/ld-mips-elf/branch-absolute-n32.d
+++ b/ld/testsuite/ld-mips-elf/branch-absolute-n32.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS link branch to absolute expression (n32)
 #source: ../../../gas/testsuite/gas/mips/branch-absolute.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 #dump: branch-absolute.d
diff --git a/ld/testsuite/ld-mips-elf/branch-absolute-n64.d b/ld/testsuite/ld-mips-elf/branch-absolute-n64.d
index 9b8dcfff22..b06cc5e7e5 100644
--- a/ld/testsuite/ld-mips-elf/branch-absolute-n64.d
+++ b/ld/testsuite/ld-mips-elf/branch-absolute-n64.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS link branch to absolute expression (n64)
 #source: ../../../gas/testsuite/gas/mips/branch-absolute.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 #dump: branch-absolute.d
diff --git a/ld/testsuite/ld-mips-elf/branch-absolute.d b/ld/testsuite/ld-mips-elf/branch-absolute.d
index 65e4317745..7f8b9fd17f 100644
--- a/ld/testsuite/ld-mips-elf/branch-absolute.d
+++ b/ld/testsuite/ld-mips-elf/branch-absolute.d
@@ -1,8 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS link branch to absolute expression
 #source: ../../../gas/testsuite/gas/mips/branch-absolute.s
-#as: -EB -32
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/dyn-sec64.d b/ld/testsuite/ld-mips-elf/dyn-sec64.d
index 9564c11911..a9eb4ea3f0 100644
--- a/ld/testsuite/ld-mips-elf/dyn-sec64.d
+++ b/ld/testsuite/ld-mips-elf/dyn-sec64.d
@@ -1,7 +1,7 @@
 #name: objdump -p print 64-bit values
 #source: dyn-sec64.s
-#as: -mips3 -EB -64
-#ld: -Tdyn-sec64.ld -shared -melf64btsmip
+#as: -mips3
+#ld: -Tdyn-sec64.ld -shared
 #objdump: -p
 
 .*: .* file format .*
diff --git a/ld/testsuite/ld-mips-elf/eh-frame1-n32.d b/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
index eafd022816..9e1a0d633a 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
@@ -1,9 +1,9 @@
 #name: MIPS eh-frame 1, n32
 #source: eh-frame1.s
 #source: eh-frame1.s
-#as: -march=from-abi -EB -n32 --defsym alignment=2 --defsym fill=0x40
+#as: --defsym alignment=2 --defsym fill=0x40
 #readelf: --relocs -wf
-#ld: -shared -melf32btsmipn32 -Teh-frame1.ld
+#ld: -shared -Teh-frame1.ld
 #warning: FDE encoding in.*prevents \.eh_frame_hdr table being created.
 
 Relocation section '\.rel\.dyn' .*:
diff --git a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
index 38022775ec..b1b7d9d31d 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
@@ -1,9 +1,9 @@
 #name: MIPS eh-frame 1, n64
 #source: eh-frame1.s
 #source: eh-frame1.s
-#as: -march=from-abi -EB -64 --defsym alignment=3 --defsym fill=0x40
+#as: --defsym alignment=3 --defsym fill=0x40
 #readelf: --relocs -wf
-#ld: -shared -melf64btsmip -Teh-frame1.ld
+#ld: -shared -Teh-frame1.ld
 #warning: FDE encoding in.*prevents \.eh_frame_hdr table being created.
 
 Relocation section '\.rel\.dyn' .*:
diff --git a/ld/testsuite/ld-mips-elf/eh-frame2-n32.d b/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
index 528be87537..556ef6cf59 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
@@ -1,9 +1,9 @@
 #name: MIPS eh-frame 2, n32
 #source: eh-frame1.s
 #source: eh-frame1.s
-#as: -march=from-abi -EB -n32 --defsym alignment=2 --defsym fill=0
+#as: --defsym alignment=2 --defsym fill=0
 #readelf: --relocs -wf
-#ld: -shared -melf32btsmipn32 -Teh-frame1.ld
+#ld: -shared -Teh-frame1.ld
 #warning: FDE encoding in.*prevents \.eh_frame_hdr table being created.
 
 Relocation section '\.rel\.dyn' .*:
diff --git a/ld/testsuite/ld-mips-elf/eh-frame2-n64.d b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
index 505e6dba3d..b43664f19c 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
@@ -1,9 +1,9 @@
 #name: MIPS eh-frame 2, n64
 #source: eh-frame1.s
 #source: eh-frame1.s
-#as: -march=from-abi -EB -64 --defsym alignment=3 --defsym fill=0
+#as: --defsym alignment=3 --defsym fill=0
 #readelf: --relocs -wf
-#ld: -shared -melf64btsmip -Teh-frame1.ld
+#ld: -shared -Teh-frame1.ld
 #warning: FDE encoding in.*prevents \.eh_frame_hdr table being created.
 
 Relocation section '\.rel\.dyn' .*:
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 58f23edd29..82e41befb8 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: -march=from-abi -EB -n32 -KPIC
+#as: -KPIC
 #objcopy_objects: -R .MIPS.abiflags
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s RUN_OBJCOPY
 #ld:
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 174153dd1f..bcb4b88092 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: -march=from-abi -EB -n32 -KPIC
+#as: -KPIC
 #objcopy_objects: -R .MIPS.abiflags -K __start
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s RUN_OBJCOPY
 #ld:
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 c55900f824..2f617f2fb5 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: -march=from-abi -EB -64 -KPIC
+#as: -KPIC
 #objcopy_objects: -R .MIPS.abiflags
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s RUN_OBJCOPY
 #ld:
diff --git a/ld/testsuite/ld-mips-elf/elf-rel-got-n64-irix.d b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-irix.d
index 23f6a29e45..0b5841e1b1 100644
--- a/ld/testsuite/ld-mips-elf/elf-rel-got-n64-irix.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-got-n64-irix.d
@@ -1,5 +1,5 @@
 #name: MIPS ELF got reloc n64
-#as: -march=from-abi -EB -64 -KPIC
+#as: -KPIC
 #objcopy_objects: -R .MIPS.abiflags
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s RUN_OBJCOPY
 #ld:
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 8e2822db83..e1b5b16e1f 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: -march=from-abi -EB -64 -KPIC
+#as: -KPIC
 #objcopy_objects: -R .MIPS.abiflags
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s RUN_OBJCOPY
 #ld:
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 d6c2e85d03..87e561db2d 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: -march=from-abi -EB -n32 -KPIC -xgot
+#as: -KPIC -xgot
 #objcopy_objects: -R .MIPS.abiflags -K __start
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s RUN_OBJCOPY
 #ld:
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 b202e92643..56f150c0ce 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: -march=from-abi -EB -n32 -KPIC -xgot
+#as: -KPIC -xgot
 #objcopy_objects: -R .MIPS.abiflags -K __start
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n32.s RUN_OBJCOPY
 #ld:
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 bdacf78bc4..fafd3b9f0e 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: -march=from-abi -EB -64 -KPIC -xgot
+#as: -KPIC -xgot
 #objcopy_objects: -R .MIPS.abiflags -K __start
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s RUN_OBJCOPY
 #ld:
diff --git a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-irix.d b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-irix.d
index aedbb070a2..540578bcde 100644
--- a/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-irix.d
+++ b/ld/testsuite/ld-mips-elf/elf-rel-xgot-n64-irix.d
@@ -1,5 +1,5 @@
 #name: MIPS ELF xgot reloc n64
-#as: -march=from-abi -EB -64 -KPIC -xgot
+#as: -KPIC -xgot
 #objcopy_objects: -R .MIPS.abiflags -K __start
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s RUN_OBJCOPY
 #ld:
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 fd21487382..a8a1cdd3ce 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: -march=from-abi -EB -64 -KPIC -xgot
+#as: -KPIC -xgot
 #objcopy_objects: -R .MIPS.abiflags -K __start
 #source: ../../../gas/testsuite/gas/mips/elf-rel-got-n64.s RUN_OBJCOPY
 #ld:
diff --git a/ld/testsuite/ld-mips-elf/emit-relocs-1.d b/ld/testsuite/ld-mips-elf/emit-relocs-1.d
index bff7c70e83..86305d314c 100644
--- a/ld/testsuite/ld-mips-elf/emit-relocs-1.d
+++ b/ld/testsuite/ld-mips-elf/emit-relocs-1.d
@@ -1,7 +1,7 @@
 #name: Emit relocs 1
-#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
+#source: emit-relocs-1a.s
+#source: emit-relocs-1b.s
+#ld: -q -T emit-relocs-1.ld
 #objdump: -sr
 
 .*:     file format .*
diff --git a/ld/testsuite/ld-mips-elf/got-dump-2.d b/ld/testsuite/ld-mips-elf/got-dump-2.d
index 56cc0b3151..046cec1408 100644
--- a/ld/testsuite/ld-mips-elf/got-dump-2.d
+++ b/ld/testsuite/ld-mips-elf/got-dump-2.d
@@ -1,7 +1,7 @@
 #name: GOT dump (readelf -A) test 2
 #source: got-dump-2.s
-#as: -mips3 -EB -64
-#ld: -Tgot-dump-2.ld -shared -melf64btsmip
+#as: -mips3
+#ld: -Tgot-dump-2.ld -shared
 #readelf: -A
 
 Primary GOT:
diff --git a/ld/testsuite/ld-mips-elf/got-page-2.d b/ld/testsuite/ld-mips-elf/got-page-2.d
index 9cdefeb594..bdfdb6227d 100644
--- a/ld/testsuite/ld-mips-elf/got-page-2.d
+++ b/ld/testsuite/ld-mips-elf/got-page-2.d
@@ -1,7 +1,6 @@
 #name: GOT page test 2
 #source: got-page-2.s
-#as: -march=from-abi -EB -n32
-#ld: -T got-page-1.ld -shared -melf32btsmipn32
+#ld: -T got-page-1.ld -shared
 #readelf: -d
 #
 # There should be 10 page entries and 2 reserved entries
diff --git a/ld/testsuite/ld-mips-elf/jal-global-overflow-0.d b/ld/testsuite/ld-mips-elf/jal-global-overflow-0.d
index f02bfeae9f..17be842505 100644
--- a/ld/testsuite/ld-mips-elf/jal-global-overflow-0.d
+++ b/ld/testsuite/ld-mips-elf/jal-global-overflow-0.d
@@ -1,7 +1,6 @@
 #name: MIPS JAL to global symbol overflow 0
 #source: jal-global-overflow.s
-#as: -EB -32
-#ld: -EB -Ttext 0x20000000 -e 0x20000000
+#ld: -Ttext 0x20000000 -e 0x20000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*mips.*
diff --git a/ld/testsuite/ld-mips-elf/jal-global-overflow-1.d b/ld/testsuite/ld-mips-elf/jal-global-overflow-1.d
index 2ee5a76110..9449f7d4ce 100644
--- a/ld/testsuite/ld-mips-elf/jal-global-overflow-1.d
+++ b/ld/testsuite/ld-mips-elf/jal-global-overflow-1.d
@@ -1,7 +1,6 @@
 #name: MIPS JAL to global symbol overflow 1
 #source: jal-global-overflow.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1fffd000 -e 0x1fffd000
+#ld: -Ttext 0x1fffd000 -e 0x1fffd000
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x2000\): relocation truncated to fit: R_MIPS_26 against `abar'\n
 #error:   [^\n]*: in function `bar':\n
diff --git a/ld/testsuite/ld-mips-elf/jal-local-overflow-0.d b/ld/testsuite/ld-mips-elf/jal-local-overflow-0.d
index 592b2aec92..fc3ad8b0c3 100644
--- a/ld/testsuite/ld-mips-elf/jal-local-overflow-0.d
+++ b/ld/testsuite/ld-mips-elf/jal-local-overflow-0.d
@@ -1,6 +1,5 @@
 #name: MIPS JAL to local symbol overflow 0
 #source: jal-local-overflow.s
-#as: -EB -32
-#ld: -EB -Ttext 0x20000000 -e 0x20000000
+#ld: -Ttext 0x20000000 -e 0x20000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #dump: jal-global-overflow-0.d
diff --git a/ld/testsuite/ld-mips-elf/jal-local-overflow-1.d b/ld/testsuite/ld-mips-elf/jal-local-overflow-1.d
index c4deb8bf15..dcc7d1f239 100644
--- a/ld/testsuite/ld-mips-elf/jal-local-overflow-1.d
+++ b/ld/testsuite/ld-mips-elf/jal-local-overflow-1.d
@@ -1,7 +1,6 @@
 #name: MIPS JAL to local symbol overflow 1
 #source: jal-local-overflow.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1fffd000 -e 0x1fffd000
+#ld: -Ttext 0x1fffd000 -e 0x1fffd000
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x2000\): relocation truncated to fit: R_MIPS_26 against `.text'\n
 #error:   [^\n]*: in function `bar':\n
diff --git a/ld/testsuite/ld-mips-elf/jalbal.d b/ld/testsuite/ld-mips-elf/jalbal.d
index 49cda75c76..a93df5e031 100644
--- a/ld/testsuite/ld-mips-elf/jalbal.d
+++ b/ld/testsuite/ld-mips-elf/jalbal.d
@@ -1,7 +1,7 @@
 #name: jal to bal
 #source: jalbal.s
-#as: -EB -n32 -march=rm9000
-#ld: -EB -e s1 -Ttext 0x200000a0
+#as: -march=rm9000
+#ld: -e s1 -Ttext 0x200000a0
 #objdump: -d
 
 .*file format elf.*mips.*
diff --git a/ld/testsuite/ld-mips-elf/jalx-addend-n32.d b/ld/testsuite/ld-mips-elf/jalx-addend-n32.d
index a364422593..45cc2d51e0 100644
--- a/ld/testsuite/ld-mips-elf/jalx-addend-n32.d
+++ b/ld/testsuite/ld-mips-elf/jalx-addend-n32.d
@@ -1,6 +1,5 @@
 #name: MIPS JAL/JALX addend calculation (n32)
 #source: ../../../gas/testsuite/gas/mips/jalx-addend.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #dump: jalx-addend.d
diff --git a/ld/testsuite/ld-mips-elf/jalx-addend-n64.d b/ld/testsuite/ld-mips-elf/jalx-addend-n64.d
index b6884c50b0..1059f98bd7 100644
--- a/ld/testsuite/ld-mips-elf/jalx-addend-n64.d
+++ b/ld/testsuite/ld-mips-elf/jalx-addend-n64.d
@@ -1,6 +1,5 @@
 #name: MIPS JAL/JALX addend calculation (n64)
 #source: ../../../gas/testsuite/gas/mips/jalx-addend.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #dump: jalx-addend.d
diff --git a/ld/testsuite/ld-mips-elf/jalx-addend.d b/ld/testsuite/ld-mips-elf/jalx-addend.d
index 39cf6f954f..3ac0fee22e 100644
--- a/ld/testsuite/ld-mips-elf/jalx-addend.d
+++ b/ld/testsuite/ld-mips-elf/jalx-addend.d
@@ -1,7 +1,6 @@
 #name: MIPS JAL/JALX addend calculation
 #source: ../../../gas/testsuite/gas/mips/jalx-addend.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*mips.*
diff --git a/ld/testsuite/ld-mips-elf/jalx-local-n32.d b/ld/testsuite/ld-mips-elf/jalx-local-n32.d
index b5615b92c2..41e995bfce 100644
--- a/ld/testsuite/ld-mips-elf/jalx-local-n32.d
+++ b/ld/testsuite/ld-mips-elf/jalx-local-n32.d
@@ -1,6 +1,5 @@
 #name: MIPS JALX to local symbol (n32)
 #source: ../../../gas/testsuite/gas/mips/jalx-local.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #dump: jalx-local.d
diff --git a/ld/testsuite/ld-mips-elf/jalx-local-n64.d b/ld/testsuite/ld-mips-elf/jalx-local-n64.d
index 3a18363940..0974ab691a 100644
--- a/ld/testsuite/ld-mips-elf/jalx-local-n64.d
+++ b/ld/testsuite/ld-mips-elf/jalx-local-n64.d
@@ -1,6 +1,5 @@
 #name: MIPS JALX to local symbol (n64)
 #source: ../../../gas/testsuite/gas/mips/jalx-local.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #dump: jalx-local.d
diff --git a/ld/testsuite/ld-mips-elf/jalx-local.d b/ld/testsuite/ld-mips-elf/jalx-local.d
index 04538588ca..bf8005f23c 100644
--- a/ld/testsuite/ld-mips-elf/jalx-local.d
+++ b/ld/testsuite/ld-mips-elf/jalx-local.d
@@ -1,7 +1,6 @@
 #name: MIPS JALX to local symbol
 #source: ../../../gas/testsuite/gas/mips/jalx-local.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*mips.*
diff --git a/ld/testsuite/ld-mips-elf/jr-to-b-1.d b/ld/testsuite/ld-mips-elf/jr-to-b-1.d
index c78684736c..3cdbc834b2 100644
--- a/ld/testsuite/ld-mips-elf/jr-to-b-1.d
+++ b/ld/testsuite/ld-mips-elf/jr-to-b-1.d
@@ -1,7 +1,7 @@
 #name: jr to b conversion
 #source: jr-to-b-1.s
-#as: -32 -mips1 -EB
-#ld: -shared -melf32btsmip
+#as: -mips1
+#ld: -shared
 #objdump: -d
 
 .*:     file format .*
diff --git a/ld/testsuite/ld-mips-elf/jr-to-b-2.d b/ld/testsuite/ld-mips-elf/jr-to-b-2.d
index 4b6399fc5d..216e473901 100644
--- a/ld/testsuite/ld-mips-elf/jr-to-b-2.d
+++ b/ld/testsuite/ld-mips-elf/jr-to-b-2.d
@@ -1,7 +1,7 @@
 #name: jr not to b conversion
 #source: jr-to-b-2.s
-#as: -32 -mips1 -EB
-#ld: -shared -melf32btsmip
+#as: -mips1
+#ld: -shared
 #objdump: -d
 
 .*:     file format .*
diff --git a/ld/testsuite/ld-mips-elf/lsi-4010-isa.d b/ld/testsuite/ld-mips-elf/lsi-4010-isa.d
index 5e7872338f..0dbc25efc5 100644
--- a/ld/testsuite/ld-mips-elf/lsi-4010-isa.d
+++ b/ld/testsuite/ld-mips-elf/lsi-4010-isa.d
@@ -1,8 +1,8 @@
 #readelf: -Ah
 #name: LSI 4010 processor ISA level
 #source: empty.s
-#as: -EB -32 -m4010
-#ld: -EB -r
+#as: -m4010
+#ld: -r
 
 ELF Header:
 #...
diff --git a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend-n32.d b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend-n32.d
index 2051cea6be..70d33381d1 100644
--- a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend-n32.d
+++ b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend-n32.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: microMIPS link branch to absolute expression with addend (n32)
 #source: ../../../gas/testsuite/gas/mips/micromips-branch-absolute-addend.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x12340000 -e foo
+#ld: -Ttext 0x12340000 -e foo
 #dump: micromips-branch-absolute-addend.d
diff --git a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend-n64.d b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend-n64.d
index 3814a0ae45..1cb6d57290 100644
--- a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend-n64.d
+++ b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend-n64.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: microMIPS link branch to absolute expression with addend (n64)
 #source: ../../../gas/testsuite/gas/mips/micromips-branch-absolute-addend.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0x12340000 -e foo
+#ld: -Ttext 0x12340000 -e foo
 #dump: micromips-branch-absolute-addend.d
diff --git a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend.d b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend.d
index fc3bd0306e..cf3afeccdb 100644
--- a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend.d
+++ b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend.d
@@ -1,8 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: microMIPS link branch to absolute expression with addend
 #source: ../../../gas/testsuite/gas/mips/micromips-branch-absolute-addend.s
-#as: -EB -32
-#ld: -EB -Ttext 0x12340000 -e foo
+#ld: -Ttext 0x12340000 -e foo
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-n32.d b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-n32.d
index 7b1dd466c1..6d1759fc09 100644
--- a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-n32.d
+++ b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-n32.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: microMIPS link branch to absolute expression (n32)
 #source: ../../../gas/testsuite/gas/mips/micromips-branch-absolute.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 #dump: micromips-branch-absolute.d
diff --git a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-n64.d b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-n64.d
index e661935911..9aa47e131f 100644
--- a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-n64.d
+++ b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-n64.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: microMIPS link branch to absolute expression (n64)
 #source: ../../../gas/testsuite/gas/mips/micromips-branch-absolute.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 #dump: micromips-branch-absolute.d
diff --git a/ld/testsuite/ld-mips-elf/micromips-branch-absolute.d b/ld/testsuite/ld-mips-elf/micromips-branch-absolute.d
index ad44f5ab16..ba377e6572 100644
--- a/ld/testsuite/ld-mips-elf/micromips-branch-absolute.d
+++ b/ld/testsuite/ld-mips-elf/micromips-branch-absolute.d
@@ -1,8 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: microMIPS link branch to absolute expression
 #source: ../../../gas/testsuite/gas/mips/micromips-branch-absolute.s
-#as: -EB -32
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index 64d71c6189..7e8ef69e35 100644
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -52,42 +52,201 @@ if {![istarget mips*-*-*] || ![is_elf_format]} {
     return
 }
 
-set has_newabi [expr [istarget *-*-irix6*] \
-		     || [istarget mips*-*-linux*] \
-		     || [istarget mips*-sde-elf*] \
-		     || [istarget mips*-mti-elf*] \
-		     || [istarget mips*-img-elf*]]
-set has_elf32 [expr ![istarget *-*-openbsd*]]
+# run_dump_test_abi ABI NAME ARGS
+#
+# Invoke "run_dump_test" for test NAME using ABI if supported by the
+# target used, passing predefined ABI-specific arguments.  ARGS are
+# as with "run_dump_test" and are appended to ABI-specific arguments,
+# except for the special "noarch" keyword, which, if present, must
+# appear first and is consumed causing any "-march=" option to be
+# removed from ABI-specific GAS arguments.
+proc run_dump_test_abi { abi name args } {
+    global abi_asflags
+    global abi_ldflags
+    global has_abi
+
+    set args [lindex $args 0]
+    set asflags $abi_asflags($abi)
+    set ldflags $abi_ldflags($abi)
+    if { [lindex $args 0] == "noarch" } {
+	set asflags [regsub -- {-march=[^[:blank:]]*} $asflags {}]
+	set args [lreplace $args 0 0]
+    }
+    if !$has_abi($abi) {
+	lappend args {notarget *-*-*}
+    }
+    if { [llength $args] > 0 } {
+	run_dump_test $name [concat [list [list as $asflags] \
+					  [list ld $ldflags]] \
+				    $args]
+    } else {
+	run_dump_test $name [list [list as $asflags] [list ld $ldflags]]
+    }
+}
+
+# run_dump_test_o32 NAME ARGS
+#
+# Invoke "run_dump_test_abi" for test NAME using the o32 ABI and
+# passing ARGS.
+proc run_dump_test_o32 { name args } {
+    run_dump_test_abi o32 $name [lindex $args 0]
+}
+
+# run_dump_test_n32 NAME ARGS
+#
+# Invoke "run_dump_test_abi" for test NAME using the n32 ABI and
+# passing ARGS.
+proc run_dump_test_n32 { name args } {
+    run_dump_test_abi n32 $name [lindex $args 0]
+}
+
+# run_dump_test_n64 NAME ARGS
+#
+# Invoke "run_dump_test_abi" for test NAME using the n64 ABI and
+# passing ARGS.
+proc run_dump_test_n64 { name args } {
+    run_dump_test_abi n64 $name [lindex $args 0]
+}
+
+# run_dump_test_eabi NAME ARGS
+#
+# Invoke "run_dump_test_abi" for test NAME using the eabi ABI and
+# passing ARGS.
+proc run_dump_test_eabi { name args } {
+    run_dump_test_abi eabi $name [lindex $args 0]
+}
+
+set has_abi(o32) [expr ![istarget *-*-openbsd*] \
+		     && ![istarget mips64*el-ps2-elf*]]
+set has_abi(n32) [expr [istarget *-img-elf*] \
+		     || [istarget *-mti-elf*] \
+		     || [istarget mips64*el-ps2-elf*] \
+		     || [istarget *-sde-elf*] \
+		     || [istarget *-*-freebsd*] \
+		     || [istarget *-*-irix6*] \
+		     || [istarget *-*-kfreebsd*-gnu] \
+		     || [istarget *-*-linux*]]
+set has_abi(n64) [expr [istarget *-*-freebsd*] \
+		     || [istarget *-*-irix6*] \
+		     || [istarget *-*-kfreebsd*-gnu] \
+		     || [istarget *-*-linux*] \
+		     || [istarget *-*-netbsd*] \
+		     || [istarget *-*-openbsd*]]
+set has_abi(eabi) [expr [istarget *-*-elf] \
+		      && $has_abi(o32)]
 set irix [expr [istarget *-*-irix*]]
 set linux_gnu [expr [istarget mips*-*-linux*]]
 set embedded_elf [expr [istarget mips*-*-elf]]
 
 # Set defaults.
-set abi_asflags(o32) "-32"
-set abi_asflags(n32) "-march=from-abi -n32 -EB"
-set abi_asflags(n64) "-march=from-abi -64 -EB"
+set abi_asflags(o32) ""
+set abi_asflags(n32) ""
+set abi_asflags(n64) ""
+set abi_asflags(eabi) ""
 set abi_ldflags(o32) ""
-set abi_ldflags(n32) -melf32bmipn32
-set abi_ldflags(n64) -melf64bmip
+set abi_ldflags(n32) ""
+set abi_ldflags(n64) ""
+set abi_ldflags(eabi) ""
 
 # Override as needed.
-if { [istarget *-*-irix6*] } {
-    set abi_asflags(o32) "-32 -EB"
+if {[istarget *-*-openbsd*] } {
+    set irixemul 0
+} elseif { [istarget mips64*-*-linux*] } {
+    if [istarget *el-*-*] {
+	set abi_asflags(o32) -32
+	set abi_ldflags(o32) -melf32ltsmip
+	set abi_asflags(n64) "-march=from-abi -64"
+	set abi_ldflags(n64) -melf64ltsmip
+    } else {
+	set abi_asflags(o32) -32
+	set abi_ldflags(o32) -melf32btsmip
+	set abi_asflags(n64) "-march=from-abi -64"
+	set abi_ldflags(n64) -melf64btsmip
+    }
+    set irixemul 0
+} elseif {[istarget *-*-linux*] } {
+    if [istarget *el-*-*] {
+	set abi_asflags(n32) "-march=from-abi -n32"
+	set abi_ldflags(n32) -melf32ltsmipn32
+	set abi_asflags(n64) "-march=from-abi -64"
+	set abi_ldflags(n64) -melf64ltsmip
+    } else {
+	set abi_asflags(n32) "-march=from-abi -n32"
+	set abi_ldflags(n32) -melf32btsmipn32
+	set abi_asflags(n64) "-march=from-abi -64"
+	set abi_ldflags(n64) -melf64btsmip
+    }
+    set irixemul 0
+} elseif {[istarget *-img-elf*] \
+     || [istarget *-mti-elf*] \
+     || [istarget *-sde-elf*] \
+     || [istarget *-*-netbsd*] \
+     || [istarget *-*-linux*] \
+     || [istarget *-*-sysv4*] } {
+    if [istarget *el-*-*] {
+	set abi_asflags(o32) -32
+	set abi_asflags(n32) "-march=from-abi -n32"
+	set abi_ldflags(n32) -melf32ltsmipn32
+	set abi_asflags(n64) "-march=from-abi -64"
+	set abi_ldflags(n64) -melf64ltsmip
+    } else {
+	set abi_asflags(o32) -32
+	set abi_asflags(n32) "-march=from-abi -n32"
+	set abi_ldflags(n32) -melf32btsmipn32
+	set abi_asflags(n64) "-march=from-abi -64"
+	set abi_ldflags(n64) -melf64btsmip
+    }
+    set irixemul 0
+} elseif { [istarget mips64*-*-freebsd*] \
+	   || [istarget mips64*-*-kfreebsd*-gnu] } {
+    if [istarget *el-*-*] {
+	set abi_asflags(o32) -32
+	set abi_ldflags(o32) -melf32ltsmip_fbsd
+	set abi_asflags(n64) "-march=from-abi -64"
+	set abi_ldflags(n64) -melf64ltsmip_fbsd
+    } else {
+	set abi_asflags(o32) -32
+	set abi_ldflags(o32) -melf32btsmip_fbsd
+	set abi_asflags(n64) "-march=from-abi -64"
+	set abi_ldflags(n64) -melf64btsmip_fbsd
+    }
+    set irixemul 0
+} elseif { [istarget *-*-freebsd*] \
+	   || [istarget *-*-kfreebsd*-gnu] } {
+    if [istarget *el-*-*] {
+	set abi_asflags(n32) "-march=from-abi -n32"
+	set abi_ldflags(n32) -melf32ltsmipn32_fbsd
+	set abi_asflags(n64) "-march=from-abi -64"
+	set abi_ldflags(n64) -melf64ltsmip_fbsd
+    } else {
+	set abi_asflags(n32) "-march=from-abi -n32"
+	set abi_ldflags(n32) -melf32btsmipn32_fbsd
+	set abi_asflags(n64) "-march=from-abi -64"
+	set abi_ldflags(n64) -melf64btsmip_fbsd
+    }
+    set irixemul 0
+} elseif { [istarget *vr4100*-*-elf*] \
+	   || [istarget *vr4300*-*-elf*] \
+	   || [istarget *vr5000*-*-elf*] } {
+    set abi_asflags(o32) -32
+    set irixemul 1
+} elseif { [istarget mips64*el-ps2-elf*] } {
+    set abi_asflags(o32) -32
+    set abi_ldflags(o32) -melf32lr5900
+    set irixemul 1
+} elseif { [istarget *-*-elf*] \
+	   || [istarget *-*-rtems*] } {
+    set abi_asflags(o32) -32
+    set irixemul 1
+} elseif { [istarget *-*-irix6*] } {
+    set abi_asflags(o32) -32
+    set abi_asflags(n64) "-march=from-abi -64"
     set abi_ldflags(o32) -melf32bsmip
-} elseif { [istarget mips64*-linux*] } {
-    set abi_asflags(o32) "-32 -EB"
-    set abi_ldflags(o32) -melf32btsmip
-} elseif { [istarget mips64*-*freebsd*] } {
-    set abi_asflags(o32) "-32 -EB"
-    set abi_ldflags(o32) -melf32btsmip_fbsd
-}
-if { [istarget mips*-*-linux*] || [istarget mips*-sde-elf*]
-     || [istarget mips*-mti-elf*] || [istarget mips*-img-elf*]} {
-    set abi_ldflags(n32) -melf32btsmipn32
-    set abi_ldflags(n64) -melf64btsmip
-} elseif { [istarget mips64*-*freebsd*] } {
-    set abi_ldflags(n32) -melf32btsmipn32_fbsd
-    set abi_ldflags(n64) -melf64btsmip_fbsd
+    set abi_ldflags(n64) -melf64bmip
+    set irixemul 1
+} else {
+    set abi_asflags(o32) -32
+    set irixemul 1
 }
 
 if { $linux_gnu } {
@@ -145,85 +304,56 @@ run_dump_test "mips16-1"
 # MIPS branch offset final link checking.
 run_dump_test "branch-misc-1"
 run_dump_test "branch-misc-2"
-run_dump_test "branch-absolute" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "branch-absolute-addend" [list [list ld $abi_ldflags(o32)]]
-if $has_newabi {
-    run_dump_test "branch-absolute-n32" [list [list ld $abi_ldflags(n32)]]
-    run_dump_test "branch-absolute-addend-n32" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "branch-absolute-n64" [list [list ld $abi_ldflags(n64)]]
-    run_dump_test "branch-absolute-addend-n64" \
-					[list [list ld $abi_ldflags(n64)]]
-}
-
-run_dump_test "mips16-pcrel-0" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16-pcrel-1" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16e2-pcrel-0" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16e2-pcrel-1" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16-pcrel-addend-2" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16-pcrel-addend-6" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16e2-pcrel-addend-2" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16e2-pcrel-addend-6" [list [list ld $abi_ldflags(o32)]]
-if $has_newabi {
-    run_dump_test "mips16-pcrel-n32-0" [list [list ld $abi_ldflags(n32)]]
-    run_dump_test "mips16-pcrel-n32-1" [list [list ld $abi_ldflags(n32)]]
-    run_dump_test "mips16-pcrel-n64-sym32-0" [list [list ld $abi_ldflags(n64)]]
-    run_dump_test "mips16-pcrel-n64-sym32-1" [list [list ld $abi_ldflags(n64)]]
-    run_dump_test "mips16e2-pcrel-n32-0" [list [list ld $abi_ldflags(n32)]]
-    run_dump_test "mips16e2-pcrel-n32-1" [list [list ld $abi_ldflags(n32)]]
-    run_dump_test "mips16e2-pcrel-n64-sym32-0" \
-					[list [list ld $abi_ldflags(n64)]]
-    run_dump_test "mips16e2-pcrel-n64-sym32-1" \
-					[list [list ld $abi_ldflags(n64)]]
-}
-
-run_dump_test "mips16-branch-2" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16-branch-3" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16-branch-addend-2" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16-branch-addend-3" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16-branch-absolute" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16-branch-absolute-1" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16-branch-absolute-2" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16-branch-absolute-addend" \
-					[list [list ld $abi_ldflags(o32)]]
-run_dump_test "mips16-branch-absolute-addend-1" \
-					[list [list ld $abi_ldflags(o32)]]
-if $has_newabi {
-    run_dump_test "mips16-branch-absolute-n32" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "mips16-branch-absolute-n32-1" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "mips16-branch-absolute-n32-2" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "mips16-branch-absolute-addend-n32" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "mips16-branch-absolute-addend-n32-1" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "mips16-branch-absolute-n64" \
-					[list [list ld $abi_ldflags(n64)]]
-    run_dump_test "mips16-branch-absolute-n64-1" \
-					[list [list ld $abi_ldflags(n64)]]
-    run_dump_test "mips16-branch-absolute-n64-2" \
-					[list [list ld $abi_ldflags(n64)]]
-    run_dump_test "mips16-branch-absolute-addend-n64" \
-					[list [list ld $abi_ldflags(n64)]]
-    run_dump_test "mips16-branch-absolute-addend-n64-1" \
-					[list [list ld $abi_ldflags(n64)]]
-}
-
-run_dump_test "micromips-branch-absolute" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "micromips-branch-absolute-addend" \
-					[list [list ld $abi_ldflags(o32)]]
-if $has_newabi {
-    run_dump_test "micromips-branch-absolute-n32" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "micromips-branch-absolute-addend-n32" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "micromips-branch-absolute-n64" \
-					[list [list ld $abi_ldflags(n64)]]
-    run_dump_test "micromips-branch-absolute-addend-n64" \
-					[list [list ld $abi_ldflags(n64)]]
-}
+run_dump_test_o32 "branch-absolute"
+run_dump_test_o32 "branch-absolute-addend"
+run_dump_test_n32 "branch-absolute-n32"
+run_dump_test_n32 "branch-absolute-addend-n32"
+run_dump_test_n64 "branch-absolute-n64"
+run_dump_test_n64 "branch-absolute-addend-n64"
+
+run_dump_test_o32 "mips16-pcrel-0"
+run_dump_test_o32 "mips16-pcrel-1" noarch
+run_dump_test_o32 "mips16e2-pcrel-0" noarch
+run_dump_test_o32 "mips16e2-pcrel-1" noarch
+run_dump_test_o32 "mips16-pcrel-addend-2"
+run_dump_test_o32 "mips16-pcrel-addend-6"
+run_dump_test_o32 "mips16e2-pcrel-addend-2" noarch
+run_dump_test_o32 "mips16e2-pcrel-addend-6" noarch
+run_dump_test_n32 "mips16-pcrel-n32-0"
+run_dump_test_n32 "mips16-pcrel-n32-1"
+run_dump_test_n64 "mips16-pcrel-n64-sym32-0"
+run_dump_test_n64 "mips16-pcrel-n64-sym32-1"
+run_dump_test_n32 "mips16e2-pcrel-n32-0" noarch
+run_dump_test_n32 "mips16e2-pcrel-n32-1" noarch
+run_dump_test_n64 "mips16e2-pcrel-n64-sym32-0" noarch
+run_dump_test_n64 "mips16e2-pcrel-n64-sym32-1" noarch
+
+run_dump_test_o32 "mips16-branch-2"
+run_dump_test_o32 "mips16-branch-3"
+run_dump_test_o32 "mips16-branch-addend-2"
+run_dump_test_o32 "mips16-branch-addend-3"
+run_dump_test_o32 "mips16-branch-absolute"
+run_dump_test_o32 "mips16-branch-absolute-1"
+run_dump_test_o32 "mips16-branch-absolute-2"
+run_dump_test_o32 "mips16-branch-absolute-addend"
+run_dump_test_o32 "mips16-branch-absolute-addend-1"
+run_dump_test_n32 "mips16-branch-absolute-n32"
+run_dump_test_n32 "mips16-branch-absolute-n32-1"
+run_dump_test_n32 "mips16-branch-absolute-n32-2"
+run_dump_test_n32 "mips16-branch-absolute-addend-n32"
+run_dump_test_n32 "mips16-branch-absolute-addend-n32-1"
+run_dump_test_n64 "mips16-branch-absolute-n64"
+run_dump_test_n64 "mips16-branch-absolute-n64-1"
+run_dump_test_n64 "mips16-branch-absolute-n64-2"
+run_dump_test_n64 "mips16-branch-absolute-addend-n64"
+run_dump_test_n64 "mips16-branch-absolute-addend-n64-1"
+
+run_dump_test_o32 "micromips-branch-absolute"
+run_dump_test_o32 "micromips-branch-absolute-addend"
+run_dump_test_n32 "micromips-branch-absolute-n32"
+run_dump_test_n32 "micromips-branch-absolute-addend-n32"
+run_dump_test_n64 "micromips-branch-absolute-n64"
+run_dump_test_n64 "micromips-branch-absolute-addend-n64"
 
 # Jalx test
 run_dump_test "jalx-1"
@@ -250,47 +380,36 @@ if { $linux_gnu } {
 	      "jalx-2"]]
 }
 
-run_dump_test "jalx-addend" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "jalx-local" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "bal-jalx-addend" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "bal-jalx-addend-micromips" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "bal-jalx-local" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "bal-jalx-local-micromips" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "bal-jalx-pic" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "bal-jalx-pic-micromips" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "bal-jalx-pic-ignore" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "bal-jalx-pic-ignore-micromips" \
-					[list [list ld $abi_ldflags(o32)]]
-if $has_newabi {
-    run_dump_test "jalx-addend-n32" [list [list ld $abi_ldflags(n32)]]
-    run_dump_test "jalx-local-n32" [list [list ld $abi_ldflags(n32)]]
-    run_dump_test "bal-jalx-addend-n32" [list [list ld $abi_ldflags(n32)]]
-    run_dump_test "bal-jalx-addend-micromips-n32" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "bal-jalx-local-n32" [list [list ld $abi_ldflags(n32)]]
-    run_dump_test "bal-jalx-local-micromips-n32" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "bal-jalx-pic-n32" [list [list ld $abi_ldflags(n32)]]
-    run_dump_test "bal-jalx-pic-micromips-n32" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "bal-jalx-pic-ignore-n32" [list [list ld $abi_ldflags(n32)]]
-    run_dump_test "bal-jalx-pic-ignore-micromips-n32" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "jalx-addend-n64" [list [list ld $abi_ldflags(n64)]]
-    run_dump_test "jalx-local-n64" [list [list ld $abi_ldflags(n64)]]
-    run_dump_test "bal-jalx-addend-n64" [list [list ld $abi_ldflags(n64)]]
-    run_dump_test "bal-jalx-addend-micromips-n64" \
-					[list [list ld $abi_ldflags(n64)]]
-    run_dump_test "bal-jalx-local-n64" [list [list ld $abi_ldflags(n64)]]
-    run_dump_test "bal-jalx-local-micromips-n64" \
-					[list [list ld $abi_ldflags(n64)]]
-    run_dump_test "bal-jalx-pic-n64" [list [list ld $abi_ldflags(n64)]]
-    run_dump_test "bal-jalx-pic-micromips-n64" \
-					[list [list ld $abi_ldflags(n64)]]
-    run_dump_test "bal-jalx-pic-ignore-n64" [list [list ld $abi_ldflags(n64)]]
-    run_dump_test "bal-jalx-pic-ignore-micromips-n64" \
-					[list [list ld $abi_ldflags(n64)]]
-}
+run_dump_test_o32 "jalx-addend"
+run_dump_test_o32 "jalx-local"
+run_dump_test_o32 "bal-jalx-addend"
+run_dump_test_o32 "bal-jalx-addend-micromips"
+run_dump_test_o32 "bal-jalx-local"
+run_dump_test_o32 "bal-jalx-local-micromips"
+run_dump_test_o32 "bal-jalx-pic"
+run_dump_test_o32 "bal-jalx-pic-micromips"
+run_dump_test_o32 "bal-jalx-pic-ignore"
+run_dump_test_o32 "bal-jalx-pic-ignore-micromips"
+run_dump_test_n32 "jalx-addend-n32"
+run_dump_test_n32 "jalx-local-n32"
+run_dump_test_n32 "bal-jalx-addend-n32"
+run_dump_test_n32 "bal-jalx-addend-micromips-n32"
+run_dump_test_n32 "bal-jalx-local-n32"
+run_dump_test_n32 "bal-jalx-local-micromips-n32"
+run_dump_test_n32 "bal-jalx-pic-n32"
+run_dump_test_n32 "bal-jalx-pic-micromips-n32"
+run_dump_test_n32 "bal-jalx-pic-ignore-n32"
+run_dump_test_n32 "bal-jalx-pic-ignore-micromips-n32"
+run_dump_test_n64 "jalx-addend-n64"
+run_dump_test_n64 "jalx-local-n64"
+run_dump_test_n64 "bal-jalx-addend-n64"
+run_dump_test_n64 "bal-jalx-addend-micromips-n64"
+run_dump_test_n64 "bal-jalx-local-n64"
+run_dump_test_n64 "bal-jalx-local-micromips-n64"
+run_dump_test_n64 "bal-jalx-pic-n64"
+run_dump_test_n64 "bal-jalx-pic-micromips-n64"
+run_dump_test_n64 "bal-jalx-pic-ignore-n64"
+run_dump_test_n64 "bal-jalx-pic-ignore-micromips-n64"
 
 run_dump_test "unaligned-jalx-0" [list [list ld $abi_ldflags(o32)]]
 run_dump_test "unaligned-jalx-1" [list [list ld $abi_ldflags(o32)]]
@@ -301,123 +420,85 @@ run_dump_test "unaligned-jalx-mips16-1" [list [list ld $abi_ldflags(o32)]]
 run_dump_test "unaligned-jalx-micromips-0" [list [list ld $abi_ldflags(o32)]]
 run_dump_test "unaligned-jalx-micromips-1" [list [list ld $abi_ldflags(o32)]]
 
-if $has_newabi {
-    run_dump_test "unaligned-jalx-addend-0" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-jalx-addend-1" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-jalx-addend-2" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-jalx-addend-3" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-jalx-addend-mips16-0" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-jalx-addend-mips16-1" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-jalx-addend-micromips-0" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-jalx-addend-micromips-1" \
-					[list [list ld $abi_ldflags(n32)]]
-}
-
-run_dump_test "unaligned-branch" [list [list ld $abi_ldflags(o32)]]
-
-if $has_newabi {
-    run_dump_test "unaligned-branch-2" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-branch-ignore-2" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-branch-r6-1" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-branch-ignore-r6-1" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-branch-r6-2" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-branch-mips16" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-branch-ignore-mips16" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-branch-micromips" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-branch-ignore-micromips" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-jump" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-jump-mips16" \
-					[list [list ld $abi_ldflags(n32)]]
-    run_dump_test "unaligned-jump-micromips" \
-					[list [list ld $abi_ldflags(n32)]]
-}
-
-run_dump_test "unaligned-lwpc-0" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "unaligned-lwpc-1" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "unaligned-ldpc-0" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "unaligned-ldpc-1" [list [list ld $abi_ldflags(o32)]]
+run_dump_test_n32 "unaligned-jalx-addend-0"
+run_dump_test_n32 "unaligned-jalx-addend-1"
+run_dump_test_n32 "unaligned-jalx-addend-2"
+run_dump_test_n32 "unaligned-jalx-addend-3"
+run_dump_test_n32 "unaligned-jalx-addend-mips16-0"
+run_dump_test_n32 "unaligned-jalx-addend-mips16-1"
+run_dump_test_n32 "unaligned-jalx-addend-micromips-0"
+run_dump_test_n32 "unaligned-jalx-addend-micromips-1"
+
+run_dump_test_o32 "unaligned-branch" noarch
+
+run_dump_test_n32 "unaligned-branch-2"
+run_dump_test_n32 "unaligned-branch-ignore-2"
+run_dump_test_n32 "unaligned-branch-r6-1"
+run_dump_test_n32 "unaligned-branch-ignore-r6-1"
+run_dump_test_n32 "unaligned-branch-r6-2" noarch
+run_dump_test_n32 "unaligned-branch-mips16"
+run_dump_test_n32 "unaligned-branch-ignore-mips16"
+run_dump_test_n32 "unaligned-branch-micromips"
+run_dump_test_n32 "unaligned-branch-ignore-micromips"
+run_dump_test_n32 "unaligned-jump"
+run_dump_test_n32 "unaligned-jump-mips16"
+run_dump_test_n32 "unaligned-jump-micromips"
+
+run_dump_test_o32 "unaligned-lwpc-0" noarch
+run_dump_test_o32 "unaligned-lwpc-1" noarch
+run_dump_test_o32 "unaligned-ldpc-0" noarch
+run_dump_test_o32 "unaligned-ldpc-1" noarch
 
 # Test multi-got link.  We only do this on GNU/Linux because it requires
 # the "traditional" emulations.
 if { $linux_gnu } {
-    run_dump_test "multi-got-1"
-    run_dump_test "multi-got-no-shared"
-    run_dump_test "multi-got-hidden-1"
-    run_dump_test "multi-got-hidden-2"
+    run_dump_test_o32 "multi-got-1"
+    run_dump_test_o32 "multi-got-no-shared"
+    run_dump_test_o32 "multi-got-hidden-1"
+    run_dump_test_o32 "multi-got-hidden-2"
 }
 
 # Test __gnu_local_gp accesses
 if { $linux_gnu } {
-    run_dump_test "no-shared-1-o32"
-    if { $has_newabi } {
-	run_dump_test "no-shared-1-n32"
-	run_dump_test "no-shared-1-n64"
-    }
+    run_dump_test_o32 "no-shared-1-o32"
+    run_dump_test_n32 "no-shared-1-n32"
+    run_dump_test_n64 "no-shared-1-n64" {{as -EB} {ld -EB}}
 }
 
 # Test PIE debug dynamic tags
 if { $linux_gnu } {
-    run_dump_test "pie-o32"
-    if { $has_newabi } {
-	run_dump_test "pie-n32"
-	run_dump_test "pie-n64"
-    }
+    run_dump_test_o32 "pie-o32"
+    run_dump_test_n32 "pie-n32"
+    run_dump_test_n64 "pie-n64"
 }
 
-if $has_newabi {
-    if { $embedded_elf } {
-	run_dump_test "elf-rel-got-n32-embed" \
-					[list [list ld $abi_ldflags(n32)]]
-	run_dump_test "elf-rel-xgot-n32-embed" \
-					[list [list ld $abi_ldflags(n32)]]
-    } else {
-	run_dump_test "elf-rel-got-n32" [list [list ld $abi_ldflags(n32)]]
-	run_dump_test "elf-rel-xgot-n32" [list [list ld $abi_ldflags(n32)]]
-    }
-    if { $irix } {
-	run_dump_test "elf-rel-got-n64-irix" \
-					[list [list ld $abi_ldflags(n64)]]
-	run_dump_test "elf-rel-xgot-n64-irix" \
-					[list [list ld $abi_ldflags(n64)]]
-    } elseif { $embedded_elf } {
-	run_dump_test "elf-rel-got-n64-embed" \
-					[list [list ld $abi_ldflags(n64)]]
-	run_dump_test "elf-rel-xgot-n64-embed" \
-					[list [list ld $abi_ldflags(n64)]]
-    } else {
-	run_dump_test "elf-rel-got-n64" [list [list ld $abi_ldflags(n64)]]
-	run_dump_test "elf-rel-xgot-n64" [list [list ld $abi_ldflags(n64)]]
-    }
-
-    run_dump_test "relax-jalr-n32"
-    run_dump_test "relax-jalr-n32-shared"
-    run_dump_test "relax-jalr-n64"
-    run_dump_test "relax-jalr-n64-shared"
+if { $embedded_elf } {
+    run_dump_test_n32 "elf-rel-got-n32-embed" {{as -EB} {ld -EB}}
+    run_dump_test_n32 "elf-rel-xgot-n32-embed" {{as -EB} {ld -EB}}
+} else {
+    run_dump_test_n32 "elf-rel-got-n32" {{as -EB} {ld -EB}}
+    run_dump_test_n32 "elf-rel-xgot-n32" {{as -EB} {ld -EB}}
 }
+if { $irix } {
+    run_dump_test_n64 "elf-rel-got-n64-irix"
+    run_dump_test_n64 "elf-rel-xgot-n64-irix"
+} elseif { $embedded_elf } {
+    run_dump_test_n64 "elf-rel-got-n64-embed" {{as -EB} {ld -EB}}
+    run_dump_test_n64 "elf-rel-xgot-n64-embed" {{as -EB} {ld -EB}}
+} else {
+    run_dump_test_n64 "elf-rel-got-n64" {{as -EB} {ld -EB}}
+    run_dump_test_n64 "elf-rel-xgot-n64" {{as -EB} {ld -EB}}
+}
+
+run_dump_test_n32 "relax-jalr-n32" {{as -EB} {ld -EB}}
+run_dump_test_n32 "relax-jalr-n32-shared" {{as -EB} {ld -EB}}
+run_dump_test_n64 "relax-jalr-n64" {{as -EB} {ld -EB}}
+run_dump_test_n64 "relax-jalr-n64-shared" {{as -EB} {ld -EB}}
 
 if { $linux_gnu } {
-    run_dump_test "rel32-o32"
-    if { $has_newabi } {
-	run_dump_test "rel32-n32"
-	run_dump_test "rel64"
-    }
+    run_dump_test_o32 "rel32-o32" {{as -EB} {ld -EB}}
+    run_dump_test_n32 "rel32-n32" {{as -EB} {ld -EB}}
+    run_dump_test_n64 "rel64" {{as -EB} {ld -EB}}
     # The first test checks that a mixed PIC/non-PIC relocatable link
     # will not introduce any stubs itself, but will flag PIC functions
     # for the final link.
@@ -485,7 +566,7 @@ if { $linux_gnu } {
 	  {readelf --symbols pic-and-nonpic-1-micromips.nd}}
 	 "pic-and-nonpic-1-micromips-static2.o"}
     }
-    run_dump_test "pic-and-nonpic-2"
+    run_dump_test_o32 "pic-and-nonpic-2"
     run_ld_link_tests {
 	{"PIC and non-PIC test 3 (shared library)"
 	 "-melf32btsmip -shared -Tpic-and-nonpic-3a.ld" ""
@@ -506,7 +587,7 @@ if { $linux_gnu } {
 	  {readelf -d pic-and-nonpic-3b.ad}}
 	 "pic-and-nonpic-3b"}
     }
-    run_dump_test "pic-and-nonpic-3-error"
+    run_dump_test_o32 "pic-and-nonpic-3-error" {noarch {as -EB} {ld -EB}}
     run_ld_link_tests {
 	{"PIC and non-PIC test 4 (shared library)"
 	 "-melf32btsmip -shared -Tpic-and-nonpic-3a.ld" ""
@@ -524,7 +605,7 @@ if { $linux_gnu } {
 	  {readelf -d pic-and-nonpic-4b.ad}}
 	 "pic-and-nonpic-4b"}
     }
-    run_dump_test "pic-and-nonpic-4-error"
+    run_dump_test_o32 "pic-and-nonpic-4-error" {noarch {as -EB} {ld -EB}}
     run_ld_link_tests {
 	{"PIC and non-PIC test 5 (executable)"
 	 "-melf32btsmip -Tpic-and-nonpic-5b.ld tmpdir/pic-and-nonpic-3a.so tmpdir/pic-and-nonpic-4a.so" ""
@@ -538,9 +619,14 @@ if { $linux_gnu } {
 	  {readelf -d pic-and-nonpic-5b.ad}}
 	 "pic-and-nonpic-5b"}
     }
-    set abis { o32 -32 elf32btsmip }
-    if $has_newabi {
+    set abis {}
+    if $has_abi(o32) {
+	lappend abis o32 -32 elf32btsmip
+    }
+    if $has_abi(n32) {
 	lappend abis n32 -n32 elf32btsmipn32
+    }
+    if $has_abi(n64) {
 	lappend abis n64 -64 elf64btsmip
     }
     foreach { abi flag emul } $abis {
@@ -604,28 +690,20 @@ if { $linux_gnu } {
     }
 }
 
-if { $embedded_elf } {
-    run_dump_test "region1"
-}
+run_dump_test_eabi "region1"
 
-if $embedded_elf {
-    # This could work on other targets too, but would need the appropriate
-    # ld -m switch.
-    run_dump_test "reloc-1-rel"
-}
-if $has_newabi {
-    run_dump_test "reloc-1-n32" [list [list ld $abi_ldflags(n32)]]
-    run_dump_test "reloc-1-n64" [list [list ld $abi_ldflags(n64)]]
-}
-run_dump_test "reloc-2"
+run_dump_test_o32 "reloc-1-rel"
+run_dump_test_n32 "reloc-1-n32"
+run_dump_test_n64 "reloc-1-n64"
+run_dump_test_o32 "reloc-2" [list [list objdump [expr { [istarget *el-*-*] \
+							? "--endian=little" \
+							: "--endian=big" }]]]
 run_dump_test "reloc-merge-lo16"
 run_dump_test "reloc-3"
-if {$has_newabi} {
-    run_dump_test "reloc-3-n32"
-}
+run_dump_test_n32 "reloc-3-n32" noarch
 run_dump_test "reloc-4"
 run_dump_test "reloc-5"
-if { $has_newabi && [check_shared_lib_support] } {
+if { $has_abi(n32) && [check_shared_lib_support] } {
     run_ld_link_tests [list \
 	[list \
 	    "reloc test 6a" \
@@ -643,25 +721,25 @@ if { $has_newabi && [check_shared_lib_support] } {
 	    "reloc-6b"]]
 }
 
-run_dump_test "reloc-local-overflow" [list [list ld $abi_ldflags(o32)]]
-run_ld_link_tests [list \
-    [list \
-	"MIPS link ELF o32 PIC comdat GOT16/LO16 relocation pairing" \
-	"$abi_ldflags(o32) -e bar" "" "$abi_asflags(o32) -mno-pdr" \
-	"../../../gas/testsuite/gas/mips/comdat-reloc.s" \
-	{} \
-	"comdat-reloc"]]
-
-if {$has_newabi && $linux_gnu} {
-    run_dump_test "eh-frame1-n32"
-    run_dump_test "eh-frame1-n64"
-    run_dump_test "eh-frame2-n32"
-    run_dump_test "eh-frame2-n64"
+run_dump_test_o32 "reloc-local-overflow"
+if { $has_abi(o32) } {
+    run_ld_link_tests [list \
+	[list \
+	    "MIPS link ELF o32 PIC comdat GOT16/LO16 relocation pairing" \
+	    "$abi_ldflags(o32) -e bar" "" "$abi_asflags(o32) -mno-pdr" \
+	    "../../../gas/testsuite/gas/mips/comdat-reloc.s" \
+	    {} \
+	    "comdat-reloc"]]
 }
-if {$embedded_elf} {
-    run_dump_test "eh-frame3"
-    run_dump_test "eh-frame4"
+
+if {$linux_gnu} {
+    run_dump_test_n32 "eh-frame1-n32"
+    run_dump_test_n64 "eh-frame1-n64"
+    run_dump_test_n32 "eh-frame2-n32"
+    run_dump_test_n64 "eh-frame2-n64"
 }
+run_dump_test_eabi "eh-frame3"
+run_dump_test_eabi "eh-frame4"
 if {$linux_gnu} {
     set eh_frame5_test {
 	{"MIPS eh-frame 5"
@@ -689,57 +767,46 @@ if {$linux_gnu} {
 run_dump_test "jaloverflow"
 run_dump_test "jaloverflow-2"
 
-run_dump_test "jal-global-overflow-0" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "jal-global-overflow-1" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "jal-local-overflow-0" [list [list ld $abi_ldflags(o32)]]
-run_dump_test "jal-local-overflow-1" [list [list ld $abi_ldflags(o32)]]
-
-run_dump_test "undefweak-overflow" [list [list as $abi_asflags(o32)] \
-					 [list ld $abi_ldflags(o32)]]
-
-if {$has_newabi} {
-    run_dump_test "undefweak-overflow" [list [list name (n32)] \
-					     [list as $abi_asflags(n32)] \
-					     [list ld $abi_ldflags(n32)]]
-    run_dump_test "undefweak-overflow" [list [list name (n64)] \
-					     [list as $abi_asflags(n64)] \
-					     [list ld $abi_ldflags(n64)]]
-}
+run_dump_test_o32 "jal-global-overflow-0"
+run_dump_test_o32 "jal-global-overflow-1"
+run_dump_test_o32 "jal-local-overflow-0"
+run_dump_test_o32 "jal-local-overflow-1"
 
-if {$has_newabi} {
-    run_dump_test "jalbal" [list [list ld $abi_ldflags(n32)]]
-}
+run_dump_test_o32 "undefweak-overflow"
+
+run_dump_test_n32 "undefweak-overflow" [list [list name (n32)]]
+run_dump_test_n64 "undefweak-overflow" [list [list name (n64)]]
+
+run_dump_test_n32 "jalbal" noarch
 
 run_dump_test "mode-change-error-1"
 
-run_dump_test "mips16-hilo"
-if {$has_newabi} {
-    run_dump_test "mips16-hilo-n32"
-}
+run_dump_test_o32 "mips16-hilo"
+run_dump_test_n32 "mips16-hilo-n32"
 
 if { $linux_gnu } {
-    if { $has_newabi } {
-	run_dump_test "textrel-1"
-    }
+    run_dump_test_n32 "textrel-1"
     run_dump_test "got-page-1"
-    if $has_newabi {
-	run_dump_test "got-page-2"
-	run_dump_test "dyn-sec64"
-    }
+    run_dump_test_n32 "got-page-2"
+    run_dump_test_n64 "dyn-sec64" noarch
     run_dump_test "got-page-3"
-    run_ld_link_tests [subst {
-	{"GOT page 4 (one file)" "-shared $abi_ldflags(o32) -T got-page-1.ld"
-	 "" "$abi_asflags(o32) -mips2" {got-page-4b.s}
-	 {{objdump -dr got-page-4a.d}
-	  {readelf -A got-page-4a.got}}
-	 "got-page-4a.so"}
-	{"GOT page 4 (two files)" "-shared $abi_ldflags(o32) -T got-page-1.ld"
-	 "" "$abi_asflags(o32) -mips2" {got-page-4a.s got-page-4b.s}
-	 {{objdump -dr got-page-4b.d}
-	  {readelf -A got-page-4b.got}}
-	 "got-page-4b.so"}
-    }]
-    if $has_newabi {
+    if $has_abi(o32) {
+	run_ld_link_tests [subst {
+	    {"GOT page 4 (one file)"
+	     "-shared $abi_ldflags(o32) -T got-page-1.ld"
+	     "" "$abi_asflags(o32) -mips2" {got-page-4b.s}
+	     {{objdump -dr got-page-4a.d}
+	      {readelf -A got-page-4a.got}}
+	     "got-page-4a.so"}
+	    {"GOT page 4 (two files)"
+	     "-shared $abi_ldflags(o32) -T got-page-1.ld"
+	     "" "$abi_asflags(o32) -mips2" {got-page-4a.s got-page-4b.s}
+	     {{objdump -dr got-page-4b.d}
+	      {readelf -A got-page-4b.got}}
+	     "got-page-4b.so"}
+	}]
+    }
+    if $has_abi(n32) {
         run_ld_link_tests [subst {
 	    {"GOT page 5" "-shared $abi_ldflags(n32) -T got-page-1.ld"
 	     "" "$abi_asflags(n32)" {got-page-5.s}
@@ -768,21 +835,17 @@ if { $linux_gnu } {
 	}]
     }
     run_dump_test "got-dump-1"
-    if $has_newabi {
-	run_dump_test "got-dump-2"
-    }
+    run_dump_test_n64 "got-dump-2" noarch
     run_dump_test "reloc-estimate-1"
 }
 
-if $has_newabi {
-    run_dump_test "emit-relocs-1"
-}
+run_dump_test_n32 "emit-relocs-1" {{as -EB} {ld -EB}}
 
 run_dump_test "hash1a"
 run_dump_test "hash1b"
 run_dump_test "hash1c"
 
-if { $linux_gnu } {
+if { $linux_gnu && $has_abi(o32) } {
     # The number of symbols that are always included in the symbol table
     # for these tests.
     #     the null symbol entry
@@ -934,7 +997,7 @@ set mips_tls_tests {
      "tls-hidden4.so"}
 }
 
-if { $linux_gnu } {
+if { $linux_gnu && $has_abi(o32) } {
     run_ld_link_tests $mips_tls_tests
 }
 
@@ -946,7 +1009,9 @@ set mips16_call_global_test [list \
 	 {{objdump -dr mips16-call-global.d}} \
 	 "mips16-call-global"]]
 
-run_ld_link_tests $mips16_call_global_test
+if { $has_abi(o32) } {
+    run_ld_link_tests $mips16_call_global_test
+}
 
 set mips16_intermix_test [list \
     [list "Intermixing mips32 and mips16 functions" \
@@ -956,7 +1021,9 @@ set mips16_intermix_test [list \
 	 {{objdump -t mips16-intermix.d}} \
 	 "mips16-intermix"]]
 
-run_ld_link_tests $mips16_intermix_test
+if { $has_abi(o32) } {
+    run_ld_link_tests $mips16_intermix_test
+}
 
 run_dump_test "mips16-local-stubs-1"
 
@@ -968,18 +1035,18 @@ set mips16_fp_stub_test [list \
 	 {{readelf --debug-dump=frames mips16-fp-stub.d}} \
 	 "mips16-fp-stub"]]
 
-run_ld_link_tests $mips16_fp_stub_test
-
-set o32flagslist [list [list as $abi_asflags(o32)] [list ld $abi_ldflags(o32)]]
+if { $has_abi(o32) } {
+    run_ld_link_tests $mips16_fp_stub_test
+}
 
 foreach firstfpabi [list 0 1 2 3 4 5 6 7 ] {
   foreach secondfpabi [list 4 5 6 7 ] {
-    run_dump_test "attr-gnu-4-${firstfpabi}${secondfpabi}" $o32flagslist
+    run_dump_test_o32 "attr-gnu-4-${firstfpabi}${secondfpabi}"
   }
 }
 foreach firstfpabi [list 4 5 6 7 ] {
   foreach secondfpabi [list 0 1 2 3 8 9] {
-    run_dump_test "attr-gnu-4-${firstfpabi}${secondfpabi}" $o32flagslist
+    run_dump_test_o32 "attr-gnu-4-${firstfpabi}${secondfpabi}"
   }
 }
 foreach firstfpabi [list 0 1 2 3 ] {
@@ -1000,43 +1067,41 @@ run_dump_test "attr-gnu-8-20"
 run_dump_test "attr-gnu-8-21"
 run_dump_test "attr-gnu-8-22"
 
-run_dump_test "attr-gnu-4-0-ph" $o32flagslist
-run_dump_test "attr-gnu-4-1-ph" $o32flagslist
-run_dump_test "attr-gnu-4-2-ph" $o32flagslist
-run_dump_test "attr-gnu-4-3-ph" $o32flagslist
-run_dump_test "attr-gnu-4-4-ph" $o32flagslist
-run_dump_test "attr-gnu-4-5-ph" $o32flagslist
-run_dump_test "attr-gnu-4-6-ph" $o32flagslist
-run_dump_test "attr-gnu-4-7-ph" $o32flagslist
-
-if $has_newabi {
-  run_dump_test "attr-gnu-4-0-n32-ph"
-  run_dump_test "attr-gnu-4-1-n32-ph"
-  run_dump_test "attr-gnu-4-2-n32-ph"
-  run_dump_test "attr-gnu-4-3-n32-ph"
-  run_dump_test "attr-gnu-4-0-n64-ph"
-  run_dump_test "attr-gnu-4-1-n64-ph"
-  run_dump_test "attr-gnu-4-2-n64-ph"
-  run_dump_test "attr-gnu-4-3-n64-ph"
-}
-
-run_dump_test "abiflags-strip1-ph" $o32flagslist
-run_dump_test "abiflags-strip2-ph" $o32flagslist
-run_dump_test "abiflags-strip3-ph" $o32flagslist
-run_dump_test "abiflags-strip4-ph" $o32flagslist
-run_dump_test "abiflags-strip5-ph" $o32flagslist
-run_dump_test "abiflags-strip6-ph" $o32flagslist
-run_dump_test "abiflags-strip7-ph" $o32flagslist
-run_dump_test "abiflags-strip8-ph" $o32flagslist
-run_dump_test "abiflags-strip9-ph" $o32flagslist
-run_dump_test "abiflags-strip10-ph" $o32flagslist
+run_dump_test_o32 "attr-gnu-4-0-ph"
+run_dump_test_o32 "attr-gnu-4-1-ph"
+run_dump_test_o32 "attr-gnu-4-2-ph"
+run_dump_test_o32 "attr-gnu-4-3-ph"
+run_dump_test_o32 "attr-gnu-4-4-ph"
+run_dump_test_o32 "attr-gnu-4-5-ph"
+run_dump_test_o32 "attr-gnu-4-6-ph"
+run_dump_test_o32 "attr-gnu-4-7-ph"
+
+run_dump_test_n32 "attr-gnu-4-0-n32-ph" noarch
+run_dump_test_n32 "attr-gnu-4-1-n32-ph" noarch
+run_dump_test_n32 "attr-gnu-4-2-n32-ph" noarch
+run_dump_test_n32 "attr-gnu-4-3-n32-ph" noarch
+run_dump_test_n64 "attr-gnu-4-0-n64-ph" noarch
+run_dump_test_n64 "attr-gnu-4-1-n64-ph" noarch
+run_dump_test_n64 "attr-gnu-4-2-n64-ph" noarch
+run_dump_test_n64 "attr-gnu-4-3-n64-ph" noarch
+
+run_dump_test_o32 "abiflags-strip1-ph"
+run_dump_test_o32 "abiflags-strip2-ph"
+run_dump_test_o32 "abiflags-strip3-ph"
+run_dump_test_o32 "abiflags-strip4-ph"
+run_dump_test_o32 "abiflags-strip5-ph"
+run_dump_test_o32 "abiflags-strip6-ph"
+run_dump_test_o32 "abiflags-strip7-ph"
+run_dump_test_o32 "abiflags-strip8-ph"
+run_dump_test_o32 "abiflags-strip9-ph"
+run_dump_test_o32 "abiflags-strip10-ph"
 
 run_dump_test "nan-legacy"
 run_dump_test "nan-2008"
 run_dump_test "nan-mixed-1"
 run_dump_test "nan-mixed-2"
 
-if { $linux_gnu } {
+if { $linux_gnu && $has_abi(o32) } {
     run_ld_link_tests {
 	{"GOT and versioning 1"
 	 "-shared -melf32btsmip --version-script got-vers-1.ver" ""
@@ -1053,15 +1118,25 @@ run_dump_test "undefined-warn"
 
 # Test the conversion from jr to b
 if { $linux_gnu } {
-    run_dump_test "jr-to-b-1"
-    run_dump_test "jr-to-b-2"
+    run_dump_test_o32 "jr-to-b-1" noarch
+    run_dump_test_o32 "jr-to-b-2" noarch
 }
 
 # MIPS16 and microMIPS interlinking test.
 run_dump_test "mips16-and-micromips"
 
+set abis {}
+if $has_abi(o32) {
+    lappend abis o32
+}
+if $has_abi(n32) {
+    lappend abis n32
+}
+if $has_abi(n64) {
+    lappend abis n64
+}
+
 # Export class call relocation tests.
-set abis [concat o32 [expr {$has_newabi ? "n32 n64" : ""}]]
 if [check_shared_lib_support] {
     foreach { abi } $abis {
 	set loadaddr [string map \
@@ -1086,7 +1161,6 @@ if [check_shared_lib_support] {
 }
 
 # Magic __ehdr_start symbol tests.
-set abis [concat o32 [expr {$has_newabi ? "n32 n64" : ""}]]
 foreach { abi } $abis {
     set suff [string map {o32 o32 n32 new n64 new} $abi]
     run_ld_link_tests [list \
@@ -1107,7 +1181,6 @@ foreach { abi } $abis {
 }
 
 # R_MIPS_JALR reloc tests.
-set abis [concat o32 [expr {$has_newabi ? "n32 n64" : ""}]]
 foreach { abi } $abis {
     run_ld_link_tests [list \
 	[list \
@@ -1127,11 +1200,11 @@ foreach { abi } $abis {
 	[list \
 	    "MIPSr6 JALR reloc unaligned/cross-mode link test ($abi)" \
 	    "$abi_ldflags($abi) -T jalr3.ld" "" \
-	    [string map \
-		[list -32 "-mips32r6 -32" \
-		    -n32 "-mips64r6 -n32" \
-		    -64 "-mips64r6 -64"] \
-		[regsub -- -march=from-abi $abi_asflags($abi) ""]] \
+	    "[string map\
+		[list o32 -mips32r6\
+		    n32 -mips64r6\
+		    n64 -mips64r6] $abi ]\
+	     [regsub -- {-march=[^[:blank:]]*} $abi_asflags($abi) {}]" \
 	    {../../../gas/testsuite/gas/mips/jalr4.s} \
 	    {{objdump {-d --prefix-addresses --show-raw-insn} jalr4-r6.dd}} \
 	    "jalr4-${abi}"]]
@@ -1186,7 +1259,7 @@ proc run_mips_plt_test { name abi filter micromips suffix {extra {}} } {
 	      $basename]]
 }
 
-if { $linux_gnu } {
+if { $linux_gnu && $has_abi(o32) } {
     build_mips_plt_lib o32
     run_mips_plt_test "o32 PLTs for standard encoding" o32 104 0 se
     run_mips_plt_test "o32 PLTs for standard branches" o32 16 0 branch
@@ -1210,21 +1283,21 @@ if { $linux_gnu } {
 	o32 109 1 umips-got compressed-plt-1d.s
     run_mips_plt_test "o32 PLTs for mixed MIPS and microMIPS with .word" \
 	o32 109 1 umips-word compressed-plt-1e.s
+}
 
-    if $has_newabi {
-	build_mips_plt_lib n32
-	run_mips_plt_test "n32 PLTs for mixed MIPS and MIPS16" \
-	    n32 109 0 mips16
-	run_mips_plt_test "n32 PLTs for mixed MIPS and microMIPS" \
-	    n32 109 1 umips
-    }
+if { $linux_gnu && $has_abi(n32) } {
+    build_mips_plt_lib n32
+    run_mips_plt_test "n32 PLTs for mixed MIPS and MIPS16" \
+	n32 109 0 mips16
+    run_mips_plt_test "n32 PLTs for mixed MIPS and microMIPS" \
+	n32 109 1 umips
 }
 
 # Verify graceful handling of n64 PLT 32-bit range overflows.  Given
 # that the alignment of `.got.plt' is 8 the highest usable positive
 # address is 0x7fff7ff8 and the lowest usable negative address is
 # 0xffffffff7fff8000.
-if { $linux_gnu } {
+if { $linux_gnu && $has_abi(n64) } {
     run_ld_link_tests [list \
 	[list "Shared library for MIPS n64 PLT 32-bit range tests" \
 	      "-shared $abi_ldflags(n64)" "" \
@@ -1265,7 +1338,7 @@ if { $linux_gnu } {
 }
 
 # PR ld/19908 export class tests.
-if { $linux_gnu } {
+if { $linux_gnu && $has_abi(o32) } {
     run_ld_link_tests [list \
 	[list "Shared library for MIPS export class symbol reference tests" \
 	      "$abi_ldflags(o32) -shared" "" \
@@ -1293,57 +1366,61 @@ if { $linux_gnu } {
 }
 
 # PR ld/21334 GOT relocation in static binary test.
-run_ld_link_tests [list \
-    [list \
-	"PR ld/21334 MIPS GOT16 relocation in static binary" \
-	"$abi_ldflags(o32) -e foo -T pr21334.ld" "" "$abi_asflags(o32)" \
-	{pr21334.s} \
-	{{objdump {-d --prefix-addresses} pr21334.dd} \
-	 {readelf -A pr21334.gd}} \
-	"pr21334"]]
+if { $has_abi(o32) } {
+    run_ld_link_tests [list \
+	[list \
+	    "PR ld/21334 MIPS GOT16 relocation in static binary" \
+	    "$abi_ldflags(o32) -e foo -T pr21334.ld" "" "$abi_asflags(o32)" \
+	    {pr21334.s} \
+	    {{objdump {-d --prefix-addresses} pr21334.dd} \
+	     {readelf -A pr21334.gd}} \
+	    "pr21334"]]
+}
 
 # Check that the ISA level is consistently II for the LSI 4010.
-run_dump_test "lsi-4010-isa" [list [list ld $abi_ldflags(o32)]]
+run_dump_test_o32 "lsi-4010-isa" noarch
 
 # PIC branch relaxation with offset tests.  We need to use our version
 # of `prune_warnings' to get rid of GAS branch relaxation noise.
-rename prune_warnings mips_old_prune_warnings
-proc prune_warnings { msg } {
-    set msg1 "Assembler messages:"
-    set msg2 "Warning: relaxed out-of-range branch into a jump"
-    set msgx "(?:$msg1|$msg2)"
-    regsub -all "(^|\[\n\r\]*)\[^\n\r\]*: $msgx\[\n\r\]*" $msg "\\1" msg
-    return [mips_old_prune_warnings $msg]
+if { $has_abi(o32) } {
+    rename prune_warnings mips_old_prune_warnings
+    proc prune_warnings { msg } {
+	set msg1 "Assembler messages:"
+	set msg2 "Warning: relaxed out-of-range branch into a jump"
+	set msgx "(?:$msg1|$msg2)"
+	regsub -all "(^|\[\n\r\]*)\[^\n\r\]*: $msgx\[\n\r\]*" $msg "\\1" msg
+	return [mips_old_prune_warnings $msg]
+    }
+    run_ld_link_tests [list \
+	[list \
+	    "MIPS link PIC branch relaxation with offset" \
+	    "$abi_ldflags(o32) -shared -T relax-offset.ld" "" \
+	    "$abi_asflags(o32) -relax-branch -mips2" \
+	    {../../../gas/testsuite/gas/mips/relax-offset.s} \
+	    {{objdump \
+	      {-d --prefix-addresses --show-raw-insn} \
+	      relax-offset.dd} \
+	     {readelf -A relax-offset.gd}} \
+	    "relax-offset"] \
+	[list \
+	    "microMIPS link PIC branch relaxation with offset" \
+	    "$abi_ldflags(o32) -shared -T relax-offset.ld" "" \
+	    "$abi_asflags(o32) -relax-branch -mmicromips" \
+	    {../../../gas/testsuite/gas/mips/relax-offset.s} \
+	    {{objdump \
+	      {-d --prefix-addresses --show-raw-insn} \
+	      relax-offset-umips.dd} \
+	     {readelf -A relax-offset-umips.gd}} \
+	    "relax-offset-umips"]]
+    rename prune_warnings ""
+    rename mips_old_prune_warnings prune_warnings
 }
-run_ld_link_tests [list \
-    [list \
-	"MIPS link PIC branch relaxation with offset" \
-	"$abi_ldflags(o32) -shared -T relax-offset.ld" "" \
-	"$abi_asflags(o32) -relax-branch -mips2" \
-	{../../../gas/testsuite/gas/mips/relax-offset.s} \
-	{{objdump \
-	  {-d --prefix-addresses --show-raw-insn} \
-	  relax-offset.dd} \
-	 {readelf -A relax-offset.gd}} \
-	"relax-offset"] \
-    [list \
-	"microMIPS link PIC branch relaxation with offset" \
-	"$abi_ldflags(o32) -shared -T relax-offset.ld" "" \
-	"$abi_asflags(o32) -relax-branch -mmicromips" \
-	{../../../gas/testsuite/gas/mips/relax-offset.s} \
-	{{objdump \
-	  {-d --prefix-addresses --show-raw-insn} \
-	  relax-offset-umips.dd} \
-	 {readelf -A relax-offset-umips.gd}} \
-	"relax-offset-umips"]]
-rename prune_warnings ""
-rename mips_old_prune_warnings prune_warnings
 
 # Verify that we can link ELF input into the `binary' output format.
 run_dump_test "binary"
 
 # Verify special section processing.
-if $has_elf32 {
+if { $has_abi(o32) || $has_abi(n32) } {
     run_dump_test "reginfo-0"
     run_dump_test "reginfo-0r"
     run_dump_test "reginfo-1"
@@ -1359,5 +1436,4 @@ run_dump_test "mips-abiflags-2"
 run_dump_test "mips-abiflags-2r"
 
 # Test that _gp_disp symbol is not present in symbol tables.
-run_dump_test "gp-disp-sym" [list [list as $abi_asflags(o32)] \
-				  [list ld $abi_ldflags(o32)]]
+run_dump_test_o32 "gp-disp-sym"
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-2.d b/ld/testsuite/ld-mips-elf/mips16-branch-2.d
index 95287334a2..401d5418bd 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-2.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-2.d
@@ -1,8 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch 2
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-reloc-2.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1c000000 -e bar
+#ld: -Ttext 0x1c000000 -e bar
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-3.d b/ld/testsuite/ld-mips-elf/mips16-branch-3.d
index 88918c1a93..8c00114745 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-3.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-3.d
@@ -2,8 +2,7 @@
 #name: MIPS16 link branch 3
 #source: mips16-branch.s
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-reloc-3.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1c000000 -e bar
+#ld: -Ttext 0x1c000000 -e bar
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-1.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-1.d
index 9e0aa5f44e..3548bc2119 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-1.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-1.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression 1
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute-1.s
-#as: -EB -32
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 #dump: mips16-branch-absolute.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-2.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-2.d
index 5e7e6f9905..ff61a60c26 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-2.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-2.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression 2
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute-2.s
-#as: -EB -32
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 #dump: mips16-branch-absolute.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-1.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-1.d
index 40f6ccbb96..83443bae1d 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-1.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-1.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression with addend 1
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute-addend-1.s
-#as: -EB -32
-#ld: -EB -Ttext 0x12340000 -e foo
+#ld: -Ttext 0x12340000 -e foo
 #dump: mips16-branch-absolute-addend.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n32-1.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n32-1.d
index 8e833d8d0d..1b49953c58 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n32-1.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n32-1.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression with addend 1 (n32)
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute-addend-1.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x12340000 -e foo
+#ld: -Ttext 0x12340000 -e foo
 #dump: mips16-branch-absolute-addend.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n32.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n32.d
index 69c37c15a3..913fbc1951 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n32.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n32.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression with addend (n32)
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute-addend.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x12340000 -e foo
+#ld: -Ttext 0x12340000 -e foo
 #dump: mips16-branch-absolute-addend.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n64-1.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n64-1.d
index 094b2d0515..cdf11b61d3 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n64-1.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n64-1.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression with addend 1 (n64)
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute-addend-1.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0x12340000 -e foo
+#ld: -Ttext 0x12340000 -e foo
 #dump: mips16-branch-absolute-addend.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n64.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n64.d
index d6047b96ea..b779f0fe46 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n64.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend-n64.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression with addend (n64)
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute-addend.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0x12340000 -e foo
+#ld: -Ttext 0x12340000 -e foo
 #dump: mips16-branch-absolute-addend.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend.d
index 2427b9a9ac..867359ff66 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-addend.d
@@ -1,8 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression with addend
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute-addend.s
-#as: -EB -32
-#ld: -EB -Ttext 0x12340000 -e foo
+#ld: -Ttext 0x12340000 -e foo
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n32-1.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n32-1.d
index 587e79a03a..d709c6932f 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n32-1.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n32-1.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression 1 (n32)
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute-1.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 #dump: mips16-branch-absolute.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n32-2.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n32-2.d
index 86c98c3c2d..711f65b3a3 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n32-2.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n32-2.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression 2 (n32)
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute-2.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 #dump: mips16-branch-absolute.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n32.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n32.d
index 7bff198768..bdb770f931 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n32.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n32.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression (n32)
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 #dump: mips16-branch-absolute.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n64-1.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n64-1.d
index dc067f82cb..3accde060f 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n64-1.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n64-1.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression 1 (n64)
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute-1.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 #dump: mips16-branch-absolute.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n64-2.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n64-2.d
index 1a6ba3d32a..e00a536d3d 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n64-2.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n64-2.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression 2 (n64)
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute-2.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 #dump: mips16-branch-absolute.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n64.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n64.d
index 6edb58d04c..c4b7236767 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n64.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute-n64.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression (n64)
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute.s
-#as: -EB -64 -march=from-abi
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 #dump: mips16-branch-absolute.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-absolute.d b/ld/testsuite/ld-mips-elf/mips16-branch-absolute.d
index eac08fab42..2373a77bdd 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-absolute.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-absolute.d
@@ -1,8 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch to absolute expression
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-absolute.s
-#as: -EB -32
-#ld: -EB -Ttext 0 -e foo
+#ld: -Ttext 0 -e foo
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-addend-2.d b/ld/testsuite/ld-mips-elf/mips16-branch-addend-2.d
index c724bddbe2..d6e913d188 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-addend-2.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-addend-2.d
@@ -1,8 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link branch addend 2
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-addend-2.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1c000000 -e bar
+#ld: -Ttext 0x1c000000 -e bar
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16-branch-addend-3.d b/ld/testsuite/ld-mips-elf/mips16-branch-addend-3.d
index 84bccc7817..b66ddef8dc 100644
--- a/ld/testsuite/ld-mips-elf/mips16-branch-addend-3.d
+++ b/ld/testsuite/ld-mips-elf/mips16-branch-addend-3.d
@@ -2,8 +2,7 @@
 #name: MIPS16 link branch addend 3
 #source: mips16-branch.s
 #source: ../../../gas/testsuite/gas/mips/mips16-branch-addend-3.s
-#as: -EB -32
-#ld: -EB -Ttext 0x1c000000 -e bar
+#ld: -Ttext 0x1c000000 -e bar
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16-hilo-n32.d b/ld/testsuite/ld-mips-elf/mips16-hilo-n32.d
index 28c2b61d89..8d70b35618 100644
--- a/ld/testsuite/ld-mips-elf/mips16-hilo-n32.d
+++ b/ld/testsuite/ld-mips-elf/mips16-hilo-n32.d
@@ -1,9 +1,8 @@
 #name: R_MIPS16_HI16 and R_MIPS16_LO16 relocs n32
 #source: ../../../gas/testsuite/gas/mips/mips16-hilo.s
 #source: mips16-hilo.s
-#as: -march=mips64 -mabi=n32 -EB
 #objdump: -mmips:16 --prefix-addresses -tdr --show-raw-insn
-#ld: -Tmips16-hilo.ld -e 0x500000 -N -melf32btsmipn32
+#ld: -Tmips16-hilo.ld -e 0x500000 -N
 
 .*:     file format elf.*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16-pcrel-0.d b/ld/testsuite/ld-mips-elf/mips16-pcrel-0.d
index b1bfab6183..99f64e43bf 100644
--- a/ld/testsuite/ld-mips-elf/mips16-pcrel-0.d
+++ b/ld/testsuite/ld-mips-elf/mips16-pcrel-0.d
@@ -1,8 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link PC-relative operations 0
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-0.s
-#as: -EB -32
-#ld: -EB -Ttext 0 -e 0
+#ld: -Ttext 0 -e 0
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16-pcrel-1.d b/ld/testsuite/ld-mips-elf/mips16-pcrel-1.d
index 0fe3a2b1d8..d10f535d08 100644
--- a/ld/testsuite/ld-mips-elf/mips16-pcrel-1.d
+++ b/ld/testsuite/ld-mips-elf/mips16-pcrel-1.d
@@ -1,8 +1,8 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link PC-relative operations 1
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-1.s
-#as: -EB -32 -mips3
-#ld: -EB -Ttext 0 -e 0
+#as: -mips3
+#ld: -Ttext 0 -e 0
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16-pcrel-addend-2.d b/ld/testsuite/ld-mips-elf/mips16-pcrel-addend-2.d
index d04d035be0..c5e26f1c53 100644
--- a/ld/testsuite/ld-mips-elf/mips16-pcrel-addend-2.d
+++ b/ld/testsuite/ld-mips-elf/mips16-pcrel-addend-2.d
@@ -1,8 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link PC-relative relocation with addend 2
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-addend-2.s
-#as: -EB -32
-#ld: -EB -Ttext 0x43210000 -e 0
+#ld: -Ttext 0x43210000 -e 0
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16-pcrel-addend-6.d b/ld/testsuite/ld-mips-elf/mips16-pcrel-addend-6.d
index 134f107ab6..e87fe1c09f 100644
--- a/ld/testsuite/ld-mips-elf/mips16-pcrel-addend-6.d
+++ b/ld/testsuite/ld-mips-elf/mips16-pcrel-addend-6.d
@@ -1,8 +1,8 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link PC-relative relocation with addend 6
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-addend-6.s
-#as: -EB -32 -mips3
-#ld: -EB -Ttext 0x43210000 -e 0
+#as: -mips3
+#ld: -Ttext 0x43210000 -e 0
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16-pcrel-n32-0.d b/ld/testsuite/ld-mips-elf/mips16-pcrel-n32-0.d
index 70102a1645..d75fb98dbc 100644
--- a/ld/testsuite/ld-mips-elf/mips16-pcrel-n32-0.d
+++ b/ld/testsuite/ld-mips-elf/mips16-pcrel-n32-0.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link PC-relative operations 0 (n32)
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-0.s
-#as: -EB -n32 -mips3
-#ld: -EB -Ttext 0 -e 0
+#ld: -Ttext 0 -e 0
 #dump: mips16-pcrel-0.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-pcrel-n32-1.d b/ld/testsuite/ld-mips-elf/mips16-pcrel-n32-1.d
index f456fda711..5bbc4d156f 100644
--- a/ld/testsuite/ld-mips-elf/mips16-pcrel-n32-1.d
+++ b/ld/testsuite/ld-mips-elf/mips16-pcrel-n32-1.d
@@ -1,6 +1,5 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link PC-relative operations 1 (n32)
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-1.s
-#as: -EB -n32 -mips3
-#ld: -EB -Ttext 0 -e 0
+#ld: -Ttext 0 -e 0
 #dump: mips16-pcrel-1.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-pcrel-n64-sym32-0.d b/ld/testsuite/ld-mips-elf/mips16-pcrel-n64-sym32-0.d
index aad68773af..1ee0550b7d 100644
--- a/ld/testsuite/ld-mips-elf/mips16-pcrel-n64-sym32-0.d
+++ b/ld/testsuite/ld-mips-elf/mips16-pcrel-n64-sym32-0.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link PC-relative operations 0 (n64, sym32)
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-0.s
-#as: -EB -64 -msym32 -mips3
-#ld: -EB -Ttext 0 -e 0
+#as: -msym32
+#ld: -Ttext 0 -e 0
 #dump: mips16-pcrel-0.d
diff --git a/ld/testsuite/ld-mips-elf/mips16-pcrel-n64-sym32-1.d b/ld/testsuite/ld-mips-elf/mips16-pcrel-n64-sym32-1.d
index 9a1a5de0d5..6b6eb1009a 100644
--- a/ld/testsuite/ld-mips-elf/mips16-pcrel-n64-sym32-1.d
+++ b/ld/testsuite/ld-mips-elf/mips16-pcrel-n64-sym32-1.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16 link PC-relative operations 1 (n64, sym32)
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-1.s
-#as: -EB -64 -msym32 -mips3
-#ld: -EB -Ttext 0 -e 0
+#as: -msym32
+#ld: -Ttext 0 -e 0
 #dump: mips16-pcrel-1.d
diff --git a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-0.d b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-0.d
index a6add470ce..c962647651 100644
--- a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-0.d
+++ b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-0.d
@@ -1,8 +1,8 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16e2 link PC-relative operations 0
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-0.s
-#as: -EB -32 -mips32r2 -mmips16e2
-#ld: -EB -Ttext 0 -e 0
+#as: -mips32r2 -mmips16e2
+#ld: -Ttext 0 -e 0
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-1.d b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-1.d
index 487ce16bcb..acdf46c552 100644
--- a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-1.d
+++ b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-1.d
@@ -1,8 +1,8 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16e2 link PC-relative operations 1
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-1.s
-#as: -EB -32 -mips64r2 -mmips16e2
-#ld: -EB -Ttext 0 -e 0
+#as: -mips64r2 -mmips16e2
+#ld: -Ttext 0 -e 0
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-addend-2.d b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-addend-2.d
index 1b0cb37e5d..f6180f666e 100644
--- a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-addend-2.d
+++ b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-addend-2.d
@@ -1,8 +1,8 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16e2 link PC-relative relocation with addend 2
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-addend-2.s
-#as: -EB -32 -mips32r2 -mmips16e2
-#ld: -EB -Ttext 0x43210000 -e 0
+#as: -mips32r2 -mmips16e2
+#ld: -Ttext 0x43210000 -e 0
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-addend-6.d b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-addend-6.d
index b680a5f17f..a006c7f064 100644
--- a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-addend-6.d
+++ b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-addend-6.d
@@ -1,8 +1,8 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16e2 link PC-relative relocation with addend 6
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-addend-6.s
-#as: -EB -32 -mips64r2 -mmips16e2
-#ld: -EB -Ttext 0x43210000 -e 0
+#as: -mips64r2 -mmips16e2
+#ld: -Ttext 0x43210000 -e 0
 
 .*: +file format .*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n32-0.d b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n32-0.d
index d7d5e9dfc4..a173181b46 100644
--- a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n32-0.d
+++ b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n32-0.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16e2 link PC-relative operations 0 (n32)
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-0.s
-#as: -EB -n32 -mips64r2 -mmips16e2
-#ld: -EB -Ttext 0 -e 0
+#as: -mips64r2 -mmips16e2
+#ld: -Ttext 0 -e 0
 #dump: mips16e2-pcrel-0.d
diff --git a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n32-1.d b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n32-1.d
index 92bd3baa8a..01c6440c28 100644
--- a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n32-1.d
+++ b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n32-1.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16e2 link PC-relative operations 1 (n32)
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-1.s
-#as: -EB -n32 -mips64r2 -mmips16e2
-#ld: -EB -Ttext 0 -e 0
+#as: -mips64r2 -mmips16e2
+#ld: -Ttext 0 -e 0
 #dump: mips16e2-pcrel-1.d
diff --git a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n64-sym32-0.d b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n64-sym32-0.d
index 5ad2001621..3532f4ad66 100644
--- a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n64-sym32-0.d
+++ b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n64-sym32-0.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16e2 link PC-relative operations 0 (n64, sym32)
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-0.s
-#as: -EB -64 -msym32 -mips64r2 -mmips16e2
-#ld: -EB -Ttext 0 -e 0
+#as: -msym32 -mips64r2 -mmips16e2
+#ld: -Ttext 0 -e 0
 #dump: mips16e2-pcrel-0.d
diff --git a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n64-sym32-1.d b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n64-sym32-1.d
index ea33b8efb1..82a5f4e98c 100644
--- a/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n64-sym32-1.d
+++ b/ld/testsuite/ld-mips-elf/mips16e2-pcrel-n64-sym32-1.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS16e2 link PC-relative operations 1 (n64, sym32)
 #source: ../../../gas/testsuite/gas/mips/mips16-pcrel-1.s
-#as: -EB -64 -msym32 -mips64r2 -mmips16e2
-#ld: -EB -Ttext 0 -e 0
+#as: -msym32 -mips64r2 -mmips16e2
+#ld: -Ttext 0 -e 0
 #dump: mips16e2-pcrel-1.d
diff --git a/ld/testsuite/ld-mips-elf/multi-got-1.d b/ld/testsuite/ld-mips-elf/multi-got-1.d
index 810a263a8c..1b0f304f79 100644
--- a/ld/testsuite/ld-mips-elf/multi-got-1.d
+++ b/ld/testsuite/ld-mips-elf/multi-got-1.d
@@ -1,8 +1,8 @@
 #name: MIPS multi-got-1
-#as: -EB -32 -KPIC
+#as: -KPIC
 #source: multi-got-1-1.s
 #source: multi-got-1-2.s
-#ld: -melf32btsmip -shared
+#ld: -shared
 #readelf: -d -r
 
 Dynamic section at offset .* contains 17 entries:
diff --git a/ld/testsuite/ld-mips-elf/multi-got-hidden-1.d b/ld/testsuite/ld-mips-elf/multi-got-hidden-1.d
index 46bf51982b..ed35ac9802 100644
--- a/ld/testsuite/ld-mips-elf/multi-got-hidden-1.d
+++ b/ld/testsuite/ld-mips-elf/multi-got-hidden-1.d
@@ -1,8 +1,8 @@
 #name: MIPS multi-got-hidden-1
-#as: -EB -32 -KPIC
+#as: -KPIC
 #source: multi-got-1-1.s
 #source: multi-got-1-2.s
 #source: multi-got-hidden-1.s
-#ld: -melf32btsmip -e 0
+#ld: -e 0
 #objdump: -dr
 #pass
diff --git a/ld/testsuite/ld-mips-elf/multi-got-hidden-2.d b/ld/testsuite/ld-mips-elf/multi-got-hidden-2.d
index e6173a0acb..5a64e5d810 100644
--- a/ld/testsuite/ld-mips-elf/multi-got-hidden-2.d
+++ b/ld/testsuite/ld-mips-elf/multi-got-hidden-2.d
@@ -1,7 +1,7 @@
 #name: MIPS multi-got-hidden-2
-#as: -EB -32 -KPIC
+#as: -KPIC
 #source: multi-got-1-1.s
 #source: multi-got-hidden-2.s
-#ld: -melf32btsmip -e 0
+#ld: -e 0
 #objdump: -dr
 #pass
diff --git a/ld/testsuite/ld-mips-elf/multi-got-no-shared.d b/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
index a3e1bb2743..88a4f6e7f3 100644
--- a/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
+++ b/ld/testsuite/ld-mips-elf/multi-got-no-shared.d
@@ -1,8 +1,8 @@
 #name: MIPS multi-got-no-shared
-#as: -EB -32 -KPIC -mno-shared
+#as: -KPIC -mno-shared
 #source: multi-got-no-shared-1.s
 #source: multi-got-no-shared-2.s
-#ld: -melf32btsmip --entry func1
+#ld: --entry func1
 #objdump: -D -j .text --prefix-addresses --show-raw-insn
 
 .*: +file format.*
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 6a55008868..5574360c7e 100644
--- a/ld/testsuite/ld-mips-elf/no-shared-1-n32.d
+++ b/ld/testsuite/ld-mips-elf/no-shared-1-n32.d
@@ -1,6 +1,5 @@
-#as: -march=from-abi -mabi=n32 -EB
 #source: no-shared-1-o32.s
-#ld: -melf32btsmipn32 -T no-shared-1.ld
+#ld: -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 5813b30e36..b5cd86e728 100644
--- a/ld/testsuite/ld-mips-elf/no-shared-1-n64.d
+++ b/ld/testsuite/ld-mips-elf/no-shared-1-n64.d
@@ -1,5 +1,4 @@
-#as: -march=from-abi -mabi=64 -EB
-#ld: -melf64btsmip -T no-shared-1.ld
+#ld: -T no-shared-1.ld
 #objdump: -dr -j.text -j.data -j.got
 
 .*
diff --git a/ld/testsuite/ld-mips-elf/no-shared-1-o32.d b/ld/testsuite/ld-mips-elf/no-shared-1-o32.d
index 53bac9ef6c..fcb5f5db58 100644
--- a/ld/testsuite/ld-mips-elf/no-shared-1-o32.d
+++ b/ld/testsuite/ld-mips-elf/no-shared-1-o32.d
@@ -1,5 +1,4 @@
-#as: -mabi=32 -EB
-#ld: -melf32btsmip -T no-shared-1.ld
+#ld: -T no-shared-1.ld
 #objdump: -dr -j.text -j.data -j.got
 
 .*
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-2.d b/ld/testsuite/ld-mips-elf/pic-and-nonpic-2.d
index da28cc30bd..3baf22851a 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-2.d
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-2.d
@@ -1,7 +1,6 @@
 #source: pic-and-nonpic-2a.s
 #source: pic-and-nonpic-2b.s
-#as: -32 -EB
-#ld: -melf32btsmip -Tpic-and-nonpic-1.ld
+#ld: -Tpic-and-nonpic-1.ld
 #objdump: -dr
 
 .*
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3-error.d b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3-error.d
index 975ffa7871..1bdafb750c 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3-error.d
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3-error.d
@@ -1,5 +1,5 @@
 #name: PIC and non-PIC test 3 (error)
 #source: pic-and-nonpic-3b.s
-#as: -EB -32 -mips2
-#ld: tmpdir/pic-and-nonpic-3a.so -melf32btsmip -znocopyreloc
+#as: -mips2
+#ld: tmpdir/pic-and-nonpic-3a.so -znocopyreloc
 #error: .*: non-dynamic relocations refer to dynamic symbol foo
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-4-error.d b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4-error.d
index 7bc0c259af..dee62d3980 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-4-error.d
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4-error.d
@@ -1,5 +1,5 @@
 #name: PIC and non-PIC test 4 (error)
 #source: pic-and-nonpic-4b.s
-#as: -EB -32 -mips2
-#ld: tmpdir/pic-and-nonpic-4a.so -melf32btsmip -znocopyreloc
+#as: -mips2
+#ld: tmpdir/pic-and-nonpic-4a.so -znocopyreloc
 #error: .*: non-dynamic relocations refer to dynamic symbol obj1
diff --git a/ld/testsuite/ld-mips-elf/pie-n32.d b/ld/testsuite/ld-mips-elf/pie-n32.d
index cd7d905239..c677239200 100644
--- a/ld/testsuite/ld-mips-elf/pie-n32.d
+++ b/ld/testsuite/ld-mips-elf/pie-n32.d
@@ -1,6 +1,5 @@
 #source: pie.s
-#as: -march=from-abi -mabi=n32 -EB
-#ld: -melf32btsmipn32 -pie
+#ld: -pie
 #readelf: -d
 
 Dynamic section at offset 0x180 contains 17 entries:
diff --git a/ld/testsuite/ld-mips-elf/pie-n64.d b/ld/testsuite/ld-mips-elf/pie-n64.d
index 3a5f8c9b30..bf7c6b2272 100644
--- a/ld/testsuite/ld-mips-elf/pie-n64.d
+++ b/ld/testsuite/ld-mips-elf/pie-n64.d
@@ -1,6 +1,5 @@
 #source: pie.s
-#as: -march=from-abi -mabi=64 -EB
-#ld: -melf64btsmip -pie
+#ld: -pie
 #readelf: -d
 
 Dynamic section at offset 0x208 contains 17 entries:
diff --git a/ld/testsuite/ld-mips-elf/pie-o32.d b/ld/testsuite/ld-mips-elf/pie-o32.d
index dc3165942a..6d5b072673 100644
--- a/ld/testsuite/ld-mips-elf/pie-o32.d
+++ b/ld/testsuite/ld-mips-elf/pie-o32.d
@@ -1,6 +1,5 @@
 #source: pie.s
-#as: -mabi=32 -EB
-#ld: -melf32btsmip -pie
+#ld: -pie
 #readelf: -d
 
 Dynamic section at offset 0x178 contains 17 entries:
diff --git a/ld/testsuite/ld-mips-elf/rel32-n32.d b/ld/testsuite/ld-mips-elf/rel32-n32.d
index d7bdbf09bb..2f14a76775 100644
--- a/ld/testsuite/ld-mips-elf/rel32-n32.d
+++ b/ld/testsuite/ld-mips-elf/rel32-n32.d
@@ -1,8 +1,8 @@
 #name: MIPS rel32 n32
 #source: rel32.s
-#as: -march=from-abi -KPIC -EB -n32
+#as: -KPIC
 #readelf: -x .text -r
-#ld: -shared -melf32btsmipn32
+#ld: -shared
 
 Relocation section '.rel.dyn' at offset .* contains 2 entries:
  Offset     Info    Type            Sym.Value  Sym. Name
diff --git a/ld/testsuite/ld-mips-elf/rel32-o32.d b/ld/testsuite/ld-mips-elf/rel32-o32.d
index fb987886d3..c3ae8c6e2a 100644
--- a/ld/testsuite/ld-mips-elf/rel32-o32.d
+++ b/ld/testsuite/ld-mips-elf/rel32-o32.d
@@ -1,8 +1,8 @@
 #name: MIPS rel32 o32
 #source: rel32.s
-#as: -KPIC -EB -32
+#as: -KPIC
 #readelf: -x .text -r
-#ld: -shared -melf32btsmip
+#ld: -shared
 
 Relocation section '.rel.dyn' at offset .* contains 2 entries:
  Offset     Info    Type            Sym.Value  Sym. Name
diff --git a/ld/testsuite/ld-mips-elf/rel64.d b/ld/testsuite/ld-mips-elf/rel64.d
index be819e17d8..07e5d6577c 100644
--- a/ld/testsuite/ld-mips-elf/rel64.d
+++ b/ld/testsuite/ld-mips-elf/rel64.d
@@ -1,8 +1,8 @@
 #name: MIPS rel64 n64
 #source: rel64.s
-#as: -march=from-abi -KPIC -EB -64
+#as: -KPIC
 #readelf: -x .text -r
-#ld: -shared -melf64btsmip
+#ld: -shared
 
 Relocation section '.rel.dyn' at offset .* contains 2 entries:
   Offset          Info           Type           Sym. Value    Sym. Name
diff --git a/ld/testsuite/ld-mips-elf/relax-jalr-n32.d b/ld/testsuite/ld-mips-elf/relax-jalr-n32.d
index b0ea9c0cf3..9a30136b4c 100644
--- a/ld/testsuite/ld-mips-elf/relax-jalr-n32.d
+++ b/ld/testsuite/ld-mips-elf/relax-jalr-n32.d
@@ -1,8 +1,8 @@
 #name: MIPS relax-jalr n32
 #source: relax-jalr.s
-#as: -march=from-abi -KPIC -n32 -EB
+#as: -KPIC
 #objdump: --prefix-addresses -d --show-raw-insn
-#ld: -melf32btsmipn32
+#ld:
 
 .*:     file format elf.*mips.*
 
diff --git a/ld/testsuite/ld-mips-elf/reloc-1-n32.d b/ld/testsuite/ld-mips-elf/reloc-1-n32.d
index e9f38e5576..2d3f0c7a34 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 -march=from-abi -mabi=n32 -EB
-#source: reloc-1b.s -march=from-abi -mabi=n32 -EB
+#source: reloc-1a.s
+#source: reloc-1b.s
 #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 b76f818822..7a1c4304a0 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 -march=from-abi -mabi=64 -EB
-#source: reloc-1b.s -march=from-abi -mabi=64 -EB
+#source: reloc-1a.s
+#source: reloc-1b.s
 #ld: -r
 #readelf: --relocs
 
diff --git a/ld/testsuite/ld-mips-elf/reloc-2.d b/ld/testsuite/ld-mips-elf/reloc-2.d
index 740211ea26..797ec94ef9 100644
--- a/ld/testsuite/ld-mips-elf/reloc-2.d
+++ b/ld/testsuite/ld-mips-elf/reloc-2.d
@@ -1,7 +1,7 @@
-#source: reloc-2a.s -EB -mabi=32
-#source: reloc-2b.s -EB -mabi=32
+#source: reloc-2a.s
+#source: reloc-2b.s
 #ld: --oformat=srec -Treloc-2.ld
-#objdump: -D -mmips:4000 --endian=big
+#objdump: -D -mmips:4000
 
 .*:     file format .*
 
diff --git a/ld/testsuite/ld-mips-elf/reloc-3-n32.d b/ld/testsuite/ld-mips-elf/reloc-3-n32.d
index e90180bbd5..e2b886f309 100644
--- a/ld/testsuite/ld-mips-elf/reloc-3-n32.d
+++ b/ld/testsuite/ld-mips-elf/reloc-3-n32.d
@@ -1,8 +1,8 @@
 #name: R_MIPS16_GPREL reloc n32
 #source: ../../../gas/testsuite/gas/mips/elf-rel6.s
-#as: -march=mips64 -mabi=n32 -EB
+#as: -march=mips64
 #objdump: --prefix-addresses -tdr --show-raw-insn
-#ld: -Ttext 0x20000000 -e 0x20000000 -N -melf32btsmipn32
+#ld: -Ttext 0x20000000 -e 0x20000000 -N
 
 
 .*:     file format elf.*mips.*
diff --git a/ld/testsuite/ld-mips-elf/reloc-local-overflow.d b/ld/testsuite/ld-mips-elf/reloc-local-overflow.d
index b5512eef15..98c5ddbd7b 100644
--- a/ld/testsuite/ld-mips-elf/reloc-local-overflow.d
+++ b/ld/testsuite/ld-mips-elf/reloc-local-overflow.d
@@ -1,7 +1,6 @@
 #name: MIPS reloc against local symbol overflow
 #source: reloc-local-overflow.s
-#as: -EB -32
-#ld: -EB -Tdata 0x10000 -e 0
+#ld: -Tdata 0x10000 -e 0
 #error: \A[^\n]*:\(\.data\+0x1000\): relocation truncated to fit: R_MIPS_16 against `\.data'\Z
 
 # Verify that the section name (`.data') is printed rather than `no symbol'.
diff --git a/ld/testsuite/ld-mips-elf/textrel-1.d b/ld/testsuite/ld-mips-elf/textrel-1.d
index 801c5861e3..94f71101f8 100644
--- a/ld/testsuite/ld-mips-elf/textrel-1.d
+++ b/ld/testsuite/ld-mips-elf/textrel-1.d
@@ -1,7 +1,6 @@
 #name: MIPS textrel-1
 #source: textrel-1.s
-#as: -march=from-abi -EB -n32
-#ld: -shared -melf32btsmipn32
+#ld: -shared
 #readelf: -d
 
 Dynamic section at offset .* contains 17 entries:
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-2.d b/ld/testsuite/ld-mips-elf/unaligned-branch-2.d
index 8ee279edd9..401c31538e 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-2.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-2.d
@@ -1,6 +1,5 @@
 #name: MIPS link branch to unaligned symbol 2
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-2.s
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x101c\): branch to a non-instruction-aligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-2.d b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-2.d
index 89a5e17d75..3b05497310 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-2.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-2.d
@@ -1,6 +1,5 @@
 #name: MIPS link branch to unaligned symbol 2 (ignore branch ISA)
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 --ignore-branch-isa
+#ld: -Ttext 0x1c000000 -e 0x1c000000 --ignore-branch-isa
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-2.s
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x101c\): branch to a non-instruction-aligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-micromips.d b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-micromips.d
index 7d9feb8a77..573fcb8937 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-micromips.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-micromips.d
@@ -1,6 +1,5 @@
 #name: microMIPS link branch to unaligned symbol (ignore branch ISA)
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 --ignore-branch-isa
+#ld: -Ttext 0x1c000000 -e 0x1c000000 --ignore-branch-isa
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-micromips-2.s
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x100a\): cannot convert a branch to JALX for a non-word-aligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-mips16.d b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-mips16.d
index 657f47592b..50e56b4208 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-mips16.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-mips16.d
@@ -1,6 +1,5 @@
 #name: MIPS16 link branch to unaligned symbol (ignore branch ISA)
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 --ignore-branch-isa
+#ld: -Ttext 0x1c000000 -e 0x1c000000 --ignore-branch-isa
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-mips16-2.s
 #error:   [^\n]*: in function `foo':\n
 #error:   \(\.text\+0x1008\): cannot convert a branch to JALX for a non-word-aligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-r6-1.d b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-r6-1.d
index cef0302eb2..9ce02b486f 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-r6-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-ignore-r6-1.d
@@ -1,6 +1,5 @@
 #name: MIPSr6 link branch to unaligned symbol 1 (ignore branch ISA)
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000 --ignore-branch-isa
+#ld: -Ttext 0x1c000000 -e 0x1c000000 --ignore-branch-isa
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-r6-3.s
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x101c\): branch to a non-instruction-aligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-micromips.d b/ld/testsuite/ld-mips-elf/unaligned-branch-micromips.d
index fbedebcf08..ac035ce346 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-micromips.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-micromips.d
@@ -1,6 +1,5 @@
 #name: microMIPS link branch to unaligned symbol
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-micromips-2.s
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x100a\): cannot convert a branch to JALX for a non-word-aligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-mips16.d b/ld/testsuite/ld-mips-elf/unaligned-branch-mips16.d
index c10f49ad55..7ff1ed364e 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-mips16.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-mips16.d
@@ -1,6 +1,5 @@
 #name: MIPS16 link branch to unaligned symbol
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-mips16-2.s
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x1002\): unsupported branch between ISA modes\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-r6-1.d b/ld/testsuite/ld-mips-elf/unaligned-branch-r6-1.d
index d3c92310e2..5f38f2e618 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-r6-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-r6-1.d
@@ -1,6 +1,5 @@
 #name: MIPSr6 link branch to unaligned symbol 1
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-r6-3.s
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x101c\): branch to a non-instruction-aligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch-r6-2.d b/ld/testsuite/ld-mips-elf/unaligned-branch-r6-2.d
index c2a7a7959c..33fb8b28f5 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch-r6-2.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch-r6-2.d
@@ -1,6 +1,6 @@
 #name: MIPSr6 link branch to unaligned symbol 2
-#as: -EB -n32 -mips64r6
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#as: -mips64r6
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-branch-r6-4.s
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x101c\): branch to a non-instruction-aligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-branch.d b/ld/testsuite/ld-mips-elf/unaligned-branch.d
index 4c7c1370a5..64227a7e94 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-branch.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-branch.d
@@ -1,8 +1,8 @@
 #name: MIPS branch to unaligned symbol
 #source: unaligned-branch.s
 #source: unaligned-text.s
-#as: -EB -32 -mips32r6
-#ld: -EB -Ttext 0x10000000 -e 0x10000000
+#as: -mips32r6
+#ld: -Ttext 0x10000000 -e 0x10000000
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x14\): branch to a non-instruction-aligned address\n
 #error:   \(\.text\+0x1c\): branch to a non-instruction-aligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-0.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-0.d
index 094277b1de..6ddf21fc9e 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-0.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-0.d
@@ -1,8 +1,7 @@
 #name: MIPS JALX to unaligned symbol with addend 0
 #source: unaligned-jalx-addend-0.s
 #source: unaligned-insn.s -mips16
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*mips.*
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-1.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-1.d
index f161ac7f79..46640178ab 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-1.d
@@ -1,8 +1,7 @@
 #name: MIPS JALX to unaligned symbol with addend 1
 #source: unaligned-jalx-addend-1.s
 #source: unaligned-insn.s -mips16
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
 #error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-2.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-2.d
index f09ce28efa..81b2dd9e4b 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-2.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-2.d
@@ -1,7 +1,6 @@
 #name: MIPS JALX to unaligned symbol with addend 2
 #source: unaligned-jalx-addend-2.s
 #source: unaligned-insn.s -mips16
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #dump: unaligned-jalx-addend-0.d
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-3.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-3.d
index 5aba63077c..2f3a21a4db 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-3.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-3.d
@@ -1,8 +1,7 @@
 #name: MIPS JALX to unaligned symbol with addend 3
 #source: unaligned-jalx-addend-3.s
 #source: unaligned-insn.s -mips16
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x0\): cannot convert a branch to JALX for a non-word-aligned address\n
 #error:   \(\.text\+0x8\): cannot convert a branch to JALX for a non-word-aligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-0.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-0.d
index 5a4eafc301..0ce5bc7767 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-0.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-0.d
@@ -1,8 +1,7 @@
 #name: microMIPS JALX to unaligned symbol with addend 0
 #source: unaligned-jalx-addend-0.s -mmicromips
 #source: unaligned-insn.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*mips.*
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-1.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-1.d
index afca7c19d4..3eb1d25362 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-1.d
@@ -1,8 +1,7 @@
 #name: microMIPS JALX to unaligned symbol with addend 1
 #source: unaligned-jalx-addend-1.s -mmicromips
 #source: unaligned-insn.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-0.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-0.d
index 3e7ac16896..4590f48198 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-0.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-0.d
@@ -1,8 +1,7 @@
 #name: MIPS16 JALX to unaligned symbol with addend 0
 #source: unaligned-jalx-addend-0.s -mips16
 #source: unaligned-insn.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*mips.*
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-1.d b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-1.d
index e896268226..5a7bc7cb8e 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-1.d
@@ -1,8 +1,7 @@
 #name: MIPS16 JALX to unaligned symbol with addend 1
 #source: unaligned-jalx-addend-1.s -mips16
 #source: unaligned-insn.s
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x[0-9a-f]+\): cannot convert a jump to JALX for a non-word-aligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jump-micromips.d b/ld/testsuite/ld-mips-elf/unaligned-jump-micromips.d
index d07c6b919b..52ba841de2 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jump-micromips.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jump-micromips.d
@@ -1,6 +1,5 @@
 #name: microMIPS link jump to unaligned symbol
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-jump-micromips-2.s
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x1012\): unsupported jump between ISA modes; consider recompiling with interlinking enabled\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jump-mips16.d b/ld/testsuite/ld-mips-elf/unaligned-jump-mips16.d
index bd09a13e79..ba1c1b9070 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jump-mips16.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jump-mips16.d
@@ -1,6 +1,5 @@
 #name: MIPS16 link jump to unaligned symbol
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-jump-mips16-2.s
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x100e\): cannot convert a jump to JALX for a non-word-aligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-jump.d b/ld/testsuite/ld-mips-elf/unaligned-jump.d
index 53de3d0c1c..5a58b5a946 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-jump.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-jump.d
@@ -1,6 +1,5 @@
 #name: MIPS link jump to unaligned symbol
-#as: -EB -n32 -march=from-abi
-#ld: -EB -Ttext 0x1c000000 -e 0x1c000000
+#ld: -Ttext 0x1c000000 -e 0x1c000000
 #source: ../../../gas/testsuite/gas/mips/unaligned-jump-2.s
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x1004\): unsupported JALX to the same ISA mode\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-ldpc-0.d b/ld/testsuite/ld-mips-elf/unaligned-ldpc-0.d
index b5e909a022..ab0f557e90 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-ldpc-0.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-ldpc-0.d
@@ -1,8 +1,8 @@
 #name: MIPS LDPC from unaligned symbol 0
 #source: unaligned-ldpc-0.s
 #source: unaligned-data.s
-#as: -EB -32 -mips64r6
-#ld: -EB -Ttext 0x1c000000 -Tdata 0x1c080000 -e 0x1c000000
+#as: -mips64r6
+#ld: -Ttext 0x1c000000 -Tdata 0x1c080000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*mips.*
diff --git a/ld/testsuite/ld-mips-elf/unaligned-ldpc-1.d b/ld/testsuite/ld-mips-elf/unaligned-ldpc-1.d
index 9f8aeeb98f..52be9b1bb3 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-ldpc-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-ldpc-1.d
@@ -1,8 +1,8 @@
 #name: MIPS LDPC from unaligned symbol 1
 #source: unaligned-ldpc-1.s
 #source: unaligned-data.s
-#as: -EB -32 -mips64r6
-#ld: -EB -Ttext 0x1c000000 -Tdata 0x1c080000 -e 0x1c000000
+#as: -mips64r6
+#ld: -Ttext 0x1c000000 -Tdata 0x1c080000 -e 0x1c000000
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x[0-9a-f]+\): PC-relative load from unaligned address\n
 #error:   \(\.text\+0x[0-9a-f]+\): PC-relative load from unaligned address\n
diff --git a/ld/testsuite/ld-mips-elf/unaligned-lwpc-0.d b/ld/testsuite/ld-mips-elf/unaligned-lwpc-0.d
index e7db494820..3975a68927 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-lwpc-0.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-lwpc-0.d
@@ -1,8 +1,8 @@
 #name: MIPS LWPC from unaligned symbol 0
 #source: unaligned-lwpc-0.s
 #source: unaligned-data.s
-#as: -EB -32 -mips32r6
-#ld: -EB -Ttext 0x1c000000 -Tdata 0x1c080000 -e 0x1c000000
+#as: -mips32r6
+#ld: -Ttext 0x1c000000 -Tdata 0x1c080000 -e 0x1c000000
 #objdump: -dr --prefix-addresses --show-raw-insn
 
 .*: +file format .*mips.*
diff --git a/ld/testsuite/ld-mips-elf/unaligned-lwpc-1.d b/ld/testsuite/ld-mips-elf/unaligned-lwpc-1.d
index fd543f4022..8b36302542 100644
--- a/ld/testsuite/ld-mips-elf/unaligned-lwpc-1.d
+++ b/ld/testsuite/ld-mips-elf/unaligned-lwpc-1.d
@@ -1,8 +1,8 @@
 #name: MIPS LWPC from unaligned symbol 1
 #source: unaligned-lwpc-1.s
 #source: unaligned-data.s
-#as: -EB -32 -mips32r6
-#ld: -EB -Ttext 0x1c000000 -Tdata 0x1c080000 -e 0x1c000000
+#as: -mips32r6
+#ld: -Ttext 0x1c000000 -Tdata 0x1c080000 -e 0x1c000000
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x[0-9a-f]+\): PC-relative load from unaligned address\n
 #error:   \(\.text\+0x[0-9a-f]+\): PC-relative load from unaligned address\Z
-- 
2.34.1