From: H.J. Lu <hjl.tools@gmail.com>
Date: Sun, 28 Jun 2020 17:50:19 +0000 (-0700)
Subject: Remove NaCl/arm target support
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=014ae6af49829253d39dd383c1f7918d10e88325;p=thirdparty%2Fbinutils-gdb.git

Remove NaCl/arm target support

NaCl has been deprecated:

https://developer.chrome.com/docs/native-client/migration/

It is now in the process of being removed from llvm:

https://github.com/llvm/llvm-project/pull/133661

Remove NaCl/arm target support from bfd, binutils, gas and ld.

bfd/

	* Makefile.am (BFD32_BACKENDS): Remove elf-nacl.lo.
	(BFD32_BACKENDS_CFILES): Remove elf-nacl.c.
	(SOURCE_HFILES): Remove elf-nacl.h.
	* Makefile.in: Regenerated.
	* config.bfd: Add *-*-nacl* to obsolete targets.
	Remove *-*-nacl* targets.
	* configure.ac: Remove nacl target vectors.
	* elf-bfd.h (elf_target_os): Remove is_nacl.
	* elf-nacl.c: Removed.
	* elf-nacl.h: Likewise.
	* elf32-arm.c: Don't include "elf-nacl.h".
	(elf32_arm_nacl_plt0_entry): Removed.
	(elf32_arm_nacl_plt_entry): Likewise.
	(elf32_arm_stub_long_branch_arm_nacl): Likewise.
	(elf32_arm_stub_long_branch_arm_nacl_pic): Likewise.
	(arm_movw_immediate): Likewise.
	(arm_movt_immediate): Likewise.
	(arm_nacl_put_plt0): Likewise.
	(elf32_arm_nacl_link_hash_table_create): Likewise.
	(elf32_arm_nacl_modify_segment_map): Likewise.
	(elf32_arm_nacl_final_write_processing): Likewise.
	(elf32_arm_nacl_plt_sym_val): Likewise.
	(elf32_arm_stub_cmse_branch_thumb_only): Remove
	long_branch_arm_nacl and long_branch_arm_nacl_pic entries.
	(arm_type_of_stub): Updated.
	(elf32_arm_create_or_find_stub_sec): Likewise.
	(arm_stub_required_alignment): Likewise.
	(elf32_arm_allocate_plt_entry): Likewise.
	(elf32_arm_populate_plt_entry): Likewise.
	(elf32_arm_finish_dynamic_sections): Likewise.
	(elf32_arm_output_plt_map_1): Likewise.
	(elf32_arm_output_arch_local_syms): Likewise.
	Remove elf32_arm_nacl_bed.
	* targets.c: Remove NaCl target vectors.
	* bfd-in2.h: Regenerated.
	* configure: Likewise.
	* po/SRC-POTFILES.in: Likewise.

binutils/

	* NEWS: Mention NaCl target support removal.
	* testsuite/lib/binutils-common.exp: Remove NaCl target support.

gas/

	* NEWS: Mention NaCl target support removal.
	* configure.tgt: Likewise.
	* config/tc-arm.c: Remove NaCl target support.
	* testsuite/gas/arm/any-armv8m.d: Likewise.
	* testsuite/gas/arm/any-cmse-main.d: Likewise.
	* testsuite/gas/arm/any-cmse.d: Likewise.
	* testsuite/gas/arm/any-idiv.d: Likewise.
	* testsuite/gas/arm/arch4t-eabi.d: Likewise.
	* testsuite/gas/arm/arch4t.d: Likewise.
	* testsuite/gas/arm/armv8m.base-idiv.d: Likewise.
	* testsuite/gas/arm/armv9-a_arch.d: Likewise.
	* testsuite/gas/arm/attr-abi-hardfp-use-0.d: Likewise.
	* testsuite/gas/arm/attr-abi-hardfp-use-1.d: Likewise.
	* testsuite/gas/arm/attr-abi-hardfp-use-2.d: Likewise.
	* testsuite/gas/arm/attr-abi-hardfp-use-3.d: Likewise.
	* testsuite/gas/arm/attr-any-armv4t.d: Likewise.
	* testsuite/gas/arm/attr-any-thumbv6.d: Likewise.
	* testsuite/gas/arm/attr-arch-assumption.d: Likewise.
	* testsuite/gas/arm/attr-cpu-directive.d: Likewise.
	* testsuite/gas/arm/attr-default.d: Likewise.
	* testsuite/gas/arm/attr-empty-string.d: Likewise.
	* testsuite/gas/arm/attr-ext-fpv5-d16.d: Likewise.
	* testsuite/gas/arm/attr-ext-fpv5.d: Likewise.
	* testsuite/gas/arm/attr-ext-idiv.d: Likewise.
	* testsuite/gas/arm/attr-ext-mp.d: Likewise.
	* testsuite/gas/arm/attr-ext-neon-fp16.d: Likewise.
	* testsuite/gas/arm/attr-ext-neon-vfpv3.d: Likewise.
	* testsuite/gas/arm/attr-ext-neon-vfpv4.d: Likewise.
	* testsuite/gas/arm/attr-ext-sec.d: Likewise.
	* testsuite/gas/arm/attr-ext-vfpv3-d16-fp16.d: Likewise.
	* testsuite/gas/arm/attr-ext-vfpv3-d16.d: Likewise.
	* testsuite/gas/arm/attr-ext-vfpv3-fp16.d: Likewise.
	* testsuite/gas/arm/attr-ext-vfpv3.d: Likewise.
	* testsuite/gas/arm/attr-ext-vfpv3xd-fp.d: Likewise.
	* testsuite/gas/arm/attr-ext-vfpv3xd.d: Likewise.
	* testsuite/gas/arm/attr-ext-vfpv4-d16.d: Likewise.
	* testsuite/gas/arm/attr-ext-vfpv4-sp-d16.d: Likewise.
	* testsuite/gas/arm/attr-ext-vfpv4.d: Likewise.
	* testsuite/gas/arm/attr-march-all.d: Likewise.
	* testsuite/gas/arm/attr-march-armv1.d: Likewise.
	* testsuite/gas/arm/attr-march-armv2.d: Likewise.
	* testsuite/gas/arm/attr-march-armv2a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv2s.d: Likewise.
	* testsuite/gas/arm/attr-march-armv3.d: Likewise.
	* testsuite/gas/arm/attr-march-armv3m.d: Likewise.
	* testsuite/gas/arm/attr-march-armv4.d: Likewise.
	* testsuite/gas/arm/attr-march-armv4t.d: Likewise.
	* testsuite/gas/arm/attr-march-armv4txm.d: Likewise.
	* testsuite/gas/arm/attr-march-armv4xm.d: Likewise.
	* testsuite/gas/arm/attr-march-armv5.d: Likewise.
	* testsuite/gas/arm/attr-march-armv5t.d: Likewise.
	* testsuite/gas/arm/attr-march-armv5te.d: Likewise.
	* testsuite/gas/arm/attr-march-armv5tej.d: Likewise.
	* testsuite/gas/arm/attr-march-armv5texp.d: Likewise.
	* testsuite/gas/arm/attr-march-armv5txm.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6-m+os.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6-m.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6j.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6k+sec.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6k.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6kt2.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6kz.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6kzt2.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6s-m.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6t2.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6z.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6zk.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6zkt2.d: Likewise.
	* testsuite/gas/arm/attr-march-armv6zt2.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7-a+idiv.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7-a+mp.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7-a+sec+virt.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7-a+sec.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7-a+virt.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7-a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7-m.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7-r+mp.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7-r.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7em.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7m.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7r.d: Likewise.
	* testsuite/gas/arm/attr-march-armv7ve.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8-a+crypto.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8-a+fp.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8-a+rdma.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8-a+simd.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8-a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8-r+crypto.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8-r+fp.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8-r+simd.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8-r.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8_1-a+simd.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8_1-m.main.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8_4-a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8_5-a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8_6-a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8_7-a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8_8-a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8_9-a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv9_1-a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv9_2-a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv9_3-a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv9_4-a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv9_5-a.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8m.base.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8m.main.d: Likewise.
	* testsuite/gas/arm/attr-march-armv8m.main.dsp.d: Likewise.
	* testsuite/gas/arm/attr-march-iwmmxt.d: Likewise.
	* testsuite/gas/arm/attr-march-iwmmxt2.d: Likewise.
	* testsuite/gas/arm/attr-march-xscale.d: Likewise.
	* testsuite/gas/arm/attr-mcpu.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-arm1020e.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-arm1020t.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-arm1136jf-s.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-arm1136jfs.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-neon-fp16.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-neon.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-softvfp+vfp.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-softvfp.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-vfp.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-vfp10-r0.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-vfp10.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-vfp3.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-vfp9.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-vfpv2.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-vfpv3-d16.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-vfpv3.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-vfpv4-d16.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-vfpv4.d: Likewise.
	* testsuite/gas/arm/attr-mfpu-vfpxd.d: Likewise.
	* testsuite/gas/arm/attr-names.d: Likewise.
	* testsuite/gas/arm/attr-non-null-terminated-string.d: Likewise.
	* testsuite/gas/arm/attr-order.d: Likewise.
	* testsuite/gas/arm/attr-override-cpu-directive.d: Likewise.
	* testsuite/gas/arm/attr-override-mcpu.d: Likewise.
	* testsuite/gas/arm/bl-local-2.d: Likewise.
	* testsuite/gas/arm/bl-local-v4t.d: Likewise.
	* testsuite/gas/arm/blx-local.d: Likewise.
	* testsuite/gas/arm/branch-reloc.d: Likewise.
	* testsuite/gas/arm/directives.d: Likewise.
	* testsuite/gas/arm/got_prel.d: Likewise.
	* testsuite/gas/arm/mapdir.d: Likewise.
	* testsuite/gas/arm/mapmisc.d: Likewise.
	* testsuite/gas/arm/mapsecs.d: Likewise.
	* testsuite/gas/arm/mapshort-eabi.d: Likewise.
	* testsuite/gas/arm/mov-highregs-any.d: Likewise.
	* testsuite/gas/arm/mov-lowregs-any.d: Likewise.
	* testsuite/gas/arm/note-march-armv2.d: Likewise.
	* testsuite/gas/arm/note-march-armv2a.d: Likewise.
	* testsuite/gas/arm/note-march-armv3.d: Likewise.
	* testsuite/gas/arm/note-march-armv3m.d: Likewise.
	* testsuite/gas/arm/note-march-armv4.d: Likewise.
	* testsuite/gas/arm/note-march-armv4t.d: Likewise.
	* testsuite/gas/arm/note-march-armv5.d: Likewise.
	* testsuite/gas/arm/note-march-armv5t.d: Likewise.
	* testsuite/gas/arm/note-march-armv5te.d: Likewise.
	* testsuite/gas/arm/note-march-iwmmxt.d: Likewise.
	* testsuite/gas/arm/note-march-iwmmxt2.d: Likewise.
	* testsuite/gas/arm/note-march-xscale.d: Likewise.
	* testsuite/gas/arm/pr12198-1.d: Likewise.
	* testsuite/gas/arm/pr12198-2.d: Likewise.
	* testsuite/gas/arm/thumb-eabi.d: Likewise.
	* testsuite/gas/arm/thumb.d: Likewise.
	* testsuite/gas/arm/thumbrel.d: Likewise.
	* config/te-nacl.h: Removed.

ld/

	* Makefile.am (ALL_EMULATION_SOURCES): Remove earmelf_nacl.c and
	and earmelfb_nacl.c.
	Remove NaCl dep files.
	* NEWS: Mention NaCl target support removal.
	* configure.tgt: Remove NaCl target support.
	* Makefile.in: Regenerated.
	* configure: Likewise.
	* po/BLD-POTFILES.in: Likewise.
	* emulparams/armelf_nacl.sh: Removed.
	* emulparams/armelfb_nacl.sh: Likewise.
	* emulparams/elf_nacl.sh: Likewise.
	* testsuite/ld-arm/farcall-arm-nacl-pic.d: Likewise.
	* testsuite/ld-arm/farcall-arm-nacl.d: Likewise.
	* testsuite/ld-arm/farcall-data-nacl.d: Likewise.
	* testsuite/ld-arm/farcall-thumb2-purecode-consecutive-veneer.d:
	Adjusted.
	* testsuite/ld-arm/arm-elf.exp: Remove NaCl target support.
	* testsuite/ld-arm/cortex-a8-far.d: Likewise.
	* testsuite/ld-arm/non-contiguous-arm3.d: Likewise.
	* testsuite/ld-arm/non-contiguous-arm6.d: Likewise.
	* testsuite/ld-elf/binutils.exp: Likewise.
	* testsuite/ld-elf/build-id.exp: Likewise.
	* testsuite/ld-elf/ehdr_start-missing.d: Likewise.
	* testsuite/ld-elf/ehdr_start-shared.d: Likewise.
	* testsuite/ld-elf/ehdr_start-userdef.d: Likewise.
	* testsuite/ld-elf/ehdr_start-weak.d: Likewise.
	* testsuite/ld-elf/ehdr_start.d: Likewise.
	* testsuite/ld-elf/elf.exp: Likewise.
	* testsuite/ld-elf/export-class.exp: Likewise.
	* testsuite/ld-elf/fatal-warnings-1a.d: Likewise.
	* testsuite/ld-elf/fatal-warnings-1b.d: Likewise.
	* testsuite/ld-elf/orphan-region.d: Likewise.
	* testsuite/ld-elf/package-note.exp: Likewise.
	* testsuite/ld-elf/pr16322.d: Likewise.
	* testsuite/ld-elf/pr16498a.d: Likewise.
	* testsuite/ld-elf/pr16498b.d: Likewise.
	* testsuite/ld-elf/pr19162.d: Likewise.
	* testsuite/ld-elf/pr22269a.d: Likewise.
	* testsuite/ld-elf/pr22269b.d: Likewise.
	* testsuite/ld-elf/pr22393-1a.d: Likewise.
	* testsuite/ld-elf/pr22393-1b.d: Likewise.
	* testsuite/ld-elf/pr22393-1c.d: Likewise.
	* testsuite/ld-elf/pr22393-1d.d: Likewise.
	* testsuite/ld-elf/pr22393-1e.d: Likewise.
	* testsuite/ld-elf/pr22393-1f.d: Likewise.
	* testsuite/ld-elf/pr22393-2a.rd: Likewise.
	* testsuite/ld-elf/pr22393-2b.rd: Likewise.
	* testsuite/ld-elf/pr23900-1-32.rd: Likewise.
	* testsuite/ld-elf/pr23900-1-64.rd: Likewise.
	* testsuite/ld-elf/pr23900-1.d: Likewise.
	* testsuite/ld-elf/pr23900-2a.d: Likewise.
	* testsuite/ld-elf/pr23900-2b.d: Likewise.
	* testsuite/ld-elf/pr30508.d: Likewise.
	* testsuite/ld-elf/pr30907-1.d: Likewise.
	* testsuite/ld-elf/pr30907-2.d: Likewise.
	* testsuite/ld-elf/pr32341.d: Likewise.
	* testsuite/ld-elf/shared.exp: Likewise.
	* testsuite/ld-elf/tls.exp: Likewise.
	* testsuite/ld-elf/tls_common.exp: Likewise.
	* testsuite/ld-elfvers/vers.exp: Likewise.
	* testsuite/ld-elfvsb/elfvsb.exp: Likewise.
	* testsuite/ld-elfweak/elfweak.exp: Likewise.
	* testsuite/ld-gc/gc.exp: Likewise.
	* testsuite/ld-ifunc/binutils.exp: Likewise.
	* testsuite/ld-pie/pie.exp: Likewise.
	* testsuite/ld-plugin/lto-binutils.exp: Likewise.
	* testsuite/ld-plugin/lto.exp: Likewise.
	* testsuite/ld-scripts/rgn-at3.d: Likewise.
	* testsuite/ld-shared/shared.exp: Likewise.
	* testsuite/ld-size/size.exp: Likewise.

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
---

diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 4987ac9cccc..3c3243269f1 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -289,7 +289,6 @@ BFD32_BACKENDS = \
 	elf-ifunc.lo \
 	elf-m10200.lo \
 	elf-m10300.lo \
-	elf-nacl.lo \
 	elf-sframe.lo \
 	elf-strtab.lo \
 	elf-vxworks.lo \
@@ -423,7 +422,6 @@ BFD32_BACKENDS_CFILES = \
 	elf-ifunc.c \
 	elf-m10200.c \
 	elf-m10300.c \
-	elf-nacl.c \
 	elf-sframe.c \
 	elf-strtab.c \
 	elf-vxworks.c \
@@ -709,7 +707,7 @@ SOURCE_HFILES = \
 	elf32-tic6x.h elf32-tilegx.h elf32-tilepro.h elf32-v850.h \
 	elf64-hppa.h elf64-ppc.h elf64-tilegx.h \
 	elf-bfd.h elfcode.h elfcore.h elf-hppa.h elf-linker-x86.h \
-	elf-linux-core.h elf-nacl.h elf-s390.h elf-vxworks.h \
+	elf-linux-core.h elf-s390.h elf-vxworks.h \
 	elfxx-aarch64.h elfxx-ia64.h elfxx-mips.h elfxx-riscv.h \
 	elfxx-sparc.h elfxx-tilegx.h elfxx-x86.h elfxx-loongarch.h \
 	genlink.h go32stub.h \
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 8a670ad1d05..4c259682fd0 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -755,7 +755,6 @@ BFD32_BACKENDS = \
 	elf-ifunc.lo \
 	elf-m10200.lo \
 	elf-m10300.lo \
-	elf-nacl.lo \
 	elf-sframe.lo \
 	elf-strtab.lo \
 	elf-vxworks.lo \
@@ -889,7 +888,6 @@ BFD32_BACKENDS_CFILES = \
 	elf-ifunc.c \
 	elf-m10200.c \
 	elf-m10300.c \
-	elf-nacl.c \
 	elf-sframe.c \
 	elf-strtab.c \
 	elf-vxworks.c \
@@ -1172,7 +1170,7 @@ SOURCE_HFILES = \
 	elf32-tic6x.h elf32-tilegx.h elf32-tilepro.h elf32-v850.h \
 	elf64-hppa.h elf64-ppc.h elf64-tilegx.h \
 	elf-bfd.h elfcode.h elfcore.h elf-hppa.h elf-linker-x86.h \
-	elf-linux-core.h elf-nacl.h elf-s390.h elf-vxworks.h \
+	elf-linux-core.h elf-s390.h elf-vxworks.h \
 	elfxx-aarch64.h elfxx-ia64.h elfxx-mips.h elfxx-riscv.h \
 	elfxx-sparc.h elfxx-tilegx.h elfxx-x86.h elfxx-loongarch.h \
 	genlink.h go32stub.h \
@@ -1560,7 +1558,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-ifunc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-m10200.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-m10300.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-nacl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-properties.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-sframe.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf-strtab.Plo@am__quote@
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 4e5a838fe4e..eb20a01ef54 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -83,6 +83,7 @@ case $targ in
  *-sony-* | \
  *-tandem-* | \
  *-*-ieee* | \
+ *-*-nacl* | \
  *-*-netbsdpe* | \
  *-*-netware* | \
  *-*-rtemsaout* | \
@@ -376,14 +377,6 @@ case "${targ}" in
     targ_defvec=arm_elf32_le_vec
     targ_selvecs="arm_elf32_fdpic_le_vec arm_elf32_be_vec arm_elf32_fdpic_be_vec arm_pe_le_vec arm_pe_be_vec arm_pei_le_vec arm_pei_be_vec"
     ;;
-  arm-*-nacl*)
-    targ_defvec=arm_elf32_nacl_le_vec
-    targ_selvecs="arm_elf32_nacl_be_vec"
-    ;;
-  armeb-*-nacl*)
-    targ_defvec=arm_elf32_nacl_be_vec
-    targ_selvecs="arm_elf32_nacl_le_vec"
-    ;;
   armeb-*-netbsd*)
     targ_defvec=arm_elf32_be_vec
     targ_selvecs="arm_elf32_le_vec"
diff --git a/bfd/configure b/bfd/configure
index 15a326997e2..28ac5ccfbe5 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -15503,14 +15503,12 @@ do
     aout_vec)			 tb="$tb host-aout.lo aout32.lo" ;;
     arc_elf32_be_vec)		 tb="$tb elf32-arc.lo elf32.lo $elf" ;;
     arc_elf32_le_vec)		 tb="$tb elf32-arc.lo elf32.lo $elf" ;;
-    arm_elf32_be_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    arm_elf32_le_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    arm_elf32_fdpic_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    arm_elf32_fdpic_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    arm_elf32_nacl_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    arm_elf32_nacl_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    arm_elf32_vxworks_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    arm_elf32_vxworks_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_be_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_le_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_fdpic_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_fdpic_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_vxworks_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_vxworks_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
     arm_pe_be_vec)		 tb="$tb pe-arm.lo peigen.lo $coff" ;;
     arm_pe_le_vec)		 tb="$tb pe-arm.lo peigen.lo $coff" ;;
     arm_pe_wince_be_vec)	 tb="$tb pe-arm-wince.lo pe-arm.lo peigen.lo $coff" ;;
diff --git a/bfd/configure.ac b/bfd/configure.ac
index 1e918e3b0aa..502c526b606 100644
--- a/bfd/configure.ac
+++ b/bfd/configure.ac
@@ -427,14 +427,12 @@ do
     aout_vec)			 tb="$tb host-aout.lo aout32.lo" ;;
     arc_elf32_be_vec)		 tb="$tb elf32-arc.lo elf32.lo $elf" ;;
     arc_elf32_le_vec)		 tb="$tb elf32-arc.lo elf32.lo $elf" ;;
-    arm_elf32_be_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    arm_elf32_le_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    arm_elf32_fdpic_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    arm_elf32_fdpic_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    arm_elf32_nacl_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    arm_elf32_nacl_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    arm_elf32_vxworks_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    arm_elf32_vxworks_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_be_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_le_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_fdpic_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_fdpic_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_vxworks_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_vxworks_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
     arm_pe_be_vec)		 tb="$tb pe-arm.lo peigen.lo $coff" ;;
     arm_pe_le_vec)		 tb="$tb pe-arm.lo peigen.lo $coff" ;;
     arm_pe_wince_be_vec)	 tb="$tb pe-arm-wince.lo pe-arm.lo peigen.lo $coff" ;;
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index c02e34e75ba..b7916239737 100644
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -605,8 +605,7 @@ enum elf_target_os
 {
   is_normal,
   is_solaris,	/* Solaris.  */
-  is_vxworks,	/* VxWorks.  */
-  is_nacl	/* Native Client.  */
+  is_vxworks	/* VxWorks.  */
 };
 
 /* Used by bfd_sym_from_r_symndx to cache a small number of local
diff --git a/bfd/elf-nacl.c b/bfd/elf-nacl.c
deleted file mode 100644
index 1265f2a9c82..00000000000
--- a/bfd/elf-nacl.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/* Native Client support for ELF
-   Copyright (C) 2012-2025 Free Software Foundation, Inc.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include "sysdep.h"
-#include "bfd.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-#include "elf-nacl.h"
-#include "elf/common.h"
-#include "elf/internal.h"
-
-static bool
-segment_executable (struct elf_segment_map *seg)
-{
-  if (seg->p_flags_valid)
-    return (seg->p_flags & PF_X) != 0;
-  else
-    {
-      /* The p_flags value has not been computed yet,
-	 so we have to look through the sections.  */
-      unsigned int i;
-      for (i = 0; i < seg->count; ++i)
-	if (seg->sections[i]->flags & SEC_CODE)
-	  return true;
-    }
-  return false;
-}
-
-/* Determine if this segment is eligible to receive the file and program
-   headers.  It must be read-only and non-executable.
-   Its first section must start far enough past the page boundary to
-   allow space for the headers.  */
-static bool
-segment_eligible_for_headers (struct elf_segment_map *seg,
-			      bfd_vma minpagesize, bfd_vma sizeof_headers)
-{
-  unsigned int i;
-  if (seg->count == 0 || seg->sections[0]->lma % minpagesize < sizeof_headers)
-    return false;
-  for (i = 0; i < seg->count; ++i)
-    {
-      if ((seg->sections[i]->flags & (SEC_CODE|SEC_READONLY)) != SEC_READONLY)
-	return false;
-    }
-  return true;
-}
-
-
-/* We permute the segment_map to get BFD to do the file layout we want:
-   The first non-executable PT_LOAD segment appears first in the file
-   and contains the ELF file header and phdrs.  */
-bool
-nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info)
-{
-  const struct elf_backend_data *const bed = get_elf_backend_data (abfd);
-  struct elf_segment_map **m = &elf_seg_map (abfd);
-  struct elf_segment_map **first_load = NULL;
-  struct elf_segment_map **headers = NULL;
-  int sizeof_headers;
-
-  if (info != NULL && info->user_phdrs)
-    /* The linker script used PHDRS explicitly, so don't change what the
-       user asked for.  */
-    return true;
-
-  if (info != NULL)
-    /* We're doing linking, so evalute SIZEOF_HEADERS as in a linker script.  */
-    sizeof_headers = bfd_sizeof_headers (abfd, info);
-  else
-    {
-      /* We're not doing linking, so this is objcopy or suchlike.
-	 We just need to collect the size of the existing headers.  */
-      struct elf_segment_map *seg;
-      sizeof_headers = bed->s->sizeof_ehdr;
-      for (seg = *m; seg != NULL; seg = seg->next)
-	sizeof_headers += bed->s->sizeof_phdr;
-    }
-
-  while (*m != NULL)
-    {
-      struct elf_segment_map *seg = *m;
-
-      if (seg->p_type == PT_LOAD)
-	{
-	  bool executable = segment_executable (seg);
-
-	  if (executable
-	      && seg->count > 0
-	      && seg->sections[0]->vma % bed->minpagesize == 0)
-	    {
-	      asection *lastsec = seg->sections[seg->count - 1];
-	      bfd_vma end = lastsec->vma + lastsec->size;
-	      if (end % bed->minpagesize != 0)
-		{
-		  /* This is an executable segment that starts on a page
-		     boundary but does not end on a page boundary.  Fill
-		     it out to a whole page with code fill (the tail of
-		     the segment will not be within any section).  Thus
-		     the entire code segment can be mapped from the file
-		     as whole pages and that mapping will contain only
-		     valid instructions.
-
-		     To accomplish this, we must fake out the code in
-		     assign_file_positions_for_load_sections (elf.c) so
-		     that it advances past the rest of the final page,
-		     rather than trying to put the next (unaligned, or
-		     unallocated) section.  We do this by appending a
-		     dummy section record to this element in the segment
-		     map.  No such output section ever actually exists,
-		     but this gets the layout logic to advance the file
-		     positions past this partial page.  Since we are
-		     lying to BFD like this, nothing will ever know to
-		     write the section contents.  So we do that by hand
-		     after the fact, in nacl_final_write_processing, below.  */
-
-		  struct elf_segment_map *newseg;
-		  asection *sec;
-		  struct bfd_elf_section_data *secdata;
-
-		  BFD_ASSERT (!seg->p_size_valid);
-
-		  secdata = bfd_zalloc (abfd, sizeof *secdata);
-		  if (secdata == NULL)
-		    return false;
-
-		  sec = bfd_zalloc (abfd, sizeof *sec);
-		  if (sec == NULL)
-		    return false;
-
-		  /* Fill in only the fields that actually affect the logic
-		     in assign_file_positions_for_load_sections.  */
-		  sec->vma = end;
-		  sec->lma = lastsec->lma + lastsec->size;
-		  sec->size = bed->minpagesize - (end % bed->minpagesize);
-		  sec->flags = (SEC_ALLOC | SEC_LOAD
-				| SEC_READONLY | SEC_CODE | SEC_LINKER_CREATED);
-		  sec->used_by_bfd = secdata;
-
-		  secdata->this_hdr.sh_type = SHT_PROGBITS;
-		  secdata->this_hdr.sh_flags = SHF_ALLOC | SHF_EXECINSTR;
-		  secdata->this_hdr.sh_addr = sec->vma;
-		  secdata->this_hdr.sh_size = sec->size;
-
-		  newseg
-		    = bfd_alloc (abfd, (sizeof (*newseg)
-					+ seg->count * sizeof (asection *)));
-		  if (newseg == NULL)
-		    return false;
-		  memcpy (newseg, seg, (sizeof (*newseg) - sizeof (asection *)
-					+ seg->count * sizeof (asection *)));
-		  newseg->sections[newseg->count++] = sec;
-		  *m = seg = newseg;
-		}
-	    }
-
-	  /* First, we're just finding the earliest PT_LOAD.
-	     By the normal rules, this will be the lowest-addressed one.  */
-	  if (first_load == NULL)
-	    first_load = m;
-
-	  /* Now that we've noted the first PT_LOAD, we're looking for
-	     the first non-executable PT_LOAD with a nonempty p_filesz.  */
-	  else if (headers == NULL
-		   && segment_eligible_for_headers (seg, bed->minpagesize,
-						    sizeof_headers))
-	    headers = m;
-	}
-      m = &seg->next;
-    }
-
-  if (headers != NULL)
-    {
-      struct elf_segment_map **last_load = NULL;
-      struct elf_segment_map *seg;
-
-      m = first_load;
-      while ((seg = *m) != NULL)
-	{
-	  if (seg->p_type == PT_LOAD)
-	    {
-	      /* Clear the flags on any previous segment that
-		 included the file header and phdrs.  */
-	      seg->includes_filehdr = 0;
-	      seg->includes_phdrs = 0;
-	      seg->no_sort_lma = 1;
-	      /* Also strip out empty segments.  */
-	      if (seg->count == 0)
-		{
-		  if (headers == &seg->next)
-		    headers = m;
-		  *m = seg->next;
-		  continue;
-		}
-	      last_load = m;
-	    }
-	  m = &seg->next;
-	}
-
-      /* This segment will include those headers instead.  */
-      seg = *headers;
-      seg->includes_filehdr = 1;
-      seg->includes_phdrs = 1;
-
-      if (last_load != NULL && first_load != last_load && first_load != headers)
-	{
-	  /* Put the first PT_LOAD header last.  */
-	  struct elf_segment_map *first = *first_load;
-	  struct elf_segment_map *last = *last_load;
-	  *first_load = first->next;
-	  first->next = last->next;
-	  last->next = first;
-	}
-    }
-
-  return true;
-}
-
-/* After nacl_modify_segment_map has done its work, the file layout has
-   been done as we wanted.  But the PT_LOAD phdrs are no longer in the
-   proper order for the ELF rule that they must appear in ascending address
-   order.  So find the two segments we swapped before, and swap them back.  */
-bool
-nacl_modify_headers (bfd *abfd, struct bfd_link_info *info)
-{
-  if (info != NULL && info->user_phdrs)
-    /* The linker script used PHDRS explicitly, so don't change what the
-       user asked for.  */
-    ;
-  else
-    {
-      struct elf_segment_map **m = &elf_seg_map (abfd);
-      Elf_Internal_Phdr *phdr = elf_tdata (abfd)->phdr;
-      Elf_Internal_Phdr *p = phdr;
-
-      /* Find the PT_LOAD that contains the headers (should be the first).  */
-      while (*m != NULL)
-	{
-	  if ((*m)->p_type == PT_LOAD && (*m)->includes_filehdr)
-	    break;
-
-	  m = &(*m)->next;
-	  ++p;
-	}
-
-      if (*m != NULL)
-	{
-	  struct elf_segment_map **first_load_seg = m;
-	  Elf_Internal_Phdr *first_load_phdr = p;
-	  struct elf_segment_map **next_load_seg = NULL;
-	  Elf_Internal_Phdr *next_load_phdr = NULL;
-
-	  /* Now move past that first one and find the PT_LOAD that should be
-	     before it by address order.  */
-
-	  m = &(*m)->next;
-	  ++p;
-
-	  while (*m != NULL)
-	    {
-	      if (p->p_type == PT_LOAD && p->p_vaddr < first_load_phdr->p_vaddr)
-		{
-		  next_load_seg = m;
-		  next_load_phdr = p;
-		  break;
-		}
-
-	      m = &(*m)->next;
-	      ++p;
-	    }
-
-	  /* Swap their positions in the segment_map back to how they
-	     used to be.  The phdrs have already been set up by now,
-	     so we have to slide up the earlier ones to insert the one
-	     that should be first.  */
-	  if (next_load_seg != NULL)
-	    {
-	      Elf_Internal_Phdr move_phdr;
-	      struct elf_segment_map *first_seg = *first_load_seg;
-	      struct elf_segment_map *next_seg = *next_load_seg;
-	      struct elf_segment_map *first_next = first_seg->next;
-	      struct elf_segment_map *next_next = next_seg->next;
-
-	      if (next_load_seg == &first_seg->next)
-		{
-		  *first_load_seg = next_seg;
-		  next_seg->next = first_seg;
-		  first_seg->next = next_next;
-		}
-	      else
-		{
-		  *first_load_seg = first_next;
-		  *next_load_seg = next_next;
-
-		  first_seg->next = *next_load_seg;
-		  *next_load_seg = first_seg;
-
-		  next_seg->next = *first_load_seg;
-		  *first_load_seg = next_seg;
-		}
-
-	      move_phdr = *next_load_phdr;
-	      memmove (first_load_phdr + 1, first_load_phdr,
-		       (next_load_phdr - first_load_phdr) * sizeof move_phdr);
-	      *first_load_phdr = move_phdr;
-	    }
-	}
-    }
-
-  return _bfd_elf_modify_headers (abfd, info);
-}
-
-bool
-nacl_final_write_processing (bfd *abfd)
-{
-  struct elf_segment_map *seg;
-  for (seg = elf_seg_map (abfd); seg != NULL; seg = seg->next)
-    if (seg->p_type == PT_LOAD
-	&& seg->count > 1
-	&& seg->sections[seg->count - 1]->owner == NULL)
-      {
-	/* This is a fake section added in nacl_modify_segment_map, above.
-	   It's not a real BFD section, so nothing wrote its contents.
-	   Now write out its contents.  */
-
-	asection *sec = seg->sections[seg->count - 1];
-	char *fill;
-
-	BFD_ASSERT (sec->flags & SEC_LINKER_CREATED);
-	BFD_ASSERT (sec->flags & SEC_CODE);
-	BFD_ASSERT (sec->size > 0);
-
-	fill = abfd->arch_info->fill (sec->size, bfd_big_endian (abfd), true);
-
-	if (fill == NULL
-	    || bfd_seek (abfd, sec->filepos, SEEK_SET) != 0
-	    || bfd_write (fill, sec->size, abfd) != sec->size)
-	  {
-	    /* We don't have a proper way to report an error here.  So
-	       instead fudge things so that elf_write_shdrs_and_ehdr will
-	       fail.  */
-	    elf_elfheader (abfd)->e_shoff = (file_ptr) -1;
-	  }
-
-	free (fill);
-      }
-  return _bfd_elf_final_write_processing (abfd);
-}
diff --git a/bfd/elf-nacl.h b/bfd/elf-nacl.h
deleted file mode 100644
index 3a49dcb0e69..00000000000
--- a/bfd/elf-nacl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Native Client support for ELF
-   Copyright (C) 2012-2025 Free Software Foundation, Inc.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-bool nacl_modify_segment_map (bfd *, struct bfd_link_info *);
-bool nacl_modify_headers (bfd *, struct bfd_link_info *);
-bool nacl_final_write_processing (bfd *);
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index e4376f0afac..b5d1866eae8 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -25,7 +25,6 @@
 #include "libiberty.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
-#include "elf-nacl.h"
 #include "elf-vxworks.h"
 #include "elf/arm.h"
 #include "elf32-arm.h"
@@ -2497,45 +2496,6 @@ static const bfd_vma elf32_arm_plt_thumb_stub [] =
   0xe7fd		/* b .-2 */
 };
 
-/* The first entry in a procedure linkage table looks like
-   this.  It is set up so that any shared library function that is
-   called before the relocation has been set up calls the dynamic
-   linker first.  */
-static const bfd_vma elf32_arm_nacl_plt0_entry [] =
-{
-  /* First bundle: */
-  0xe300c000,		/* movw	ip, #:lower16:&GOT[2]-.+8	*/
-  0xe340c000,		/* movt	ip, #:upper16:&GOT[2]-.+8	*/
-  0xe08cc00f,		/* add	ip, ip, pc			*/
-  0xe52dc008,		/* str	ip, [sp, #-8]!			*/
-  /* Second bundle: */
-  0xe3ccc103,		/* bic	ip, ip, #0xc0000000		*/
-  0xe59cc000,		/* ldr	ip, [ip]			*/
-  0xe3ccc13f,		/* bic	ip, ip, #0xc000000f		*/
-  0xe12fff1c,		/* bx	ip				*/
-  /* Third bundle: */
-  0xe320f000,		/* nop					*/
-  0xe320f000,		/* nop					*/
-  0xe320f000,		/* nop					*/
-  /* .Lplt_tail: */
-  0xe50dc004,		/* str	ip, [sp, #-4]			*/
-  /* Fourth bundle: */
-  0xe3ccc103,		/* bic	ip, ip, #0xc0000000		*/
-  0xe59cc000,		/* ldr	ip, [ip]			*/
-  0xe3ccc13f,		/* bic	ip, ip, #0xc000000f		*/
-  0xe12fff1c,		/* bx	ip				*/
-};
-#define ARM_NACL_PLT_TAIL_OFFSET	(11 * 4)
-
-/* Subsequent entries in a procedure linkage table look like this.  */
-static const bfd_vma elf32_arm_nacl_plt_entry [] =
-{
-  0xe300c000,		/* movw	ip, #:lower16:&GOT[n]-.+8	*/
-  0xe340c000,		/* movt	ip, #:upper16:&GOT[n]-.+8	*/
-  0xe08cc00f,		/* add	ip, ip, pc			*/
-  0xea000000,		/* b	.Lplt_tail			*/
-};
-
 /* PR 28924:
    There was a bug due to too high values of THM_MAX_FWD_BRANCH_OFFSET and
    THM2_MAX_FWD_BRANCH_OFFSET.  The first macro concerns the case when Thumb-2
@@ -2749,32 +2709,6 @@ static const insn_sequence elf32_arm_stub_long_branch_v4t_thumb_tls_pic[] =
   DATA_WORD (0, R_ARM_REL32, -4),    /* dcd  R_ARM_REL32(X) */
 };
 
-/* NaCl ARM -> ARM long branch stub.  */
-static const insn_sequence elf32_arm_stub_long_branch_arm_nacl[] =
-{
-  ARM_INSN (0xe59fc00c),		/* ldr	ip, [pc, #12] */
-  ARM_INSN (0xe3ccc13f),		/* bic	ip, ip, #0xc000000f */
-  ARM_INSN (0xe12fff1c),		/* bx	ip */
-  ARM_INSN (0xe320f000),		/* nop */
-  ARM_INSN (0xe125be70),		/* bkpt	0x5be0 */
-  DATA_WORD (0, R_ARM_ABS32, 0),	/* dcd	R_ARM_ABS32(X) */
-  DATA_WORD (0, R_ARM_NONE, 0),		/* .word 0 */
-  DATA_WORD (0, R_ARM_NONE, 0),		/* .word 0 */
-};
-
-/* NaCl ARM -> ARM long branch stub, PIC.  */
-static const insn_sequence elf32_arm_stub_long_branch_arm_nacl_pic[] =
-{
-  ARM_INSN (0xe59fc00c),		/* ldr	ip, [pc, #12] */
-  ARM_INSN (0xe08cc00f),		/* add	ip, ip, pc */
-  ARM_INSN (0xe3ccc13f),		/* bic	ip, ip, #0xc000000f */
-  ARM_INSN (0xe12fff1c),		/* bx	ip */
-  ARM_INSN (0xe125be70),		/* bkpt	0x5be0 */
-  DATA_WORD (0, R_ARM_REL32, 8),	/* dcd	R_ARM_REL32(X+8) */
-  DATA_WORD (0, R_ARM_NONE, 0),		/* .word 0 */
-  DATA_WORD (0, R_ARM_NONE, 0),		/* .word 0 */
-};
-
 /* Stub used for transition to secure state (aka SG veneer).  */
 static const insn_sequence elf32_arm_stub_cmse_branch_thumb_only[] =
 {
@@ -2859,8 +2793,6 @@ static const insn_sequence elf32_arm_stub_a8_veneer_blx[] =
   DEF_STUB (long_branch_thumb_only_pic) \
   DEF_STUB (long_branch_any_tls_pic) \
   DEF_STUB (long_branch_v4t_thumb_tls_pic) \
-  DEF_STUB (long_branch_arm_nacl) \
-  DEF_STUB (long_branch_arm_nacl_pic) \
   DEF_STUB (cmse_branch_thumb_only) \
   DEF_STUB (a8_veneer_b_cond) \
   DEF_STUB (a8_veneer_b) \
@@ -4524,13 +4456,9 @@ arm_type_of_stub (struct bfd_link_info *info,
 		? (r_type == R_ARM_TLS_CALL
 		   /* TLS PIC Stub.  */
 		   ? arm_stub_long_branch_any_tls_pic
-		   : (globals->root.target_os == is_nacl
-		      ? arm_stub_long_branch_arm_nacl_pic
-		      : arm_stub_long_branch_any_arm_pic))
+		   : arm_stub_long_branch_any_arm_pic)
 		/* non-PIC stubs.  */
-		: (globals->root.target_os == is_nacl
-		   ? arm_stub_long_branch_arm_nacl
-		   : arm_stub_long_branch_any_any);
+		: arm_stub_long_branch_any_any;
 	    }
 	}
     }
@@ -4793,7 +4721,7 @@ elf32_arm_create_or_find_stub_sec (asection **link_sec_p, asection *section,
 	stub_sec_p = &htab->stub_group[link_sec->id].stub_sec;
       stub_sec_prefix = link_sec->name;
       out_sec = link_sec->output_section;
-      align = htab->root.target_os == is_nacl ? 4 : 3;
+      align = 3;
     }
 
   if (*stub_sec_p == NULL)
@@ -4974,10 +4902,6 @@ arm_stub_required_alignment (enum elf32_arm_stub_type stub_type)
     case arm_stub_a8_veneer_blx:
       return 4;
 
-    case arm_stub_long_branch_arm_nacl:
-    case arm_stub_long_branch_arm_nacl_pic:
-      return 16;
-
     default:
       abort ();  /* Should be unreachable.  */
     }
@@ -9571,10 +9495,6 @@ elf32_arm_allocate_plt_entry (struct bfd_link_info *info,
       splt = htab->root.iplt;
       sgotplt = htab->root.igotplt;
 
-      /* NaCl uses a special first entry in .iplt too.  */
-      if (htab->root.target_os == is_nacl && splt->size == 0)
-	splt->size += htab->plt_header_size;
-
       /* Allocate room for an R_ARM_IRELATIVE relocation in .rel.iplt.  */
       elf32_arm_allocate_irelocs (info, htab->root.irelplt, 1);
     }
@@ -9627,18 +9547,6 @@ elf32_arm_allocate_plt_entry (struct bfd_link_info *info,
     sgotplt->size += 4;
 }
 
-static bfd_vma
-arm_movw_immediate (bfd_vma value)
-{
-  return (value & 0x00000fff) | ((value & 0x0000f000) << 4);
-}
-
-static bfd_vma
-arm_movt_immediate (bfd_vma value)
-{
-  return ((value & 0x0fff0000) >> 16) | ((value & 0xf0000000) >> 12);
-}
-
 /* Fill in a PLT entry and its associated GOT slot.  If DYNINDX == -1,
    the entry lives in .iplt and resolves to (*SYM_VALUE)().
    Otherwise, DYNINDX is the index of the symbol in the dynamic
@@ -9776,45 +9684,6 @@ elf32_arm_populate_plt_entry (bfd *output_bfd, struct bfd_link_info *info,
       rel.r_addend = 0;
       SWAP_RELOC_OUT (htab) (output_bfd, &rel, loc);
     }
-  else if (htab->root.target_os == is_nacl)
-    {
-      /* Calculate the displacement between the PLT slot and the
-	 common tail that's part of the special initial PLT slot.  */
-      int32_t tail_displacement
-	= ((splt->output_section->vma + splt->output_offset
-	    + ARM_NACL_PLT_TAIL_OFFSET)
-	   - (plt_address + htab->plt_entry_size + 4));
-      BFD_ASSERT ((tail_displacement & 3) == 0);
-      tail_displacement >>= 2;
-
-      BFD_ASSERT ((tail_displacement & 0xff000000) == 0
-		  || (-tail_displacement & 0xff000000) == 0);
-
-      /* Calculate the displacement between the PLT slot and the entry
-	 in the GOT.  The offset accounts for the value produced by
-	 adding to pc in the penultimate instruction of the PLT stub.  */
-      got_displacement = (got_address
-			  - (plt_address + htab->plt_entry_size));
-
-      /* NaCl does not support interworking at all.  */
-      BFD_ASSERT (!elf32_arm_plt_needs_thumb_stub_p (info, arm_plt));
-
-      put_arm_insn (htab, output_bfd,
-		    elf32_arm_nacl_plt_entry[0]
-		    | arm_movw_immediate (got_displacement),
-		    ptr + 0);
-      put_arm_insn (htab, output_bfd,
-		    elf32_arm_nacl_plt_entry[1]
-		    | arm_movt_immediate (got_displacement),
-		    ptr + 4);
-      put_arm_insn (htab, output_bfd,
-		    elf32_arm_nacl_plt_entry[2],
-		    ptr + 8);
-      put_arm_insn (htab, output_bfd,
-		    elf32_arm_nacl_plt_entry[3]
-		    | (tail_displacement & 0x00ffffff),
-		    ptr + 12);
-    }
   else if (htab->fdpic_p)
     {
       const bfd_vma *plt_entry = using_thumb_only (htab)
@@ -17344,38 +17213,6 @@ arm_put_trampoline (struct elf32_arm_link_hash_table *htab, bfd *output_bfd,
     }
 }
 
-/* Install the special first PLT entry for elf32-arm-nacl.  Unlike
-   other variants, NaCl needs this entry in a static executable's
-   .iplt too.  When we're handling that case, GOT_DISPLACEMENT is
-   zero.  For .iplt really only the last bundle is useful, and .iplt
-   could have a shorter first entry, with each individual PLT entry's
-   relative branch calculated differently so it targets the last
-   bundle instead of the instruction before it (labelled .Lplt_tail
-   above).  But it's simpler to keep the size and layout of PLT0
-   consistent with the dynamic case, at the cost of some dead code at
-   the start of .iplt and the one dead store to the stack at the start
-   of .Lplt_tail.  */
-static void
-arm_nacl_put_plt0 (struct elf32_arm_link_hash_table *htab, bfd *output_bfd,
-		   asection *plt, bfd_vma got_displacement)
-{
-  unsigned int i;
-
-  put_arm_insn (htab, output_bfd,
-		elf32_arm_nacl_plt0_entry[0]
-		| arm_movw_immediate (got_displacement),
-		plt->contents + 0);
-  put_arm_insn (htab, output_bfd,
-		elf32_arm_nacl_plt0_entry[1]
-		| arm_movt_immediate (got_displacement),
-		plt->contents + 4);
-
-  for (i = 2; i < ARRAY_SIZE (elf32_arm_nacl_plt0_entry); ++i)
-    put_arm_insn (htab, output_bfd,
-		  elf32_arm_nacl_plt0_entry[i],
-		  plt->contents + (i * 4));
-}
-
 /* Finish up the dynamic sections.  */
 
 static bool
@@ -17541,9 +17378,6 @@ elf32_arm_finish_dynamic_sections (bfd * output_bfd, struct bfd_link_info * info
 	      SWAP_RELOC_OUT (htab) (output_bfd, &rel,
 				     htab->srelplt2->contents);
 	    }
-	  else if (htab->root.target_os == is_nacl)
-	    arm_nacl_put_plt0 (htab, output_bfd, splt,
-			       got_address + 8 - (plt_address + 16));
 	  else if (using_thumb_only (htab))
 	    {
 	      got_displacement = got_address - (plt_address + 12);
@@ -17652,12 +17486,6 @@ elf32_arm_finish_dynamic_sections (bfd * output_bfd, struct bfd_link_info * info
 	}
     }
 
-  if (htab->root.target_os == is_nacl
-      && htab->root.iplt != NULL
-      && htab->root.iplt->size > 0)
-    /* NaCl uses a special first entry in .iplt too.  */
-    arm_nacl_put_plt0 (htab, output_bfd, htab->root.iplt, 0);
-
   /* Fill in the first three entries in the global offset table.  */
   if (sgot)
     {
@@ -17971,11 +17799,6 @@ elf32_arm_output_plt_map_1 (output_arch_syminfo *osi,
       if (!elf32_arm_output_map_sym (osi, ARM_MAP_DATA, addr + 20))
 	return false;
     }
-  else if (htab->root.target_os == is_nacl)
-    {
-      if (!elf32_arm_output_map_sym (osi, ARM_MAP_ARM, addr))
-	return false;
-    }
   else if (htab->fdpic_p)
     {
       enum map_symbol_type type = using_thumb_only (htab)
@@ -18348,11 +18171,6 @@ elf32_arm_output_arch_local_syms (bfd *output_bfd,
 		return false;
 	    }
 	}
-      else if (htab->root.target_os == is_nacl)
-	{
-	  if (!elf32_arm_output_map_sym (&osi, ARM_MAP_ARM, 0))
-	    return false;
-	}
       else if (using_thumb_only (htab) && !htab->fdpic_p)
 	{
 	  if (!elf32_arm_output_map_sym (&osi, ARM_MAP_THUMB, 0))
@@ -18372,17 +18190,6 @@ elf32_arm_output_arch_local_syms (bfd *output_bfd,
 #endif
 	}
     }
-  if (htab->root.target_os == is_nacl
-      && htab->root.iplt
-      && htab->root.iplt->size > 0)
-    {
-      /* NaCl uses a special first entry in .iplt too.  */
-      osi.sec = htab->root.iplt;
-      osi.sec_shndx = (_bfd_elf_section_from_bfd_section
-		       (output_bfd, osi.sec->output_section));
-      if (!elf32_arm_output_map_sym (&osi, ARM_MAP_ARM, 0))
-	return false;
-    }
   if ((htab->root.splt && htab->root.splt->size > 0)
       || (htab->root.iplt && htab->root.iplt->size > 0))
     {
@@ -20440,90 +20247,6 @@ elf32_arm_backend_symbol_processing (bfd *abfd, asymbol *sym)
 
 #include "elf32-target.h"
 
-/* Native Client targets.  */
-
-#undef	TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		arm_elf32_nacl_le_vec
-#undef	TARGET_LITTLE_NAME
-#define TARGET_LITTLE_NAME		"elf32-littlearm-nacl"
-#undef	TARGET_BIG_SYM
-#define TARGET_BIG_SYM			arm_elf32_nacl_be_vec
-#undef	TARGET_BIG_NAME
-#define TARGET_BIG_NAME			"elf32-bigarm-nacl"
-
-/* Like elf32_arm_link_hash_table_create -- but overrides
-   appropriately for NaCl.  */
-
-static struct bfd_link_hash_table *
-elf32_arm_nacl_link_hash_table_create (bfd *abfd)
-{
-  struct bfd_link_hash_table *ret;
-
-  ret = elf32_arm_link_hash_table_create (abfd);
-  if (ret)
-    {
-      struct elf32_arm_link_hash_table *htab
-	= (struct elf32_arm_link_hash_table *) ret;
-
-      htab->plt_header_size = 4 * ARRAY_SIZE (elf32_arm_nacl_plt0_entry);
-      htab->plt_entry_size = 4 * ARRAY_SIZE (elf32_arm_nacl_plt_entry);
-    }
-  return ret;
-}
-
-/* Since NaCl doesn't use the ARM-specific unwind format, we don't
-   really need to use elf32_arm_modify_segment_map.  But we do it
-   anyway just to reduce gratuitous differences with the stock ARM backend.  */
-
-static bool
-elf32_arm_nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info)
-{
-  return (elf32_arm_modify_segment_map (abfd, info)
-	  && nacl_modify_segment_map (abfd, info));
-}
-
-static bool
-elf32_arm_nacl_final_write_processing (bfd *abfd)
-{
-  arm_final_write_processing (abfd);
-  return nacl_final_write_processing (abfd);
-}
-
-static bfd_vma
-elf32_arm_nacl_plt_sym_val (bfd_vma i, const asection *plt,
-			    const arelent *rel ATTRIBUTE_UNUSED)
-{
-  return plt->vma
-    + 4 * (ARRAY_SIZE (elf32_arm_nacl_plt0_entry) +
-	   i * ARRAY_SIZE (elf32_arm_nacl_plt_entry));
-}
-
-#undef	elf32_bed
-#define elf32_bed				elf32_arm_nacl_bed
-#undef  bfd_elf32_bfd_link_hash_table_create
-#define bfd_elf32_bfd_link_hash_table_create	\
-  elf32_arm_nacl_link_hash_table_create
-#undef	elf_backend_plt_alignment
-#define elf_backend_plt_alignment		4
-#undef	elf_backend_modify_segment_map
-#define	elf_backend_modify_segment_map		elf32_arm_nacl_modify_segment_map
-#undef	elf_backend_modify_headers
-#define	elf_backend_modify_headers		nacl_modify_headers
-#undef  elf_backend_final_write_processing
-#define elf_backend_final_write_processing	elf32_arm_nacl_final_write_processing
-#undef bfd_elf32_get_synthetic_symtab
-#undef  elf_backend_plt_sym_val
-#define elf_backend_plt_sym_val			elf32_arm_nacl_plt_sym_val
-#undef  elf_backend_copy_special_section_fields
-
-#undef	ELF_MINPAGESIZE
-#undef	ELF_COMMONPAGESIZE
-
-#undef ELF_TARGET_OS
-#define ELF_TARGET_OS				is_nacl
-
-#include "elf32-target.h"
-
 /* Reset to defaults.  */
 #undef	elf_backend_plt_alignment
 #undef	elf_backend_modify_segment_map
diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in
index 54b078b8295..1ba9cc2fdb1 100644
--- a/bfd/po/SRC-POTFILES.in
+++ b/bfd/po/SRC-POTFILES.in
@@ -140,8 +140,6 @@ elf-linker-x86.h
 elf-linux-core.h
 elf-m10200.c
 elf-m10300.c
-elf-nacl.c
-elf-nacl.h
 elf-properties.c
 elf-s390.h
 elf-sframe.c
diff --git a/bfd/targets.c b/bfd/targets.c
index 23333701ec0..c2ee9179f37 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -696,8 +696,6 @@ extern const bfd_target arm_elf32_be_vec;
 extern const bfd_target arm_elf32_le_vec;
 extern const bfd_target arm_elf32_fdpic_be_vec;
 extern const bfd_target arm_elf32_fdpic_le_vec;
-extern const bfd_target arm_elf32_nacl_be_vec;
-extern const bfd_target arm_elf32_nacl_le_vec;
 extern const bfd_target arm_elf32_vxworks_be_vec;
 extern const bfd_target arm_elf32_vxworks_le_vec;
 extern const bfd_target arm_mach_o_vec;
diff --git a/binutils/NEWS b/binutils/NEWS
index 281de005ff8..5038851b455 100644
--- a/binutils/NEWS
+++ b/binutils/NEWS
@@ -1,5 +1,7 @@
 -*- text -*-
 
+* NaCl target support is removed.
+
 Changes in 2.45:
 
 * New versioned release of libsframe: libsframe.so.2.  This release introduces
diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp
index 2da7138e211..b73b5558c27 100644
--- a/binutils/testsuite/lib/binutils-common.exp
+++ b/binutils/testsuite/lib/binutils-common.exp
@@ -44,7 +44,6 @@ proc is_elf_format {} {
    && ![istarget kvx-*-*]
 	 && ![istarget *-*-*linux*]
 	 && ![istarget *-*-lynxos*]
-	 && ![istarget *-*-nacl*]
 	 && ![istarget *-*-netbsd*]
 	 && ![istarget *-*-nto*]
 	 && ![istarget *-*-openbsd*]
@@ -238,7 +237,6 @@ proc match_target { target } {
 proc supports_gnu_osabi {} {
     if { [istarget *-*-gnu*]
 	 || [istarget *-*-linux*]
-	 || [istarget *-*-nacl*]
 	 || ( [istarget *-*-*bsd*] && ![istarget arm*-*-netbsd*] )
 	 || [istarget *-*-lynxos]
 	 || ( [istarget *-*-nto*] && ![istarget arm*-*-*] )
diff --git a/gas/NEWS b/gas/NEWS
index dcbeeec1bfc..0caaa2d9eb6 100644
--- a/gas/NEWS
+++ b/gas/NEWS
@@ -1,5 +1,7 @@
 -*- text -*-
 
+* NaCl target support is removed.
+
 Changes in 2.45:
 
 * Add support to generate SFrame stack trace information (.sframe)
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 5fabf71c2f5..99c07d4b93b 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -29801,10 +29801,6 @@ elf32_arm_target_format (void)
   return (target_big_endian
 	  ? "elf32-bigarm-vxworks"
 	  : "elf32-littlearm-vxworks");
-#elif defined (TE_NACL)
-  return (target_big_endian
-	  ? "elf32-bigarm-nacl"
-	  : "elf32-littlearm-nacl");
 #else
   if (arm_fdpic)
     {
diff --git a/gas/config/te-nacl.h b/gas/config/te-nacl.h
deleted file mode 100644
index fff73882e59..00000000000
--- a/gas/config/te-nacl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 2012-2025 Free Software Foundation, Inc.
-
-   This file is part of GAS, the GNU Assembler.
-
-   GAS is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 3,
-   or (at your option) any later version.
-
-   GAS is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-   the GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GAS; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
-   02110-1301, USA.  */
-
-#define TE_NACL
-
-#define LOCAL_LABELS_DOLLAR 1
-#define LOCAL_LABELS_FB 1
-
-/* These are for ARM but don't hurt other CPU targets.
-   They match the settings from te-armeabi.h; NaCl/ARM is based on EABI.  */
-#define FPU_DEFAULT FPU_ARCH_SOFTVFP
-#define EABI_DEFAULT EF_ARM_EABI_VER5
-
-#include "obj-format.h"
diff --git a/gas/configure.tgt b/gas/configure.tgt
index 7c81bffa16b..256513496f6 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -161,7 +161,6 @@ case ${generic_target} in
   arm-*-linux-*)			fmt=elf  em=linux ;;
   arm-*-uclinux*eabi*)			fmt=elf  em=armlinuxeabi ;;
   arm-*-uclinux*)			fmt=elf  em=linux ;;
-  arm-*-nacl*)				fmt=elf  em=nacl ;;
   arm-*-netbsd* | arm-*-openbsd*)	fmt=elf  em=nbsd ;;
   arm-*-nto*)				fmt=elf ;;
   arm-wince-pe | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)
diff --git a/gas/testsuite/gas/arm/any-armv8m.d b/gas/testsuite/gas/arm/any-armv8m.d
index 9dc553350e2..4300630b763 100644
--- a/gas/testsuite/gas/arm/any-armv8m.d
+++ b/gas/testsuite/gas/arm/any-armv8m.d
@@ -3,7 +3,7 @@
 # as: -mthumb
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/any-cmse-main.d b/gas/testsuite/gas/arm/any-cmse-main.d
index be1535f6c4a..00bc8142ab7 100644
--- a/gas/testsuite/gas/arm/any-cmse-main.d
+++ b/gas/testsuite/gas/arm/any-cmse-main.d
@@ -2,7 +2,7 @@
 #source: archv8m-cmse-main.s
 #as:
 #readelf: -A
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/any-cmse.d b/gas/testsuite/gas/arm/any-cmse.d
index 2d5aa8592a8..15b9a97f668 100644
--- a/gas/testsuite/gas/arm/any-cmse.d
+++ b/gas/testsuite/gas/arm/any-cmse.d
@@ -2,7 +2,7 @@
 #source: archv8m-cmse.s
 #as:
 #readelf: -A
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/any-idiv.d b/gas/testsuite/gas/arm/any-idiv.d
index 3b91c16c751..d8380e26fa6 100644
--- a/gas/testsuite/gas/arm/any-idiv.d
+++ b/gas/testsuite/gas/arm/any-idiv.d
@@ -2,7 +2,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/arch4t-eabi.d b/gas/testsuite/gas/arm/arch4t-eabi.d
index 3e3499d13ce..2c1a2682ab9 100644
--- a/gas/testsuite/gas/arm/arch4t-eabi.d
+++ b/gas/testsuite/gas/arm/arch4t-eabi.d
@@ -2,7 +2,7 @@
 # as: -march=armv4t
 # objdump: -dr --prefix-addresses --show-raw-insn
 # source: arch4t.s
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/arch4t.d b/gas/testsuite/gas/arm/arch4t.d
index d8b7439c656..17d67b0e0cb 100644
--- a/gas/testsuite/gas/arm/arch4t.d
+++ b/gas/testsuite/gas/arm/arch4t.d
@@ -2,7 +2,7 @@
 # as: -march=armv4t
 # objdump: -dr --prefix-addresses --show-raw-insn
 # EABI targets have their own variant.
-# notarget: *-*-*eabi* *-*-nacl*
+# notarget: *-*-*eabi*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/armv8m.base-idiv.d b/gas/testsuite/gas/arm/armv8m.base-idiv.d
index 241a0af7c56..163dd1aa680 100644
--- a/gas/testsuite/gas/arm/armv8m.base-idiv.d
+++ b/gas/testsuite/gas/arm/armv8m.base-idiv.d
@@ -3,7 +3,7 @@
 # as: -march=armv8-m.base
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/armv9-a_arch.d b/gas/testsuite/gas/arm/armv9-a_arch.d
index 52c8bb0c15f..edcdcbe7103 100644
--- a/gas/testsuite/gas/arm/armv9-a_arch.d
+++ b/gas/testsuite/gas/arm/armv9-a_arch.d
@@ -3,7 +3,7 @@
 # as: -march=armv9-a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-abi-hardfp-use-0.d b/gas/testsuite/gas/arm/attr-abi-hardfp-use-0.d
index bf7ec9765f2..95bad67679f 100644
--- a/gas/testsuite/gas/arm/attr-abi-hardfp-use-0.d
+++ b/gas/testsuite/gas/arm/attr-abi-hardfp-use-0.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-abi-hardfp-use-1.d b/gas/testsuite/gas/arm/attr-abi-hardfp-use-1.d
index 712bd6c7ec9..e887797d8a4 100644
--- a/gas/testsuite/gas/arm/attr-abi-hardfp-use-1.d
+++ b/gas/testsuite/gas/arm/attr-abi-hardfp-use-1.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-abi-hardfp-use-2.d b/gas/testsuite/gas/arm/attr-abi-hardfp-use-2.d
index a06c8beb752..82e352bd96e 100644
--- a/gas/testsuite/gas/arm/attr-abi-hardfp-use-2.d
+++ b/gas/testsuite/gas/arm/attr-abi-hardfp-use-2.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-abi-hardfp-use-3.d b/gas/testsuite/gas/arm/attr-abi-hardfp-use-3.d
index 3e42741ba2d..ff57747444f 100644
--- a/gas/testsuite/gas/arm/attr-abi-hardfp-use-3.d
+++ b/gas/testsuite/gas/arm/attr-abi-hardfp-use-3.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-any-armv4t.d b/gas/testsuite/gas/arm/attr-any-armv4t.d
index b578f886296..544ca0cf810 100644
--- a/gas/testsuite/gas/arm/attr-any-armv4t.d
+++ b/gas/testsuite/gas/arm/attr-any-armv4t.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-any-thumbv6.d b/gas/testsuite/gas/arm/attr-any-thumbv6.d
index 3887341b65f..7f52730801c 100644
--- a/gas/testsuite/gas/arm/attr-any-thumbv6.d
+++ b/gas/testsuite/gas/arm/attr-any-thumbv6.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-arch-assumption.d b/gas/testsuite/gas/arm/attr-arch-assumption.d
index e5f60b04b40..611c7cb6fc5 100644
--- a/gas/testsuite/gas/arm/attr-arch-assumption.d
+++ b/gas/testsuite/gas/arm/attr-arch-assumption.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-cpu-directive.d b/gas/testsuite/gas/arm/attr-cpu-directive.d
index 56f33f5beb1..a2ab435fc0a 100644
--- a/gas/testsuite/gas/arm/attr-cpu-directive.d
+++ b/gas/testsuite/gas/arm/attr-cpu-directive.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-default.d b/gas/testsuite/gas/arm/attr-default.d
index 635b3d92942..74b9655e7bd 100644
--- a/gas/testsuite/gas/arm/attr-default.d
+++ b/gas/testsuite/gas/arm/attr-default.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-empty-string.d b/gas/testsuite/gas/arm/attr-empty-string.d
index b4a91418e80..9a7437e9f9c 100644
--- a/gas/testsuite/gas/arm/attr-empty-string.d
+++ b/gas/testsuite/gas/arm/attr-empty-string.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -T -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-fpv5-d16.d b/gas/testsuite/gas/arm/attr-ext-fpv5-d16.d
index eb09cd2ea5e..52fd44aaa37 100644
--- a/gas/testsuite/gas/arm/attr-ext-fpv5-d16.d
+++ b/gas/testsuite/gas/arm/attr-ext-fpv5-d16.d
@@ -3,7 +3,7 @@
 # as: -march=armv7e-m+fp.dp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-fpv5.d b/gas/testsuite/gas/arm/attr-ext-fpv5.d
index e671e32bcd4..782eec5ccb4 100644
--- a/gas/testsuite/gas/arm/attr-ext-fpv5.d
+++ b/gas/testsuite/gas/arm/attr-ext-fpv5.d
@@ -3,7 +3,7 @@
 # as: -march=armv7e-m+fpv5
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-idiv.d b/gas/testsuite/gas/arm/attr-ext-idiv.d
index 2be50d55278..e4e34d1a585 100644
--- a/gas/testsuite/gas/arm/attr-ext-idiv.d
+++ b/gas/testsuite/gas/arm/attr-ext-idiv.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-r+idiv
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-mp.d b/gas/testsuite/gas/arm/attr-ext-mp.d
index cc3972dc46d..9e049750c03 100644
--- a/gas/testsuite/gas/arm/attr-ext-mp.d
+++ b/gas/testsuite/gas/arm/attr-ext-mp.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-a+mp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-neon-fp16.d b/gas/testsuite/gas/arm/attr-ext-neon-fp16.d
index b35305ff2ae..1fa72aaa0fd 100644
--- a/gas/testsuite/gas/arm/attr-ext-neon-fp16.d
+++ b/gas/testsuite/gas/arm/attr-ext-neon-fp16.d
@@ -3,7 +3,7 @@
 # as: -march=armv7ve+neon-fp16
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-neon-vfpv3.d b/gas/testsuite/gas/arm/attr-ext-neon-vfpv3.d
index 3a5017eb578..6f21bb72123 100644
--- a/gas/testsuite/gas/arm/attr-ext-neon-vfpv3.d
+++ b/gas/testsuite/gas/arm/attr-ext-neon-vfpv3.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-a+simd
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-neon-vfpv4.d b/gas/testsuite/gas/arm/attr-ext-neon-vfpv4.d
index a41b079f5ec..ecd311bcce9 100644
--- a/gas/testsuite/gas/arm/attr-ext-neon-vfpv4.d
+++ b/gas/testsuite/gas/arm/attr-ext-neon-vfpv4.d
@@ -3,7 +3,7 @@
 # as: -march=armv7ve+simd
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-sec.d b/gas/testsuite/gas/arm/attr-ext-sec.d
index 0e48879a9af..c97e9ac5003 100644
--- a/gas/testsuite/gas/arm/attr-ext-sec.d
+++ b/gas/testsuite/gas/arm/attr-ext-sec.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-a+sec
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-vfpv3-d16-fp16.d b/gas/testsuite/gas/arm/attr-ext-vfpv3-d16-fp16.d
index f7150b98e9a..164894d5f2d 100644
--- a/gas/testsuite/gas/arm/attr-ext-vfpv3-d16-fp16.d
+++ b/gas/testsuite/gas/arm/attr-ext-vfpv3-d16-fp16.d
@@ -3,7 +3,7 @@
 # as: -march=armv7ve+vfpv3-d16-fp16
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-vfpv3-d16.d b/gas/testsuite/gas/arm/attr-ext-vfpv3-d16.d
index 90799e6d80d..d0ca0b63fab 100644
--- a/gas/testsuite/gas/arm/attr-ext-vfpv3-d16.d
+++ b/gas/testsuite/gas/arm/attr-ext-vfpv3-d16.d
@@ -3,7 +3,7 @@
 # as: -march=armv7+fp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-vfpv3-fp16.d b/gas/testsuite/gas/arm/attr-ext-vfpv3-fp16.d
index 13412319ef5..c63dfad7b5f 100644
--- a/gas/testsuite/gas/arm/attr-ext-vfpv3-fp16.d
+++ b/gas/testsuite/gas/arm/attr-ext-vfpv3-fp16.d
@@ -3,7 +3,7 @@
 # as: -march=armv7ve+vfpv3-fp16
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-vfpv3.d b/gas/testsuite/gas/arm/attr-ext-vfpv3.d
index 7c7ed5388d6..07ba7f3c487 100644
--- a/gas/testsuite/gas/arm/attr-ext-vfpv3.d
+++ b/gas/testsuite/gas/arm/attr-ext-vfpv3.d
@@ -3,7 +3,7 @@
 # as: -march=armv7a+vfpv3
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-vfpv3xd-fp.d b/gas/testsuite/gas/arm/attr-ext-vfpv3xd-fp.d
index bd510562e76..6a2f4db6eac 100644
--- a/gas/testsuite/gas/arm/attr-ext-vfpv3xd-fp.d
+++ b/gas/testsuite/gas/arm/attr-ext-vfpv3xd-fp.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-r+vfpv3xd-fp16
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-vfpv3xd.d b/gas/testsuite/gas/arm/attr-ext-vfpv3xd.d
index 3ced8198abf..09cc449dcb0 100644
--- a/gas/testsuite/gas/arm/attr-ext-vfpv3xd.d
+++ b/gas/testsuite/gas/arm/attr-ext-vfpv3xd.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-r+fp.sp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-vfpv4-d16.d b/gas/testsuite/gas/arm/attr-ext-vfpv4-d16.d
index 6e1a1603842..f92f3e77103 100644
--- a/gas/testsuite/gas/arm/attr-ext-vfpv4-d16.d
+++ b/gas/testsuite/gas/arm/attr-ext-vfpv4-d16.d
@@ -3,7 +3,7 @@
 # as: -march=armv7ve+fp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-vfpv4-sp-d16.d b/gas/testsuite/gas/arm/attr-ext-vfpv4-sp-d16.d
index 06bb494da29..4d1073dad4b 100644
--- a/gas/testsuite/gas/arm/attr-ext-vfpv4-sp-d16.d
+++ b/gas/testsuite/gas/arm/attr-ext-vfpv4-sp-d16.d
@@ -3,7 +3,7 @@
 # as: -march=armv7e-m+fp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-ext-vfpv4.d b/gas/testsuite/gas/arm/attr-ext-vfpv4.d
index 397fba34059..27e0b8d0de5 100644
--- a/gas/testsuite/gas/arm/attr-ext-vfpv4.d
+++ b/gas/testsuite/gas/arm/attr-ext-vfpv4.d
@@ -3,7 +3,7 @@
 # as: -march=armv7ve+vfpv4
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-all.d b/gas/testsuite/gas/arm/attr-march-all.d
index e051691428a..b884367c8db 100644
--- a/gas/testsuite/gas/arm/attr-march-all.d
+++ b/gas/testsuite/gas/arm/attr-march-all.d
@@ -3,7 +3,7 @@
 # as: -march=all
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv1.d b/gas/testsuite/gas/arm/attr-march-armv1.d
index d9730b5d58b..fe5afa8a8f5 100644
--- a/gas/testsuite/gas/arm/attr-march-armv1.d
+++ b/gas/testsuite/gas/arm/attr-march-armv1.d
@@ -3,7 +3,7 @@
 # as: -march=armv1
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv2.d b/gas/testsuite/gas/arm/attr-march-armv2.d
index 39e33719295..92da7cb5d5e 100644
--- a/gas/testsuite/gas/arm/attr-march-armv2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv2.d
@@ -3,7 +3,7 @@
 # as: -march=armv2
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv2a.d b/gas/testsuite/gas/arm/attr-march-armv2a.d
index 2c4dd620d3d..b02a67edfb8 100644
--- a/gas/testsuite/gas/arm/attr-march-armv2a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv2a.d
@@ -3,7 +3,7 @@
 # as: -march=armv2a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv2s.d b/gas/testsuite/gas/arm/attr-march-armv2s.d
index dfd17d2b377..fec5fe74870 100644
--- a/gas/testsuite/gas/arm/attr-march-armv2s.d
+++ b/gas/testsuite/gas/arm/attr-march-armv2s.d
@@ -3,7 +3,7 @@
 # as: -march=armv2s
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv3.d b/gas/testsuite/gas/arm/attr-march-armv3.d
index 988f8965293..7c1b28daaea 100644
--- a/gas/testsuite/gas/arm/attr-march-armv3.d
+++ b/gas/testsuite/gas/arm/attr-march-armv3.d
@@ -3,7 +3,7 @@
 # as: -march=armv3
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv3m.d b/gas/testsuite/gas/arm/attr-march-armv3m.d
index c946b37177a..695768a4568 100644
--- a/gas/testsuite/gas/arm/attr-march-armv3m.d
+++ b/gas/testsuite/gas/arm/attr-march-armv3m.d
@@ -3,7 +3,7 @@
 # as: -march=armv3m
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv4.d b/gas/testsuite/gas/arm/attr-march-armv4.d
index ab08cce240c..ed1309e201d 100644
--- a/gas/testsuite/gas/arm/attr-march-armv4.d
+++ b/gas/testsuite/gas/arm/attr-march-armv4.d
@@ -3,7 +3,7 @@
 # as: -march=armv4
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv4t.d b/gas/testsuite/gas/arm/attr-march-armv4t.d
index 1aa0303bce8..7f6b4b327b6 100644
--- a/gas/testsuite/gas/arm/attr-march-armv4t.d
+++ b/gas/testsuite/gas/arm/attr-march-armv4t.d
@@ -3,7 +3,7 @@
 # as: -march=armv4t
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv4txm.d b/gas/testsuite/gas/arm/attr-march-armv4txm.d
index 9047d585faa..630a83b1bce 100644
--- a/gas/testsuite/gas/arm/attr-march-armv4txm.d
+++ b/gas/testsuite/gas/arm/attr-march-armv4txm.d
@@ -3,7 +3,7 @@
 # as: -march=armv4txm
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv4xm.d b/gas/testsuite/gas/arm/attr-march-armv4xm.d
index be8e22f676d..5c3520b9d62 100644
--- a/gas/testsuite/gas/arm/attr-march-armv4xm.d
+++ b/gas/testsuite/gas/arm/attr-march-armv4xm.d
@@ -3,7 +3,7 @@
 # as: -march=armv4xm
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv5.d b/gas/testsuite/gas/arm/attr-march-armv5.d
index 1faa9077420..0a73c44e33b 100644
--- a/gas/testsuite/gas/arm/attr-march-armv5.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5.d
@@ -3,7 +3,7 @@
 # as: -march=armv5
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv5t.d b/gas/testsuite/gas/arm/attr-march-armv5t.d
index e0e528a4f5e..bac05e16954 100644
--- a/gas/testsuite/gas/arm/attr-march-armv5t.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5t.d
@@ -3,7 +3,7 @@
 # as: -march=armv5t
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv5te.d b/gas/testsuite/gas/arm/attr-march-armv5te.d
index 7618f193a66..581a76a9b7c 100644
--- a/gas/testsuite/gas/arm/attr-march-armv5te.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5te.d
@@ -3,7 +3,7 @@
 # as: -march=armv5te
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv5tej.d b/gas/testsuite/gas/arm/attr-march-armv5tej.d
index 374bebd4e7c..383523594b3 100644
--- a/gas/testsuite/gas/arm/attr-march-armv5tej.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5tej.d
@@ -3,7 +3,7 @@
 # as: -march=armv5tej
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv5texp.d b/gas/testsuite/gas/arm/attr-march-armv5texp.d
index d52396b7bb6..412a6e7b743 100644
--- a/gas/testsuite/gas/arm/attr-march-armv5texp.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5texp.d
@@ -3,7 +3,7 @@
 # as: -march=armv5texp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv5txm.d b/gas/testsuite/gas/arm/attr-march-armv5txm.d
index 4af55ad27dd..ffcaf281791 100644
--- a/gas/testsuite/gas/arm/attr-march-armv5txm.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5txm.d
@@ -3,7 +3,7 @@
 # as: -march=armv5txm
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6-m+os.d b/gas/testsuite/gas/arm/attr-march-armv6-m+os.d
index e766cee41cb..7654ea08791 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6-m+os.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6-m+os.d
@@ -3,7 +3,7 @@
 # as: -march=armv6-m+os
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6-m.d b/gas/testsuite/gas/arm/attr-march-armv6-m.d
index fc0f96fc73c..204a184fb1a 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6-m.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6-m.d
@@ -3,7 +3,7 @@
 # as: -march=armv6-m
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6.d b/gas/testsuite/gas/arm/attr-march-armv6.d
index 369deeca1ce..3c71b085de4 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6.d
@@ -3,7 +3,7 @@
 # as: -march=armv6
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6j.d b/gas/testsuite/gas/arm/attr-march-armv6j.d
index 0175f782e3b..37df267942c 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6j.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6j.d
@@ -3,7 +3,7 @@
 # as: -march=armv6j
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6k+sec.d b/gas/testsuite/gas/arm/attr-march-armv6k+sec.d
index 083151f4e3d..a6876203f43 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6k+sec.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6k+sec.d
@@ -3,7 +3,7 @@
 # as: -march=armv6k+sec
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6k.d b/gas/testsuite/gas/arm/attr-march-armv6k.d
index 9f6d48f3ccd..25de27d952a 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6k.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6k.d
@@ -3,7 +3,7 @@
 # as: -march=armv6k
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6kt2.d b/gas/testsuite/gas/arm/attr-march-armv6kt2.d
index c5abdacb66d..7c68f6adcf6 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6kt2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6kt2.d
@@ -3,7 +3,7 @@
 # as: -march=armv6kt2
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6kz.d b/gas/testsuite/gas/arm/attr-march-armv6kz.d
index fa0b5a00932..5ab9377f039 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6kz.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6kz.d
@@ -3,7 +3,7 @@
 # as: -march=armv6kz
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6kzt2.d b/gas/testsuite/gas/arm/attr-march-armv6kzt2.d
index 1672a1f62b6..abe66e7b3d8 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6kzt2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6kzt2.d
@@ -3,7 +3,7 @@
 # as: -march=armv6kzt2
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6s-m.d b/gas/testsuite/gas/arm/attr-march-armv6s-m.d
index fc0f96fc73c..204a184fb1a 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6s-m.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6s-m.d
@@ -3,7 +3,7 @@
 # as: -march=armv6-m
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6t2.d b/gas/testsuite/gas/arm/attr-march-armv6t2.d
index 2b63a81f65f..7e8025919ea 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6t2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6t2.d
@@ -3,7 +3,7 @@
 # as: -march=armv6t2
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6z.d b/gas/testsuite/gas/arm/attr-march-armv6z.d
index d1a48d80de3..ca1ac23d59d 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6z.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6z.d
@@ -3,7 +3,7 @@
 # as: -march=armv6z
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6zk.d b/gas/testsuite/gas/arm/attr-march-armv6zk.d
index c1f3722ab24..ed98ec35e4a 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6zk.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6zk.d
@@ -3,7 +3,7 @@
 # as: -march=armv6zk
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6zkt2.d b/gas/testsuite/gas/arm/attr-march-armv6zkt2.d
index c15de8b3bf0..a161f2655c2 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6zkt2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6zkt2.d
@@ -3,7 +3,7 @@
 # as: -march=armv6zkt2
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6zt2.d b/gas/testsuite/gas/arm/attr-march-armv6zt2.d
index a21d01a035c..58f5de6d1cb 100644
--- a/gas/testsuite/gas/arm/attr-march-armv6zt2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6zt2.d
@@ -3,7 +3,7 @@
 # as: -march=armv6zt2
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a+idiv.d b/gas/testsuite/gas/arm/attr-march-armv7-a+idiv.d
index 3a023c30fc0..d3998ab8c8b 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7-a+idiv.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a+idiv.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-a+idiv
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d b/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d
index b08b9d86b39..3df82638460 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-a+mp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a+sec+virt.d b/gas/testsuite/gas/arm/attr-march-armv7-a+sec+virt.d
index f1cf01442b4..1ed4fe30475 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7-a+sec+virt.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a+sec+virt.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-a+sec+virt
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d b/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d
index 69bb928d9a1..9955b28a1b0 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-a+sec
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a+virt.d b/gas/testsuite/gas/arm/attr-march-armv7-a+virt.d
index 82f0242024a..6908e830b01 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7-a+virt.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a+virt.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-a+virt
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a.d b/gas/testsuite/gas/arm/attr-march-armv7-a.d
index 3626701509e..0427c2deff6 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-m.d b/gas/testsuite/gas/arm/attr-march-armv7-m.d
index 51d6a8209df..d682ef1fcd3 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7-m.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-m.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-m
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-r+mp.d b/gas/testsuite/gas/arm/attr-march-armv7-r+mp.d
index 00618b3595f..ceeb972fb67 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7-r+mp.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-r+mp.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-r+mp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-r.d b/gas/testsuite/gas/arm/attr-march-armv7-r.d
index cf89007d323..7740d6372a5 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7-r.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-r.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-r
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7.d b/gas/testsuite/gas/arm/attr-march-armv7.d
index d2252a15564..c503245a1dc 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7.d
@@ -3,7 +3,7 @@
 # as: -march=armv7
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7a.d b/gas/testsuite/gas/arm/attr-march-armv7a.d
index db45e9e6b36..6a28570696d 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7a.d
@@ -3,7 +3,7 @@
 # as: -march=armv7a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7em.d b/gas/testsuite/gas/arm/attr-march-armv7em.d
index f8e5350013a..80a66529f28 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7em.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7em.d
@@ -3,7 +3,7 @@
 # as: -march=armv7e-m
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7m.d b/gas/testsuite/gas/arm/attr-march-armv7m.d
index 35c6b241dd8..ebf0a0950df 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7m.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7m.d
@@ -3,7 +3,7 @@
 # as: -march=armv7m
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7r.d b/gas/testsuite/gas/arm/attr-march-armv7r.d
index 33fbad6cb83..1c0883b1c8b 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7r.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7r.d
@@ -3,7 +3,7 @@
 # as: -march=armv7r
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7ve.d b/gas/testsuite/gas/arm/attr-march-armv7ve.d
index 604183f2b4a..65107a4bdfd 100644
--- a/gas/testsuite/gas/arm/attr-march-armv7ve.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7ve.d
@@ -3,7 +3,7 @@
 # as: -march=armv7ve
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8-a+crypto.d b/gas/testsuite/gas/arm/attr-march-armv8-a+crypto.d
index 776e4140d7c..c680a1f737b 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8-a+crypto.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8-a+crypto.d
@@ -3,7 +3,7 @@
 # as: -march=armv8-a+crypto
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8-a+fp.d b/gas/testsuite/gas/arm/attr-march-armv8-a+fp.d
index a909f7154fc..3c9e7e13c9d 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8-a+fp.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8-a+fp.d
@@ -3,7 +3,7 @@
 # as: -march=armv8-a+fp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8-a+rdma.d b/gas/testsuite/gas/arm/attr-march-armv8-a+rdma.d
index 76414d0223a..92afbf24bbd 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8-a+rdma.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8-a+rdma.d
@@ -3,7 +3,7 @@
 # as: -march=armv8-a+rdma
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8-a+simd.d b/gas/testsuite/gas/arm/attr-march-armv8-a+simd.d
index 78838c3297b..60a2371a5bf 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8-a+simd.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8-a+simd.d
@@ -3,7 +3,7 @@
 # as: -march=armv8-a+simd
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8-a.d b/gas/testsuite/gas/arm/attr-march-armv8-a.d
index fb8959692fe..b1ce64d42f0 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8-a.d
@@ -3,7 +3,7 @@
 # as: -march=armv8-a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8-r+crypto.d b/gas/testsuite/gas/arm/attr-march-armv8-r+crypto.d
index 5bd0fc5f371..9108f349441 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8-r+crypto.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8-r+crypto.d
@@ -3,7 +3,7 @@
 # as: -march=armv8-r+crypto
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8-r+fp.d b/gas/testsuite/gas/arm/attr-march-armv8-r+fp.d
index afd5a756d02..98140368657 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8-r+fp.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8-r+fp.d
@@ -3,7 +3,7 @@
 # as: -march=armv8-r+fp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8-r+simd.d b/gas/testsuite/gas/arm/attr-march-armv8-r+simd.d
index 8c8578a78f1..2eea4cd5439 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8-r+simd.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8-r+simd.d
@@ -3,7 +3,7 @@
 # as: -march=armv8-r+simd
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8-r.d b/gas/testsuite/gas/arm/attr-march-armv8-r.d
index cf4b3a51f80..79e840129e2 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8-r.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8-r.d
@@ -3,7 +3,7 @@
 # as: -march=armv8-r
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8_1-a+simd.d b/gas/testsuite/gas/arm/attr-march-armv8_1-a+simd.d
index de002a6a3b8..89368f65248 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8_1-a+simd.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8_1-a+simd.d
@@ -3,7 +3,7 @@
 # as: -march=armv8.1-a+simd
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8_1-m.main.d b/gas/testsuite/gas/arm/attr-march-armv8_1-m.main.d
index acae2e31fe1..787f645ab53 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8_1-m.main.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8_1-m.main.d
@@ -3,7 +3,7 @@
 # as: -march=armv8.1-m.main
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8_4-a.d b/gas/testsuite/gas/arm/attr-march-armv8_4-a.d
index af3e52b4bb9..055165f7071 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8_4-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8_4-a.d
@@ -3,7 +3,7 @@
 # as: -march=armv8.4-a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8_5-a.d b/gas/testsuite/gas/arm/attr-march-armv8_5-a.d
index 70b6074e48f..057a55bb856 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8_5-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8_5-a.d
@@ -3,7 +3,7 @@
 # as: -march=armv8.5-a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8_6-a.d b/gas/testsuite/gas/arm/attr-march-armv8_6-a.d
index 73bcbaf35e8..15c13cb38d1 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8_6-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8_6-a.d
@@ -3,7 +3,7 @@
 # as: -march=armv8.6-a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8_7-a.d b/gas/testsuite/gas/arm/attr-march-armv8_7-a.d
index 38f04297c2f..d6ced4b10aa 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8_7-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8_7-a.d
@@ -3,7 +3,7 @@
 # as: -march=armv8.7-a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8_8-a.d b/gas/testsuite/gas/arm/attr-march-armv8_8-a.d
index 64db0009290..cdb3d14a6db 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8_8-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8_8-a.d
@@ -3,7 +3,7 @@
 # as: -march=armv8.8-a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8_9-a.d b/gas/testsuite/gas/arm/attr-march-armv8_9-a.d
index e1d8feb400a..aa969374a70 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8_9-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8_9-a.d
@@ -3,7 +3,7 @@
 # as: -march=armv8.9-a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8m.base.d b/gas/testsuite/gas/arm/attr-march-armv8m.base.d
index d661cabea2d..10ba7d4c6f5 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8m.base.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8m.base.d
@@ -3,7 +3,7 @@
 # as: -march=armv8-m.base
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8m.main.d b/gas/testsuite/gas/arm/attr-march-armv8m.main.d
index 7a194e20936..cd19a6e768b 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8m.main.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8m.main.d
@@ -3,7 +3,7 @@
 # as: -march=armv8-m.main
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv8m.main.dsp.d b/gas/testsuite/gas/arm/attr-march-armv8m.main.dsp.d
index 56600d3c268..8c6d291d5a1 100644
--- a/gas/testsuite/gas/arm/attr-march-armv8m.main.dsp.d
+++ b/gas/testsuite/gas/arm/attr-march-armv8m.main.dsp.d
@@ -3,7 +3,7 @@
 # as: -march=armv8-m.main+dsp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv9_1-a.d b/gas/testsuite/gas/arm/attr-march-armv9_1-a.d
index abde8c2db9d..cea559d205d 100644
--- a/gas/testsuite/gas/arm/attr-march-armv9_1-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv9_1-a.d
@@ -3,7 +3,7 @@
 # as: -march=armv9.1-a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv9_2-a.d b/gas/testsuite/gas/arm/attr-march-armv9_2-a.d
index 891576c4078..2048c4db51b 100644
--- a/gas/testsuite/gas/arm/attr-march-armv9_2-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv9_2-a.d
@@ -3,7 +3,7 @@
 # as: -march=armv9.2-a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv9_3-a.d b/gas/testsuite/gas/arm/attr-march-armv9_3-a.d
index 3ed4d814015..1360a237784 100644
--- a/gas/testsuite/gas/arm/attr-march-armv9_3-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv9_3-a.d
@@ -3,7 +3,7 @@
 # as: -march=armv9.3-a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv9_4-a.d b/gas/testsuite/gas/arm/attr-march-armv9_4-a.d
index b989114bf3e..19287c2ce18 100644
--- a/gas/testsuite/gas/arm/attr-march-armv9_4-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv9_4-a.d
@@ -3,7 +3,7 @@
 # as: -march=armv9.4-a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv9_5-a.d b/gas/testsuite/gas/arm/attr-march-armv9_5-a.d
index d8c83946eb6..12698bb6f92 100644
--- a/gas/testsuite/gas/arm/attr-march-armv9_5-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv9_5-a.d
@@ -3,7 +3,7 @@
 # as: -march=armv9.5-a
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-iwmmxt.d b/gas/testsuite/gas/arm/attr-march-iwmmxt.d
index 879e7fcc1b6..d173a082924 100644
--- a/gas/testsuite/gas/arm/attr-march-iwmmxt.d
+++ b/gas/testsuite/gas/arm/attr-march-iwmmxt.d
@@ -3,7 +3,7 @@
 # as: -march=iwmmxt
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-iwmmxt2.d b/gas/testsuite/gas/arm/attr-march-iwmmxt2.d
index 664bfac1f68..bd264947227 100644
--- a/gas/testsuite/gas/arm/attr-march-iwmmxt2.d
+++ b/gas/testsuite/gas/arm/attr-march-iwmmxt2.d
@@ -3,7 +3,7 @@
 # as: -march=iwmmxt2
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-xscale.d b/gas/testsuite/gas/arm/attr-march-xscale.d
index da4eaa91dc5..76c90ef667a 100644
--- a/gas/testsuite/gas/arm/attr-march-xscale.d
+++ b/gas/testsuite/gas/arm/attr-march-xscale.d
@@ -3,7 +3,7 @@
 # as: -march=xscale
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mcpu.d b/gas/testsuite/gas/arm/attr-mcpu.d
index bf1a4e8347b..3029a4a0ff1 100644
--- a/gas/testsuite/gas/arm/attr-mcpu.d
+++ b/gas/testsuite/gas/arm/attr-mcpu.d
@@ -3,7 +3,7 @@
 # as: -mcpu=cortex-a8 -mfpu=neon
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d b/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d
index c9467a1b416..e745d64c5d4 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d
@@ -3,7 +3,7 @@
 # as: -mfpu=arm1020e
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d b/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d
index 771258148f9..ef105b4721c 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d
@@ -3,7 +3,7 @@
 # as: -mfpu=arm1020t
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d b/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d
index 7e32c61faf8..3ef7ba6bef2 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d
@@ -3,7 +3,7 @@
 # as: -mfpu=arm1136jf-s
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d b/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d
index 3eff1e61a35..4e002c5de52 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d
@@ -3,7 +3,7 @@
 # as: -mfpu=arm1136jfs
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d b/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d
index 9a6369aef0a..61aa9299ab3 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d
@@ -3,7 +3,7 @@
 # as: -march=armv7-a+neon-fp16
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 #...
   Tag_ARM_ISA_use: Yes
   Tag_THUMB_ISA_use: Thumb-2
diff --git a/gas/testsuite/gas/arm/attr-mfpu-neon.d b/gas/testsuite/gas/arm/attr-mfpu-neon.d
index 1bc1054d51e..e6d5279bb9e 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-neon.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-neon.d
@@ -3,7 +3,7 @@
 # as: -mfpu=neon
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d b/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d
index 92b7d41823a..915e85fa265 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d
@@ -3,7 +3,7 @@
 # as: -mfpu=softvfp+vfp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-softvfp.d b/gas/testsuite/gas/arm/attr-mfpu-softvfp.d
index edff4c38883..b56f76e6807 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-softvfp.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-softvfp.d
@@ -3,7 +3,7 @@
 # as: -mfpu=softvfp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp.d b/gas/testsuite/gas/arm/attr-mfpu-vfp.d
index 3ba2be528d5..cba3301f559 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp.d
@@ -3,7 +3,7 @@
 # as: -mfpu=vfp
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d b/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d
index 0c413e6c50d..173fd107b71 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d
@@ -3,7 +3,7 @@
 # as: -mfpu=vfp10-r0
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp10.d b/gas/testsuite/gas/arm/attr-mfpu-vfp10.d
index 62e30026ab8..b8920a4fd8c 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp10.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp10.d
@@ -3,7 +3,7 @@
 # as: -mfpu=vfp10
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp3.d b/gas/testsuite/gas/arm/attr-mfpu-vfp3.d
index 5b084028652..38600346e3e 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp3.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp3.d
@@ -3,7 +3,7 @@
 # as: -mfpu=vfp3
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp9.d b/gas/testsuite/gas/arm/attr-mfpu-vfp9.d
index 4ffa91d96f2..9f16ca0296f 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp9.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp9.d
@@ -3,7 +3,7 @@
 # as: -mfpu=vfp9
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d
index c0a0a96d307..5524507d60f 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d
@@ -3,7 +3,7 @@
 # as: -mfpu=vfpv2
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d
index 5ed90d576a6..68467c1b0a9 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d
@@ -3,7 +3,7 @@
 # as: -mfpu=vfpv3-d16
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d
index 7b63286b3cd..a946f95cedb 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d
@@ -3,7 +3,7 @@
 # as: -mfpu=vfpv3
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d
index a749d7b1007..7e0b83449a5 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d
@@ -3,7 +3,7 @@
 # as: -mfpu=vfpv4-d16
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d
index e00a3d933c2..7f6895b23ad 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d
@@ -3,7 +3,7 @@
 # as: -mfpu=vfpv4
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d b/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d
index 2b2417155b8..2214a5ba385 100644
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d
@@ -3,7 +3,7 @@
 # as: -mfpu=vfpxd
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-names.d b/gas/testsuite/gas/arm/attr-names.d
index 56e4a7a30dc..7d60a982dff 100644
--- a/gas/testsuite/gas/arm/attr-names.d
+++ b/gas/testsuite/gas/arm/attr-names.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-non-null-terminated-string.d b/gas/testsuite/gas/arm/attr-non-null-terminated-string.d
index ac376a9ab9f..e7e1771c3b2 100644
--- a/gas/testsuite/gas/arm/attr-non-null-terminated-string.d
+++ b/gas/testsuite/gas/arm/attr-non-null-terminated-string.d
@@ -1,7 +1,7 @@
 # name: EABI attribute - non-null terminated string
 # source: attr-non-null-terminated-string.s
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 # as:
 # readelf: --silent-truncation -A
 Attribute Section: aeabi
diff --git a/gas/testsuite/gas/arm/attr-order.d b/gas/testsuite/gas/arm/attr-order.d
index 56a192f0c1a..da73153b23e 100644
--- a/gas/testsuite/gas/arm/attr-order.d
+++ b/gas/testsuite/gas/arm/attr-order.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-override-cpu-directive.d b/gas/testsuite/gas/arm/attr-override-cpu-directive.d
index a87058481d4..042f56cccdc 100644
--- a/gas/testsuite/gas/arm/attr-override-cpu-directive.d
+++ b/gas/testsuite/gas/arm/attr-override-cpu-directive.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/attr-override-mcpu.d b/gas/testsuite/gas/arm/attr-override-mcpu.d
index 316b88e055f..cee135d7e86 100644
--- a/gas/testsuite/gas/arm/attr-override-mcpu.d
+++ b/gas/testsuite/gas/arm/attr-override-mcpu.d
@@ -3,7 +3,7 @@
 # as: -mcpu=cortex-a8
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/bl-local-2.d b/gas/testsuite/gas/arm/bl-local-2.d
index ba75aeeb617..3a9a5ff0e01 100644
--- a/gas/testsuite/gas/arm/bl-local-2.d
+++ b/gas/testsuite/gas/arm/bl-local-2.d
@@ -1,6 +1,6 @@
 #name: bl local conversion to blx
 #objdump: -drw --prefix-addresses --show-raw-insn
-#target: *-*-*eabi* *-*-nacl*
+#target: *-*-*eabi*
 #as:
 
 
diff --git a/gas/testsuite/gas/arm/bl-local-v4t.d b/gas/testsuite/gas/arm/bl-local-v4t.d
index 11af135bdcd..29a46b39cf3 100644
--- a/gas/testsuite/gas/arm/bl-local-v4t.d
+++ b/gas/testsuite/gas/arm/bl-local-v4t.d
@@ -1,6 +1,6 @@
 #name: bl local instructions for v4t.
 #objdump: -drw --prefix-addresses --show-raw-insn
-#target: *-*-*eabi* *-*-nacl*
+#target: *-*-*eabi*
 #as:
 
 .*: +file format .*arm.*
diff --git a/gas/testsuite/gas/arm/blx-local.d b/gas/testsuite/gas/arm/blx-local.d
index 44c885c8ee2..6bd7b190e03 100644
--- a/gas/testsuite/gas/arm/blx-local.d
+++ b/gas/testsuite/gas/arm/blx-local.d
@@ -1,6 +1,6 @@
 #name: Local BLX instructions
 #objdump: -drw --prefix-addresses --show-raw-insn
-#target: *-*-*eabi* *-*-nacl*
+#target: *-*-*eabi*
 #as:
 #warning_output: blx-local.l
 # Test assembler resolution of blx and bl instructions in ARM mode.
diff --git a/gas/testsuite/gas/arm/branch-reloc.d b/gas/testsuite/gas/arm/branch-reloc.d
index 118c4b8553f..e195fa44157 100644
--- a/gas/testsuite/gas/arm/branch-reloc.d
+++ b/gas/testsuite/gas/arm/branch-reloc.d
@@ -1,6 +1,6 @@
 #name: Inter-section branch relocations
 #This test is only valid on EABI based ports.
-#target: *-*-*eabi* *-*-nacl*
+#target: *-*-*eabi*
 #as: -march=armv5t
 #objdump: -rd
 #warning_output: branch-reloc.l
diff --git a/gas/testsuite/gas/arm/directives.d b/gas/testsuite/gas/arm/directives.d
index 66002188a9c..8d83b30e391 100644
--- a/gas/testsuite/gas/arm/directives.d
+++ b/gas/testsuite/gas/arm/directives.d
@@ -3,7 +3,7 @@
 # as: --fatal-warnings
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/got_prel.d b/gas/testsuite/gas/arm/got_prel.d
index ad415f3afda..b32848db93c 100644
--- a/gas/testsuite/gas/arm/got_prel.d
+++ b/gas/testsuite/gas/arm/got_prel.d
@@ -2,7 +2,7 @@
 # source: got_prel.s
 # as: -march=armv5te -meabi=5 --generate-missing-build-notes=no
 # readelf: -x 4 -r
-# target: *-*-*eabi* *-*-linux-* *-*-elf *-*-nacl*
+# target: *-*-*eabi* *-*-linux-* *-*-elf
 
 Relocation section '.rel.text.foo' at offset .* contains 1 entry:
  Offset     Info    Type            Sym.Value  Sym. Name
diff --git a/gas/testsuite/gas/arm/mapdir.d b/gas/testsuite/gas/arm/mapdir.d
index b52bb0adb19..5032f88a64d 100644
--- a/gas/testsuite/gas/arm/mapdir.d
+++ b/gas/testsuite/gas/arm/mapdir.d
@@ -2,7 +2,7 @@
 #objdump: --syms --special-syms -d
 #name: ARM Mapping Symbols for .arm/.thumb
 # This test is only valid on EABI based ports.
-#target: *-*-*eabi* *-*-linux-* *-*-elf *-*-nacl*
+#target: *-*-*eabi* *-*-linux-* *-*-elf
 #source: mapdir.s
 
 
diff --git a/gas/testsuite/gas/arm/mapmisc.d b/gas/testsuite/gas/arm/mapmisc.d
index b67138ffdf6..e920252d7b0 100644
--- a/gas/testsuite/gas/arm/mapmisc.d
+++ b/gas/testsuite/gas/arm/mapmisc.d
@@ -2,7 +2,7 @@
 #objdump: --syms --special-syms -d
 #name: ARM Mapping Symbols for miscellaneous directives
 # This test is only valid on EABI based ports.
-#target: *-*-*eabi* *-*-linux-* *-*-elf *-*-nacl*
+#target: *-*-*eabi* *-*-linux-* *-*-elf
 #source: mapmisc.s
 
 
diff --git a/gas/testsuite/gas/arm/mapsecs.d b/gas/testsuite/gas/arm/mapsecs.d
index 5f013be401a..d5aaf445977 100644
--- a/gas/testsuite/gas/arm/mapsecs.d
+++ b/gas/testsuite/gas/arm/mapsecs.d
@@ -2,7 +2,7 @@
 #objdump: --syms --special-syms -d
 #name: ARM Mapping Symbols with multiple sections
 # This test is only valid on EABI based ports.
-#target: *-*-*eabi* *-*-linux-* *-*-elf *-*-nacl*
+#target: *-*-*eabi* *-*-linux-* *-*-elf
 #source: mapsecs.s
 
 
diff --git a/gas/testsuite/gas/arm/mapshort-eabi.d b/gas/testsuite/gas/arm/mapshort-eabi.d
index 8ec5b6d08db..54b4bc98587 100644
--- a/gas/testsuite/gas/arm/mapshort-eabi.d
+++ b/gas/testsuite/gas/arm/mapshort-eabi.d
@@ -2,7 +2,7 @@
 #as:  --generate-missing-build-notes=no
 #name: ARM Mapping Symbols for .short (EABI version)
 # This test is only valid on EABI based ports.
-#target: *-*-*eabi* *-*-linux-* *-*-elf *-*-nacl*
+#target: *-*-*eabi* *-*-linux-* *-*-elf
 #source: mapshort.s
 
 # Test the generation and use of ARM ELF Mapping Symbols
diff --git a/gas/testsuite/gas/arm/mov-highregs-any.d b/gas/testsuite/gas/arm/mov-highregs-any.d
index a6be0065c7e..deca3ddaf04 100644
--- a/gas/testsuite/gas/arm/mov-highregs-any.d
+++ b/gas/testsuite/gas/arm/mov-highregs-any.d
@@ -1,6 +1,6 @@
 # name: MOV highregs
 # readelf: -A
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 Attribute Section: aeabi
 File Attributes
   Tag_CPU_arch: v4T
diff --git a/gas/testsuite/gas/arm/mov-lowregs-any.d b/gas/testsuite/gas/arm/mov-lowregs-any.d
index 7e29e1349ff..3cdaf0b1ff7 100644
--- a/gas/testsuite/gas/arm/mov-lowregs-any.d
+++ b/gas/testsuite/gas/arm/mov-lowregs-any.d
@@ -1,6 +1,6 @@
 # name: MOV lowregs
 # readelf: -A
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 Attribute Section: aeabi
 File Attributes
   Tag_CPU_arch: v6
diff --git a/gas/testsuite/gas/arm/note-march-armv2.d b/gas/testsuite/gas/arm/note-march-armv2.d
index f7af35a9290..3bcc4b9b36c 100644
--- a/gas/testsuite/gas/arm/note-march-armv2.d
+++ b/gas/testsuite/gas/arm/note-march-armv2.d
@@ -6,7 +6,7 @@
 # objcopy_linked_file:
 # readelf: -p .note.gnu.arm.ident
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 String dump of section '.note.gnu.arm.ident':
   \[\s*[0-9a-f]+\]  arch: 
diff --git a/gas/testsuite/gas/arm/note-march-armv2a.d b/gas/testsuite/gas/arm/note-march-armv2a.d
index 443a424718c..37790411ede 100644
--- a/gas/testsuite/gas/arm/note-march-armv2a.d
+++ b/gas/testsuite/gas/arm/note-march-armv2a.d
@@ -6,7 +6,7 @@
 # objcopy_linked_file:
 # readelf: -p .note.gnu.arm.ident
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 String dump of section '.note.gnu.arm.ident':
   \[\s*[0-9a-f]+\]  arch: 
diff --git a/gas/testsuite/gas/arm/note-march-armv3.d b/gas/testsuite/gas/arm/note-march-armv3.d
index d8dd724c52c..0d0b0d2fda4 100644
--- a/gas/testsuite/gas/arm/note-march-armv3.d
+++ b/gas/testsuite/gas/arm/note-march-armv3.d
@@ -6,7 +6,7 @@
 # objcopy_linked_file:
 # readelf: -p .note.gnu.arm.ident
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 String dump of section '.note.gnu.arm.ident':
   \[\s*[0-9a-f]+\]  arch: 
diff --git a/gas/testsuite/gas/arm/note-march-armv3m.d b/gas/testsuite/gas/arm/note-march-armv3m.d
index 5c402c470ee..5e5834904de 100644
--- a/gas/testsuite/gas/arm/note-march-armv3m.d
+++ b/gas/testsuite/gas/arm/note-march-armv3m.d
@@ -6,7 +6,7 @@
 # objcopy_linked_file:
 # readelf: -p .note.gnu.arm.ident
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 String dump of section '.note.gnu.arm.ident':
   \[\s*[0-9a-f]+\]  arch: 
diff --git a/gas/testsuite/gas/arm/note-march-armv4.d b/gas/testsuite/gas/arm/note-march-armv4.d
index 1882fa3f97a..2732fb7298e 100644
--- a/gas/testsuite/gas/arm/note-march-armv4.d
+++ b/gas/testsuite/gas/arm/note-march-armv4.d
@@ -6,7 +6,7 @@
 # objcopy_linked_file:
 # readelf: -p .note.gnu.arm.ident
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 String dump of section '.note.gnu.arm.ident':
   \[\s*[0-9a-f]+\]  arch: 
diff --git a/gas/testsuite/gas/arm/note-march-armv4t.d b/gas/testsuite/gas/arm/note-march-armv4t.d
index bcddcf17938..dd9890211bc 100644
--- a/gas/testsuite/gas/arm/note-march-armv4t.d
+++ b/gas/testsuite/gas/arm/note-march-armv4t.d
@@ -6,7 +6,7 @@
 # objcopy_linked_file:
 # readelf: -p .note.gnu.arm.ident
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 String dump of section '.note.gnu.arm.ident':
   \[\s*[0-9a-f]+\]  arch: 
diff --git a/gas/testsuite/gas/arm/note-march-armv5.d b/gas/testsuite/gas/arm/note-march-armv5.d
index bf6a81a04d6..f05925cc327 100644
--- a/gas/testsuite/gas/arm/note-march-armv5.d
+++ b/gas/testsuite/gas/arm/note-march-armv5.d
@@ -6,7 +6,7 @@
 # objcopy_linked_file:
 # readelf: -p .note.gnu.arm.ident
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 String dump of section '.note.gnu.arm.ident':
   \[\s*[0-9a-f]+\]  arch: 
diff --git a/gas/testsuite/gas/arm/note-march-armv5t.d b/gas/testsuite/gas/arm/note-march-armv5t.d
index 2761143091a..8de91b2966e 100644
--- a/gas/testsuite/gas/arm/note-march-armv5t.d
+++ b/gas/testsuite/gas/arm/note-march-armv5t.d
@@ -6,7 +6,7 @@
 # objcopy_linked_file:
 # readelf: -p .note.gnu.arm.ident
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 String dump of section '.note.gnu.arm.ident':
   \[\s*[0-9a-f]+\]  arch: 
diff --git a/gas/testsuite/gas/arm/note-march-armv5te.d b/gas/testsuite/gas/arm/note-march-armv5te.d
index 8003740135b..ccf5f6ead36 100644
--- a/gas/testsuite/gas/arm/note-march-armv5te.d
+++ b/gas/testsuite/gas/arm/note-march-armv5te.d
@@ -6,7 +6,7 @@
 # objcopy_linked_file:
 # readelf: -p .note.gnu.arm.ident
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 String dump of section '.note.gnu.arm.ident':
   \[\s*[0-9a-f]+\]  arch: 
diff --git a/gas/testsuite/gas/arm/note-march-iwmmxt.d b/gas/testsuite/gas/arm/note-march-iwmmxt.d
index eb3beede367..d4ca62c9b93 100644
--- a/gas/testsuite/gas/arm/note-march-iwmmxt.d
+++ b/gas/testsuite/gas/arm/note-march-iwmmxt.d
@@ -6,7 +6,7 @@
 # objcopy_linked_file:
 # readelf: -p .note.gnu.arm.ident
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 String dump of section '.note.gnu.arm.ident':
   \[\s*[0-9a-f]+\]  arch: 
diff --git a/gas/testsuite/gas/arm/note-march-iwmmxt2.d b/gas/testsuite/gas/arm/note-march-iwmmxt2.d
index 6c4a23a1abd..a631bd0c7f1 100644
--- a/gas/testsuite/gas/arm/note-march-iwmmxt2.d
+++ b/gas/testsuite/gas/arm/note-march-iwmmxt2.d
@@ -6,7 +6,7 @@
 # objcopy_linked_file:
 # readelf: -p .note.gnu.arm.ident
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 String dump of section '.note.gnu.arm.ident':
   \[\s*[0-9a-f]+\]  arch: 
diff --git a/gas/testsuite/gas/arm/note-march-xscale.d b/gas/testsuite/gas/arm/note-march-xscale.d
index d5943457c8d..6aef90fbc88 100644
--- a/gas/testsuite/gas/arm/note-march-xscale.d
+++ b/gas/testsuite/gas/arm/note-march-xscale.d
@@ -6,7 +6,7 @@
 # objcopy_linked_file:
 # readelf: -p .note.gnu.arm.ident
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 String dump of section '.note.gnu.arm.ident':
   \[\s*[0-9a-f]+\]  arch: 
diff --git a/gas/testsuite/gas/arm/pr12198-1.d b/gas/testsuite/gas/arm/pr12198-1.d
index 8c20b039846..7f6ce9621fd 100644
--- a/gas/testsuite/gas/arm/pr12198-1.d
+++ b/gas/testsuite/gas/arm/pr12198-1.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/pr12198-2.d b/gas/testsuite/gas/arm/pr12198-2.d
index 6469c3ed4a4..86f1602a207 100644
--- a/gas/testsuite/gas/arm/pr12198-2.d
+++ b/gas/testsuite/gas/arm/pr12198-2.d
@@ -3,7 +3,7 @@
 # as:
 # readelf: -A
 # This test is only valid on EABI based ports.
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 Attribute Section: aeabi
 File Attributes
diff --git a/gas/testsuite/gas/arm/thumb-eabi.d b/gas/testsuite/gas/arm/thumb-eabi.d
index 457e8cc9c20..3265aebb7ea 100644
--- a/gas/testsuite/gas/arm/thumb-eabi.d
+++ b/gas/testsuite/gas/arm/thumb-eabi.d
@@ -2,7 +2,7 @@
 # as: -mcpu=arm7t
 # objdump: -dr --prefix-addresses --show-raw-insn
 # source: thumb.s
-# target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/thumb.d b/gas/testsuite/gas/arm/thumb.d
index 3df33a93156..b7f883c5639 100644
--- a/gas/testsuite/gas/arm/thumb.d
+++ b/gas/testsuite/gas/arm/thumb.d
@@ -3,7 +3,7 @@
 # objdump: -dr --prefix-addresses --show-raw-insn
 # The arm-aout and arm-pe ports do not support Thumb branch relocations.
 # EABI targets have their own variant.
-# notarget: *-*-pe *-*-*eabi* *-*-nacl*
+# notarget: *-*-pe *-*-*eabi*
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/thumbrel.d b/gas/testsuite/gas/arm/thumbrel.d
index 1875115b058..aad5911cfe9 100644
--- a/gas/testsuite/gas/arm/thumbrel.d
+++ b/gas/testsuite/gas/arm/thumbrel.d
@@ -1,7 +1,7 @@
 #objdump: -sr
 #as:  --generate-missing-build-notes=no
 # This test is only valid on EABI based ports.
-#target: *-*-*eabi* *-*-nacl*
+# target: *-*-*eabi*
 
 .*:     file format.*
 
diff --git a/ld/Makefile.am b/ld/Makefile.am
index ccff9289924..90897a78f33 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -171,7 +171,6 @@ ALL_EMULATION_SOURCES = \
 	earmelf_linux.c \
 	earmelf_linux_eabi.c \
 	earmelf_linux_fdpiceabi.c \
-	earmelf_nacl.c \
 	earmelf_nbsd.c \
 	earmelf_phoenix.c \
 	earmelf_vxworks.c \
@@ -181,7 +180,6 @@ ALL_EMULATION_SOURCES = \
 	earmelfb_linux.c \
 	earmelfb_linux_eabi.c \
 	earmelfb_linux_fdpiceabi.c \
-	earmelfb_nacl.c \
 	earmelfb_nbsd.c \
 	earmnto.c \
 	earmpe.c \
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 3e24bd4deb2..b3d88f0e4b4 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -682,7 +682,6 @@ ALL_EMULATION_SOURCES = \
 	earmelf_linux.c \
 	earmelf_linux_eabi.c \
 	earmelf_linux_fdpiceabi.c \
-	earmelf_nacl.c \
 	earmelf_nbsd.c \
 	earmelf_phoenix.c \
 	earmelf_vxworks.c \
@@ -692,7 +691,6 @@ ALL_EMULATION_SOURCES = \
 	earmelfb_linux.c \
 	earmelfb_linux_eabi.c \
 	earmelfb_linux_fdpiceabi.c \
-	earmelfb_nacl.c \
 	earmelfb_nbsd.c \
 	earmnto.c \
 	earmpe.c \
@@ -1304,7 +1302,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_linux.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_linux_eabi.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_linux_fdpiceabi.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_nacl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_nbsd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_phoenix.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_vxworks.Po@am__quote@
@@ -1314,7 +1311,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_linux.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_linux_eabi.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_linux_fdpiceabi.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_nacl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_nbsd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmnto.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmpe.Po@am__quote@
diff --git a/ld/NEWS b/ld/NEWS
index 217c5b7b0d3..54c1df5aadf 100644
--- a/ld/NEWS
+++ b/ld/NEWS
@@ -1,5 +1,7 @@
 -*- text -*-
 
+* NaCl target support is removed.
+
 Changes in 2.45:
 
 * On s390 64-bit (s390x), generate SFrame stack trace information (.sframe)
diff --git a/ld/configure b/ld/configure
index 592bf9d51dc..015666d30a6 100755
--- a/ld/configure
+++ b/ld/configure
@@ -15582,7 +15582,7 @@ else
   case "${target}" in
   # Enable gnu hash only on GNU targets, but not mips
   mips*-*-*) enable_default_hash_style=sysv ;;
-  *-*-gnu* | *-*-linux* | *-*-nacl*) enable_default_hash_style=both ;;
+  *-*-gnu* | *-*-linux*) enable_default_hash_style=both ;;
   *) enable_default_hash_style=sysv ;;
 esac
 fi
diff --git a/ld/configure.ac b/ld/configure.ac
index b8241febc2e..af065fe7d4f 100644
--- a/ld/configure.ac
+++ b/ld/configure.ac
@@ -313,7 +313,7 @@ esac],
 [case "${target}" in
   # Enable gnu hash only on GNU targets, but not mips
   mips*-*-*) enable_default_hash_style=sysv ;;
-  *-*-gnu* | *-*-linux* | *-*-nacl*) enable_default_hash_style=both ;;
+  *-*-gnu* | *-*-linux*) enable_default_hash_style=both ;;
   *) enable_default_hash_style=sysv ;;
 esac])
 
diff --git a/ld/configure.tgt b/ld/configure.tgt
index ea01ccf9a1b..3f49485ae9f 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -231,14 +231,6 @@ arm*-*-linux-*)		targ_emul=armelf_linux
 			targ_extra_emuls="armelf armelfb armelfb_linux"
 			targ_extra_libpath="armelfb_linux"
 			;;
-arm*b-*-nacl*)		targ_emul=armelfb_nacl
-			targ_extra_emuls="armelf_nacl"
-			targ_extra_libpath=$targ_extra_emuls
-			;;
-arm*-*-nacl*)		targ_emul=armelf_nacl
-			targ_extra_emuls="armelfb_nacl"
-			targ_extra_libpath=$targ_extra_emuls
-			;;
 arm*-*-uclinux*eabi*)	targ_emul=armelf_linux_eabi
 			targ_extra_emuls=armelfb_linux_eabi
 			targ_extra_libpath=$targ_extra_emuls
diff --git a/ld/emulparams/armelf_nacl.sh b/ld/emulparams/armelf_nacl.sh
deleted file mode 100644
index 3d5a3b0285c..00000000000
--- a/ld/emulparams/armelf_nacl.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-source_sh ${srcdir}/emulparams/armelf_linux_eabi.sh
-source_sh ${srcdir}/emulparams/elf_nacl.sh
-BIG_OUTPUT_FORMAT="elf32-bigarm-nacl"
-LITTLE_OUTPUT_FORMAT="elf32-littlearm-nacl"
-OUTPUT_FORMAT="$LITTLE_OUTPUT_FORMAT"
diff --git a/ld/emulparams/armelfb_nacl.sh b/ld/emulparams/armelfb_nacl.sh
deleted file mode 100644
index ae5085d5e6e..00000000000
--- a/ld/emulparams/armelfb_nacl.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-source_sh ${srcdir}/emulparams/armelf_nacl.sh
-OUTPUT_FORMAT="$BIG_OUTPUT_FORMAT"
diff --git a/ld/emulparams/elf_nacl.sh b/ld/emulparams/elf_nacl.sh
deleted file mode 100644
index d68cbcdc09f..00000000000
--- a/ld/emulparams/elf_nacl.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-ENABLE_INITFINI_ARRAY=yes
-SEPARATE_CODE=yes
-TEXT_START_ADDR=0x20000
-NACL_RODATA_DISTANCE=0x10000000
-
-nacl_rodata_addr()
-{
-  nacl_text_addr="SEGMENT_START(\"text-segment\", $1)"
-  nacl_rodata_addr="$nacl_text_addr + ${NACL_RODATA_DISTANCE}"
-  echo "$nacl_rodata_addr"
-}
-
-RODATA_ADDR=`nacl_rodata_addr "${TEXT_START_ADDR}"`
-SHLIB_RODATA_ADDR=`nacl_rodata_addr 0`
diff --git a/ld/po/BLD-POTFILES.in b/ld/po/BLD-POTFILES.in
index 10cef1571fe..7daf1d7a3d5 100644
--- a/ld/po/BLD-POTFILES.in
+++ b/ld/po/BLD-POTFILES.in
@@ -33,7 +33,6 @@ earmelf_haiku.c
 earmelf_linux.c
 earmelf_linux_eabi.c
 earmelf_linux_fdpiceabi.c
-earmelf_nacl.c
 earmelf_nbsd.c
 earmelf_phoenix.c
 earmelf_vxworks.c
@@ -43,7 +42,6 @@ earmelfb_fuchsia.c
 earmelfb_linux.c
 earmelfb_linux_eabi.c
 earmelfb_linux_fdpiceabi.c
-earmelfb_nacl.c
 earmelfb_nbsd.c
 earmnto.c
 earmpe.c
diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp
index cacd3bddfd4..d193498cc17 100644
--- a/ld/testsuite/ld-arm/arm-elf.exp
+++ b/ld/testsuite/ld-arm/arm-elf.exp
@@ -319,7 +319,7 @@ append armelftests_common $tmp
 
 run_ld_link_tests $armelftests_common
 
-set armelftests_nonacl {
+set armelftests {
     {"Thumb-1 BL" "-Ttext 0x1000 --section-start .foo=0x401000" "" "" {thumb1-bl.s}
      {{objdump -dr thumb1-bl.d}}
      "thumb1-bl"}
@@ -351,14 +351,14 @@ set tmp {
      {{objdump -fdw arm-app.d} {objdump -Rw arm-app.r}}
      "arm-app"}
 }
-if [check_shared_lib_support] { append armelftests_nonacl $tmp }
+if [check_shared_lib_support] { append armelftests $tmp }
 set tmp {
     {"Simple static application without .rel.plt in linker script"
 	"-T arm-no-rel-plt.ld" "" "" {arm-static-app.s}
      {{objdump -fdw arm-static-app.d} {objdump -rw arm-static-app.r}}
      "arm-static-app-no-rel-plt"}
 }
-append armelftests_nonacl $tmp
+append armelftests $tmp
 set tmp {
     {"Simple dynamic application without .rel.plt in linker script"
 	"tmpdir/arm-lib.so -T arm-no-rel-plt.ld" "" "" {arm-app.s}
@@ -406,11 +406,9 @@ set tmp {
      {{objdump -fdw tls-lib-loc.d} {objdump -Rw tls-lib-loc.r}}
      "tls-lib-loc.so"}
 }
-if [check_shared_lib_support] { append armelftests_nonacl $tmp }
+if [check_shared_lib_support] { append armelftests $tmp }
 
-if { ![istarget "arm*-*-nacl*"] } {
-    run_ld_link_tests $armelftests_nonacl
-}
+run_ld_link_tests $armelftests
 
 run_dump_test "group-relocs-alu-bad"
 run_dump_test "group-relocs-alu-bad-2"
@@ -437,7 +435,7 @@ if { [istarget "arm*-*-netbsd*"] } {
     return
 }
 
-if { ![istarget "arm*-*-*eabi*"] && ![istarget "arm*-*-nacl*"] } {
+if { ![istarget "arm*-*-*eabi*"] } {
     # Special variants of these tests, as a different farcall stub is
     # generated for a non-ARM-EABI target: indeed in such a case,
     # there are no attributes to indicate that blx can be used.
@@ -457,11 +455,7 @@ if { ![istarget "arm*-*-*eabi*"] && ![istarget "arm*-*-nacl*"] } {
 
 # Farcalls stubs are fully supported for ARM-EABI only.
 # This list is massaged below into run_ld_link_tests standard format.
-# The source list is almost that same format.  The one difference is
-# that each "action" (elements of element 5) might have four elements
-# instead of three; in that case, the fourth element is the name of
-# the dump file to use for arm*-*nacl* targets instead of the canonical
-# dump file (the third element).
+# The source list is almost that same format.
 set armeabitests_common {
      {"EABI attribute merging" "-r" "" "" {attr-merge.s attr-merge.s}
       {{readelf -A attr-merge.attr}}
@@ -522,20 +516,20 @@ set armeabitests_common {
      "movw-merge"}
 
     {"ARM-ARM farcall" "-Ttext 0x1000 --section-start .foo=0x2001020" "" "" {farcall-arm-arm.s}
-     {{objdump -d farcall-arm-arm.d farcall-arm-nacl.d}}
+     {{objdump -d farcall-arm-arm.d}}
      "farcall-arm-arm"}
     {"ARM-ARM farcall (PIC veneer)" "-Ttext 0x1000 --section-start .foo=0x2001020 --pic-veneer" "" "" {farcall-arm-arm.s}
-     {{objdump -d farcall-arm-arm-pic-veneer.d farcall-arm-nacl-pic.d}}
+     {{objdump -d farcall-arm-arm-pic-veneer.d}}
      "farcall-arm-arm-pic-veneer"}
     {"ARM-ARM farcall (BE8)" "-Ttext 0x1000 --section-start .foo=0x2001020 -EB --be8" "" "-EB" {farcall-arm-arm.s}
-     {{objdump -d farcall-arm-arm.d farcall-arm-nacl.d}}
+     {{objdump -d farcall-arm-arm.d}}
      "farcall-arm-arm-be8"}
     {"ARM-ARM farcall (BE)" "-Ttext 0x1000 --section-start .foo=0x2001020 -EB" "" "-EB" {farcall-arm-arm.s}
-     {{objdump -d farcall-arm-arm.d farcall-arm-nacl.d}}
+     {{objdump -d farcall-arm-arm.d}}
      "farcall-arm-arm-be"}
 
     {"Long branch with mixed text and data" "-T arm.ld" "" "" {farcall-data.s}
-     {{objdump -dr farcall-data.d farcall-data-nacl.d}}
+     {{objdump -dr farcall-data.d}}
      "farcall-data"}
     {"callweak-2" "-static -T arm.ld" "" "" {callweak-2.s}
      {{objdump -dr callweak-2.d}}
@@ -553,7 +547,7 @@ set armeabitests_common_shared {
 if [check_shared_lib_support] { append armeabitests_common $armeabitests_common_shared}
 
 
-set armeabitests_nonacl {
+set armeabitests {
     {"ARM-Thumb farcall" "-Ttext 0x1000 --section-start .foo=0x2001014" "" "" {farcall-arm-thumb.s}
      {{objdump -d farcall-arm-thumb.d}}
      "farcall-arm-thumb"}
@@ -949,7 +943,7 @@ set armeabitests_nonacl {
      "arm-pic-veneer"}
 }
 
-set armeabitests_nonacl_shared {
+set armeabitests_shared {
     {"TLS gnu shared library"
 	"--no-fix-arm1176 -shared -T arm-dyn.ld --hash-style=sysv" ""
 	"" {tls-gdesc.s}
@@ -1107,7 +1101,7 @@ set armeabitests_nonacl_shared {
 	{{readelf -Ds preempt-app.sym}}
 	"preempt-app"}
 }
-if [check_shared_lib_support] { append armeabitests_nonacl $armeabitests_nonacl_shared}
+if [check_shared_lib_support] { append armeabitests $armeabitests_shared}
 
 
 set armfdpiceabitests {
@@ -1152,10 +1146,6 @@ set armfdpiceabitests {
 # Massage the $armeabitests_common list into run_ld_link_tests standard form.
 # See the comment before 'set armeabitests_common', above.
 set elide_action_elt 3
-set is_nacl [istarget "arm*-*-nacl*"]
-if {$is_nacl} {
-    set elide_action_elt 2
-}
 set neabi_common [llength $armeabitests_common]
 for {set i 0} {$i < $neabi_common} {incr i} {
     set case [lindex $armeabitests_common $i]
@@ -1171,9 +1161,7 @@ for {set i 0} {$i < $neabi_common} {incr i} {
 }
 
 run_ld_link_tests $armeabitests_common
-if { !$is_nacl } {
-    run_ld_link_tests $armeabitests_nonacl
-}
+run_ld_link_tests $armeabitests
 
 if { [istarget "arm*-*-uclinuxfdpiceabi"] } {
     run_ld_link_tests $armfdpiceabitests
@@ -1255,7 +1243,7 @@ run_dump_test "attr-merge-nosection-1"
 run_dump_test "attr-merge-hardfp-use-1"
 run_dump_test "attr-merge-hardfp-use-2"
 run_dump_test "unresolved-1"
-if { !$is_nacl && [check_shared_lib_support] } {
+if { [check_shared_lib_support] } {
     run_dump_test "unresolved-1-dyn"
 }
 run_dump_test "unresolved-2"
@@ -1281,7 +1269,7 @@ run_dump_test "non-contiguous-arm5"
 run_dump_test "non-contiguous-arm6"
 run_dump_test "non-contiguous-arm7"
 
-if { !$is_nacl && [check_shared_lib_support] } {
+if { [check_shared_lib_support] } {
     run_dump_test "thumb-plt"
     run_dump_test "thumb-plt-got"
 }
diff --git a/ld/testsuite/ld-arm/cortex-a8-far.d b/ld/testsuite/ld-arm/cortex-a8-far.d
index a87cd5da503..5c7c6fb744e 100644
--- a/ld/testsuite/ld-arm/cortex-a8-far.d
+++ b/ld/testsuite/ld-arm/cortex-a8-far.d
@@ -1,4 +1,4 @@
-#target: *-*-*eabi* *-*-nacl*
+#target: *-*-*eabi*
 
 .*:     file format .*
 
diff --git a/ld/testsuite/ld-arm/farcall-arm-nacl-pic.d b/ld/testsuite/ld-arm/farcall-arm-nacl-pic.d
deleted file mode 100644
index a39a468da31..00000000000
--- a/ld/testsuite/ld-arm/farcall-arm-nacl-pic.d
+++ /dev/null
@@ -1,20 +0,0 @@
-.*:     file format .*
-
-Disassembly of section \.text:
-
-0+1000 <_start>:
-\s*1000:\s+eb000002\s+bl\s+1010 <__bar_veneer>
-#...
-
-0+1010 <__bar_veneer>:
-\s*1010:\s+e59fc00c\s+ldr\s+ip, \[pc, #12\]\s+@ 1024 <__bar_veneer\+0x14>
-\s*1014:\s+e08cc00f\s+add\s+ip, ip, pc
-\s*1018:\s+e3ccc13f\s+bic\s+ip, ip, #-1073741809\s+@ 0xc000000f
-\s*101c:\s+e12fff1c\s+bx\s+ip
-\s*1020:\s+e125be70\s+bkpt\s+0x5be0
-\s*1024:\s+02000004\s+.word\s+0x02000004
-#...
-
-\s*Disassembly of section \.foo:
-\s*02001020 <bar>:
-\s*2001020:\s+e12fff1e\s+bx\s+lr
diff --git a/ld/testsuite/ld-arm/farcall-arm-nacl.d b/ld/testsuite/ld-arm/farcall-arm-nacl.d
deleted file mode 100644
index 0431f4a517d..00000000000
--- a/ld/testsuite/ld-arm/farcall-arm-nacl.d
+++ /dev/null
@@ -1,20 +0,0 @@
-.*:     file format .*
-
-Disassembly of section \.text:
-
-0+1000 <_start>:
-\s*1000:\s+eb000002\s+bl\s+1010 <__bar_veneer>
-#...
-
-0+1010 <__bar_veneer>:
-\s*1010:\s+e59fc00c\s+ldr\s+ip, \[pc, #12\]\s+@ 1024 <__bar_veneer\+0x14>
-\s*1014:\s+e3ccc13f\s+bic\s+ip, ip, #-1073741809\s+@ 0xc000000f
-\s*1018:\s+e12fff1c\s+bx\s+ip
-\s*101c:\s+e320f000\s+nop\s+\{0\}
-\s*1020:\s+e125be70\s+bkpt\s+0x5be0
-\s*1024:\s+02001020\s+.word\s+0x02001020
-#...
-
-\s*Disassembly of section \.foo:
-\s*02001020 <bar>:
-\s*2001020:\s+e12fff1e\s+bx\s+lr
diff --git a/ld/testsuite/ld-arm/farcall-data-nacl.d b/ld/testsuite/ld-arm/farcall-data-nacl.d
deleted file mode 100644
index 2c51fe8ecf9..00000000000
--- a/ld/testsuite/ld-arm/farcall-data-nacl.d
+++ /dev/null
@@ -1,24 +0,0 @@
-.*:     file format .*
-
-Disassembly of section .text:
-
-0+8000 <_start>:
-\s*8000:\s+ea000002\s+b\s+8010 <__far_veneer>
-#...
-
-0+8010 <__far_veneer>:
-\s*8010:\s+e59fc00c\s+ldr\s+ip, \[pc, #12\]\s+@ 8024 <__far_veneer\+0x14>
-\s*8014:\s+e3ccc13f\s+bic\s+ip, ip, #-1073741809\s+@ 0xc000000f
-\s*8018:\s+e12fff1c\s+bx\s+ip
-\s*801c:\s+e320f000\s+nop\s+\{0\}
-\s*8020:\s+e125be70\s+bkpt\s+0x5be0
-\s*8024:\s+12340000\s+.word\s+0x12340000
-#...
-
-0+8030 <after>:
-\s*8030:\s+11111111\s+\.word\s+0x11111111
-
-Disassembly of section \.far:
-
-12340000 <far>:
-12340000:\s+e12fff1e\s+bx\s+lr
diff --git a/ld/testsuite/ld-arm/farcall-thumb2-purecode-consecutive-veneer.d b/ld/testsuite/ld-arm/farcall-thumb2-purecode-consecutive-veneer.d
index b89da03eec0..0d74ca31c43 100644
--- a/ld/testsuite/ld-arm/farcall-thumb2-purecode-consecutive-veneer.d
+++ b/ld/testsuite/ld-arm/farcall-thumb2-purecode-consecutive-veneer.d
@@ -11,17 +11,17 @@ Disassembly of section .text:
 Disassembly of section .foo:
 
 02001020 <_start>:
- 2001020:	f000 f802 	bl	2001028 <__bar_veneer>
- 2001024:	f000 f806 	bl	2001034 <__baz_veneer>
+ 2001020:	f000 f808 	bl	2001034 <__bar_veneer>
+ 2001024:	f000 f800 	bl	2001028 <__baz_veneer>
 
-02001028 <__bar_veneer>:
- 2001028:	f241 0c01 	movw	ip, #4097	@ 0x1001
+02001028 <__baz_veneer>:
+ 2001028:	f241 0c03 	movw	ip, #4099	@ 0x1003
  200102c:	f2c0 0c00 	movt	ip, #0
  2001030:	4760      	bx	ip
  2001032:	bf00      	nop
 
-02001034 <__baz_veneer>:
- 2001034:	f241 0c03 	movw	ip, #4099	@ 0x1003
+02001034 <__bar_veneer>:
+ 2001034:	f241 0c01 	movw	ip, #4097	@ 0x1001
  2001038:	f2c0 0c00 	movt	ip, #0
  200103c:	4760      	bx	ip
  200103e:	bf00      	nop
diff --git a/ld/testsuite/ld-arm/non-contiguous-arm3.d b/ld/testsuite/ld-arm/non-contiguous-arm3.d
index 2912f35d0f7..ab83b5e3c17 100644
--- a/ld/testsuite/ld-arm/non-contiguous-arm3.d
+++ b/ld/testsuite/ld-arm/non-contiguous-arm3.d
@@ -3,7 +3,6 @@
 #ld: --enable-non-contiguous-regions -T non-contiguous-arm3.ld -z max-page-size=0x10000
 #objdump: -rdth
 #xfail: [is_generic]
-#skip: arm*nacl
 
 .*:     file format elf32-(little|big)arm
 
diff --git a/ld/testsuite/ld-arm/non-contiguous-arm6.d b/ld/testsuite/ld-arm/non-contiguous-arm6.d
index 3d737f0905e..c21cb4c4518 100644
--- a/ld/testsuite/ld-arm/non-contiguous-arm6.d
+++ b/ld/testsuite/ld-arm/non-contiguous-arm6.d
@@ -3,7 +3,6 @@
 #ld: --enable-non-contiguous-regions -T non-contiguous-arm6.ld -z max-page-size=0x10000
 #objdump: -rdth
 #xfail: [is_generic]
-#skip: arm*nacl
 
 .*:     file format elf32-(little|big)arm
 
diff --git a/ld/testsuite/ld-elf/binutils.exp b/ld/testsuite/ld-elf/binutils.exp
index 578b63907c5..4fd2eab8194 100644
--- a/ld/testsuite/ld-elf/binutils.exp
+++ b/ld/testsuite/ld-elf/binutils.exp
@@ -25,7 +25,6 @@
 
 if { !([istarget *-*-linux*]
        || [istarget arm*-*-uclinuxfdpiceabi]
-       || [istarget *-*-nacl*]
        || [istarget *-*-gnu*]) || [istarget *ecoff] } then {
     return
 }
diff --git a/ld/testsuite/ld-elf/build-id.exp b/ld/testsuite/ld-elf/build-id.exp
index 3c83743202f..1b97e2493bd 100644
--- a/ld/testsuite/ld-elf/build-id.exp
+++ b/ld/testsuite/ld-elf/build-id.exp
@@ -31,7 +31,6 @@ if { [istarget frv-*-*] || [istarget lm32-*-*] } {
 
 if { !([istarget *-*-linux*]
        || [istarget arm*-*-uclinuxfdpiceabi]
-       || [istarget *-*-nacl*]
        || [istarget *-*-gnu*]) } then {
     return
 }
diff --git a/ld/testsuite/ld-elf/ehdr_start-missing.d b/ld/testsuite/ld-elf/ehdr_start-missing.d
index 3fb85e00f2d..23746963348 100644
--- a/ld/testsuite/ld-elf/ehdr_start-missing.d
+++ b/ld/testsuite/ld-elf/ehdr_start-missing.d
@@ -1,5 +1,5 @@
 #source: ehdr_start-strongref.s
 #ld: -e _start -T ehdr_start-missing.t --no-dynamic-linker
 #error: .*: undefined reference to `__ehdr_start'
-#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: bfin-*-*
diff --git a/ld/testsuite/ld-elf/ehdr_start-shared.d b/ld/testsuite/ld-elf/ehdr_start-shared.d
index a2a4dcc4975..319cd937a3a 100644
--- a/ld/testsuite/ld-elf/ehdr_start-shared.d
+++ b/ld/testsuite/ld-elf/ehdr_start-shared.d
@@ -1,7 +1,7 @@
 #source: ehdr_start.s
 #ld: -e _start -shared -z notext
 #nm: -n
-#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: bfin-*-* cris*-*-* frv-*-* lm32-*-* ![check_shared_lib_support]
 
 #...
diff --git a/ld/testsuite/ld-elf/ehdr_start-userdef.d b/ld/testsuite/ld-elf/ehdr_start-userdef.d
index 93ed0d8138d..b41436efa99 100644
--- a/ld/testsuite/ld-elf/ehdr_start-userdef.d
+++ b/ld/testsuite/ld-elf/ehdr_start-userdef.d
@@ -1,7 +1,7 @@
 #source: ehdr_start-strongref.s
 #ld: -e _start -T ehdr_start-userdef.t
 #readelf: -Ws
-#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: bfin-*-* frv-*-*
 
 #...
diff --git a/ld/testsuite/ld-elf/ehdr_start-weak.d b/ld/testsuite/ld-elf/ehdr_start-weak.d
index c4f9072e42a..d77a4643188 100644
--- a/ld/testsuite/ld-elf/ehdr_start-weak.d
+++ b/ld/testsuite/ld-elf/ehdr_start-weak.d
@@ -1,7 +1,7 @@
 #source: ehdr_start.s
 #ld: -e _start -T ehdr_start-missing.t --no-dynamic-linker
 #nm: -n
-#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: bfin-*-* frv-*-*
 
 #failif
diff --git a/ld/testsuite/ld-elf/ehdr_start.d b/ld/testsuite/ld-elf/ehdr_start.d
index 0ec3b134831..2e9a2fa2794 100644
--- a/ld/testsuite/ld-elf/ehdr_start.d
+++ b/ld/testsuite/ld-elf/ehdr_start.d
@@ -1,7 +1,7 @@
 #source: ehdr_start.s
 #ld: -e _start --build-id
 #nm: -n
-#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: bfin-*-* frv-*-* lm32-*-*
 
 #...
diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index 7e69940dc25..1ae1af924dd 100644
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -229,7 +229,6 @@ proc target_defaults_to_execstack {} {
 }
 
 if {   [istarget *-*-*linux*]
-    || [istarget *-*-nacl*]
     || [istarget *-*-gnu*] } {
     run_ld_link_tests [list \
 	[list "stack exec" \
@@ -445,7 +444,6 @@ set xfails "*-*-netbsd*"
 run_ld_link_exec_tests $array_tests $xfails
 
 if { [istarget *-*-linux*]
-     || [istarget *-*-nacl*]
      || [istarget *-*-gnu*] } {
     run_ld_link_exec_tests $array_tests_pie $xfails
 
diff --git a/ld/testsuite/ld-elf/export-class.exp b/ld/testsuite/ld-elf/export-class.exp
index 7a84755e42b..f4a063473a4 100644
--- a/ld/testsuite/ld-elf/export-class.exp
+++ b/ld/testsuite/ld-elf/export-class.exp
@@ -33,7 +33,6 @@ if { ![is_elf_format] || ![check_shared_lib_support] } {
 # if you like.
 if { ![istarget *-*-linux*]
      && ![istarget arm*-*-uclinuxfdpiceabi]
-     && ![istarget *-*-nacl*]
      && ![istarget *-*-gnu*] } {
     return
 }
diff --git a/ld/testsuite/ld-elf/fatal-warnings-1a.d b/ld/testsuite/ld-elf/fatal-warnings-1a.d
index 7afee539a6a..a8632baf355 100644
--- a/ld/testsuite/ld-elf/fatal-warnings-1a.d
+++ b/ld/testsuite/ld-elf/fatal-warnings-1a.d
@@ -3,4 +3,4 @@
 #ld: --no-dynamic-linker --fatal-warnings -z dynamic-undefined-weak
 #readelf: -r -x .data.rel.ro
 #error: unsupported option: -z dynamic-undefined-weak
-#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
diff --git a/ld/testsuite/ld-elf/fatal-warnings-1b.d b/ld/testsuite/ld-elf/fatal-warnings-1b.d
index 70862b23287..34aaf100be2 100644
--- a/ld/testsuite/ld-elf/fatal-warnings-1b.d
+++ b/ld/testsuite/ld-elf/fatal-warnings-1b.d
@@ -3,4 +3,4 @@
 #ld: --no-dynamic-linker -z dynamic-undefined-weak --fatal-warnings
 #readelf: -r -x .data.rel.ro
 #error: unsupported option: -z dynamic-undefined-weak
-#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
diff --git a/ld/testsuite/ld-elf/orphan-region.d b/ld/testsuite/ld-elf/orphan-region.d
index 3f5bfd75326..ef21ec377cc 100644
--- a/ld/testsuite/ld-elf/orphan-region.d
+++ b/ld/testsuite/ld-elf/orphan-region.d
@@ -1,9 +1,9 @@
 #source: orphan-region.s
 #ld: -T orphan-region.ld -N -z stack-size=0 --no-warn-rwx-segments
 #readelf: -S -l --wide
-#xfail: [uses_genelf] hppa*64*-*-* spu-*-* *-*-nacl*
+#xfail: [uses_genelf] hppa*64*-*-* spu-*-*
 # if not using elf.em, you don't get fancy orphan handling
-# spu twiddles LOAD range, hppa64 adds PHDR, nacl splits to two segments
+# spu twiddles LOAD range, hppa64 adds PHDR
 
 #...
   \[[ 0-9]+\] \.text[ \t]+PROGBITS[ \t]+0*40000000[ \t]+.*
diff --git a/ld/testsuite/ld-elf/package-note.exp b/ld/testsuite/ld-elf/package-note.exp
index 5ad3cf55a3c..7249cb76e28 100644
--- a/ld/testsuite/ld-elf/package-note.exp
+++ b/ld/testsuite/ld-elf/package-note.exp
@@ -27,7 +27,6 @@ if ![is_elf_format] {
 
 if { !([istarget *-*-linux*]
        || [istarget arm*-*-uclinuxfdpiceabi]
-       || [istarget *-*-nacl*]
        || [istarget *-*-gnu*]) } then {
     return
 }
diff --git a/ld/testsuite/ld-elf/pr16322.d b/ld/testsuite/ld-elf/pr16322.d
index 1e9175c67de..914d6313e05 100644
--- a/ld/testsuite/ld-elf/pr16322.d
+++ b/ld/testsuite/ld-elf/pr16322.d
@@ -1,6 +1,6 @@
 #ld: -shared -z relro -z noseparate-code
 #readelf: -l --wide
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux-gnu *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: ![check_shared_lib_support] 
 #xfail: ![check_relro_support]
 
diff --git a/ld/testsuite/ld-elf/pr16498a.d b/ld/testsuite/ld-elf/pr16498a.d
index de683896122..8690aaf5c11 100644
--- a/ld/testsuite/ld-elf/pr16498a.d
+++ b/ld/testsuite/ld-elf/pr16498a.d
@@ -1,6 +1,6 @@
 #ld: -shared -T pr16498a.t
 #readelf: -l --wide
-#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: ![check_shared_lib_support] 
 
 #...
diff --git a/ld/testsuite/ld-elf/pr16498b.d b/ld/testsuite/ld-elf/pr16498b.d
index aceb307df70..433e2812b6a 100644
--- a/ld/testsuite/ld-elf/pr16498b.d
+++ b/ld/testsuite/ld-elf/pr16498b.d
@@ -1,7 +1,7 @@
 #source: pr16498a.s
 #ld: -shared -T pr16498b.t
 #readelf: -l --wide
-#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: ![check_shared_lib_support] 
 
 #...
diff --git a/ld/testsuite/ld-elf/pr19162.d b/ld/testsuite/ld-elf/pr19162.d
index 1e7c1a9f227..bb5af3bd7cb 100644
--- a/ld/testsuite/ld-elf/pr19162.d
+++ b/ld/testsuite/ld-elf/pr19162.d
@@ -2,7 +2,7 @@
 #source: pr19162b.s
 #ld: -shared -z max-page-size=0x200000 -z noseparate-code
 #readelf: -l --wide
-#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: hppa*-*-* ![check_shared_lib_support] 
 # hppa fails due to PR 12376.
 
diff --git a/ld/testsuite/ld-elf/pr22269a.d b/ld/testsuite/ld-elf/pr22269a.d
index 8644d0e095f..a4af8feab52 100644
--- a/ld/testsuite/ld-elf/pr22269a.d
+++ b/ld/testsuite/ld-elf/pr22269a.d
@@ -2,7 +2,7 @@
 #source: pr22269.s
 #ld: -pie --no-dynamic-linker
 #readelf: -r -x .data.rel.ro
-#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
 # The BFIN target always generates a relocation.
 #xfail: ![check_pie_support] || bfin-*-*
 
diff --git a/ld/testsuite/ld-elf/pr22269b.d b/ld/testsuite/ld-elf/pr22269b.d
index 1d8e7bd2d90..f3cedc4b855 100644
--- a/ld/testsuite/ld-elf/pr22269b.d
+++ b/ld/testsuite/ld-elf/pr22269b.d
@@ -3,7 +3,7 @@
 #ld: -pie --no-dynamic-linker -z dynamic-undefined-weak
 #readelf: -r -x .data.rel.ro
 #warning: -z dynamic-undefined-weak ignored
-#target: *-*-linux* *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
 # The BFIN target always generates a relocation.
 #xfail: ![check_pie_support] || bfin-*-*
 
diff --git a/ld/testsuite/ld-elf/pr22393-1a.d b/ld/testsuite/ld-elf/pr22393-1a.d
index 2bfa4037567..c832cc1a462 100644
--- a/ld/testsuite/ld-elf/pr22393-1a.d
+++ b/ld/testsuite/ld-elf/pr22393-1a.d
@@ -1,7 +1,7 @@
 #source: pr22393-1.s
 #ld: -shared -z separate-code -z relro
 #readelf: -l --wide
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux-gnu *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: ![check_shared_lib_support] 
 #xfail: ![check_relro_support]
 
diff --git a/ld/testsuite/ld-elf/pr22393-1b.d b/ld/testsuite/ld-elf/pr22393-1b.d
index 96d8bc01b97..f6240141e80 100644
--- a/ld/testsuite/ld-elf/pr22393-1b.d
+++ b/ld/testsuite/ld-elf/pr22393-1b.d
@@ -1,7 +1,7 @@
 #source: pr22393-1.s
 #ld: -shared -z relro -z separate-code
 #readelf: -l --wide
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux-gnu *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: ![check_shared_lib_support] 
 #xfail: ![check_relro_support]
 
diff --git a/ld/testsuite/ld-elf/pr22393-1c.d b/ld/testsuite/ld-elf/pr22393-1c.d
index c34dab3ceea..648200dcc94 100644
--- a/ld/testsuite/ld-elf/pr22393-1c.d
+++ b/ld/testsuite/ld-elf/pr22393-1c.d
@@ -1,7 +1,7 @@
 #source: pr22393-1.s
 #ld: -pie -z separate-code
 #readelf: -l --wide
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux-gnu *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: ![check_pie_support] 
 
 #failif
diff --git a/ld/testsuite/ld-elf/pr22393-1d.d b/ld/testsuite/ld-elf/pr22393-1d.d
index 4723e53e13a..11918832f20 100644
--- a/ld/testsuite/ld-elf/pr22393-1d.d
+++ b/ld/testsuite/ld-elf/pr22393-1d.d
@@ -1,7 +1,7 @@
 #source: pr22393-1.s
 #ld: -pie -z separate-code
 #readelf: -l --wide
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux-gnu *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: ![check_pie_support] 
 
 #failif
diff --git a/ld/testsuite/ld-elf/pr22393-1e.d b/ld/testsuite/ld-elf/pr22393-1e.d
index 55f7e9a6e4e..3f3516b5662 100644
--- a/ld/testsuite/ld-elf/pr22393-1e.d
+++ b/ld/testsuite/ld-elf/pr22393-1e.d
@@ -1,7 +1,7 @@
 #source: pr22393-1.s
 #ld: -z separate-code
 #readelf: -l --wide
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux-gnu *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: rx-*-linux*
 
 #failif
diff --git a/ld/testsuite/ld-elf/pr22393-1f.d b/ld/testsuite/ld-elf/pr22393-1f.d
index bc61b639658..97be4f6bf5e 100644
--- a/ld/testsuite/ld-elf/pr22393-1f.d
+++ b/ld/testsuite/ld-elf/pr22393-1f.d
@@ -1,7 +1,7 @@
 #source: pr22393-1.s
 #ld: -z separate-code
 #readelf: -l --wide
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux-gnu *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: rx-*-linux*
 
 #failif
diff --git a/ld/testsuite/ld-elf/pr22393-2a.rd b/ld/testsuite/ld-elf/pr22393-2a.rd
index a9c5478bb71..4027ed3443b 100644
--- a/ld/testsuite/ld-elf/pr22393-2a.rd
+++ b/ld/testsuite/ld-elf/pr22393-2a.rd
@@ -1,7 +1,7 @@
 #source: pr22393-1.s
 #ld: -shared -z separate-code --no-rosegment
 #readelf: -l --wide
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl*
+#target: *-*-linux-gnu *-*-gnu*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-elf/pr22393-2b.rd b/ld/testsuite/ld-elf/pr22393-2b.rd
index a9c5478bb71..4027ed3443b 100644
--- a/ld/testsuite/ld-elf/pr22393-2b.rd
+++ b/ld/testsuite/ld-elf/pr22393-2b.rd
@@ -1,7 +1,7 @@
 #source: pr22393-1.s
 #ld: -shared -z separate-code --no-rosegment
 #readelf: -l --wide
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl*
+#target: *-*-linux-gnu *-*-gnu*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-elf/pr23900-1-32.rd b/ld/testsuite/ld-elf/pr23900-1-32.rd
index 953095abc95..810f9a6f6ca 100644
--- a/ld/testsuite/ld-elf/pr23900-1-32.rd
+++ b/ld/testsuite/ld-elf/pr23900-1-32.rd
@@ -1,7 +1,7 @@
 #source: pr23900-1.s
 #ld:
 #readelf: -l --wide
-#target: *-*-linux* *-*-gnu* *-*-nacl*
+#target: *-*-linux* *-*-gnu*
 
 #...
   GNU_PROPERTY .* +0x4
diff --git a/ld/testsuite/ld-elf/pr23900-1-64.rd b/ld/testsuite/ld-elf/pr23900-1-64.rd
index 62cd63cb304..7904767cce1 100644
--- a/ld/testsuite/ld-elf/pr23900-1-64.rd
+++ b/ld/testsuite/ld-elf/pr23900-1-64.rd
@@ -1,7 +1,7 @@
 #source: pr23900-1.s
 #ld:
 #readelf: -l --wide
-#target: *-*-linux* *-*-gnu* *-*-nacl*
+#target: *-*-linux* *-*-gnu*
 
 #...
   GNU_PROPERTY .* +0x8
diff --git a/ld/testsuite/ld-elf/pr23900-1.d b/ld/testsuite/ld-elf/pr23900-1.d
index da0fcbb4e34..246cfacdc0a 100644
--- a/ld/testsuite/ld-elf/pr23900-1.d
+++ b/ld/testsuite/ld-elf/pr23900-1.d
@@ -1,6 +1,6 @@
 #ld:
 #readelf: --notes --wide -l
-#target: *-*-linux* *-*-gnu* *-*-nacl*
+#target: *-*-linux* *-*-gnu*
 
 #...
   GNU_PROPERTY .*
diff --git a/ld/testsuite/ld-elf/pr23900-2a.d b/ld/testsuite/ld-elf/pr23900-2a.d
index 836606d410f..6806acd2805 100644
--- a/ld/testsuite/ld-elf/pr23900-2a.d
+++ b/ld/testsuite/ld-elf/pr23900-2a.d
@@ -1,7 +1,7 @@
 #source: pr23900-2.s
 #ld:
 #readelf: --notes --wide
-#target: *-*-linux* *-*-gnu* *-*-nacl*
+#target: *-*-linux* *-*-gnu*
 
 #...
 Displaying notes found in: \.note
diff --git a/ld/testsuite/ld-elf/pr23900-2b.d b/ld/testsuite/ld-elf/pr23900-2b.d
index 2aa04d760c6..5b27fe5a414 100644
--- a/ld/testsuite/ld-elf/pr23900-2b.d
+++ b/ld/testsuite/ld-elf/pr23900-2b.d
@@ -1,7 +1,7 @@
 #source: pr23900-2.s
 #ld:
 #readelf: -l --wide
-#target: *-*-linux* *-*-gnu* *-*-nacl*
+#target: *-*-linux* *-*-gnu*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-elf/pr30508.d b/ld/testsuite/ld-elf/pr30508.d
index 16927809030..d59b9e9704e 100644
--- a/ld/testsuite/ld-elf/pr30508.d
+++ b/ld/testsuite/ld-elf/pr30508.d
@@ -1,7 +1,7 @@
 #ld: -z separate-code --no-rosegment
 #objcopy_linked_file: -R .foo
 #readelf: -lW
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux-gnu *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: mips*-*-* rx-*-linux*
 
 #...
diff --git a/ld/testsuite/ld-elf/pr30907-1.d b/ld/testsuite/ld-elf/pr30907-1.d
index ee72bf8bc0e..d5d8125cc2c 100644
--- a/ld/testsuite/ld-elf/pr30907-1.d
+++ b/ld/testsuite/ld-elf/pr30907-1.d
@@ -2,7 +2,7 @@
 #source: pr22393-1.s
 #ld: -shared -z separate-code -z relro --rosegment
 #readelf: -l --wide
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux-gnu *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: ![check_shared_lib_support] 
 #xfail: ![check_relro_support]
 
diff --git a/ld/testsuite/ld-elf/pr30907-2.d b/ld/testsuite/ld-elf/pr30907-2.d
index 7312da967b4..fed957e760e 100644
--- a/ld/testsuite/ld-elf/pr30907-2.d
+++ b/ld/testsuite/ld-elf/pr30907-2.d
@@ -2,7 +2,7 @@
 #source: pr22393-1.s
 #ld: -shared -z separate-code -z relro --rosegment
 #readelf: -l --wide
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux-gnu *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: ![check_shared_lib_support] 
 #xfail: ![check_relro_support]
 
diff --git a/ld/testsuite/ld-elf/pr32341.d b/ld/testsuite/ld-elf/pr32341.d
index eb76c3aad24..45777d4a944 100644
--- a/ld/testsuite/ld-elf/pr32341.d
+++ b/ld/testsuite/ld-elf/pr32341.d
@@ -1,6 +1,6 @@
 #ld: --build-id -z separate-code -z relro --rosegment
 #readelf: -l --wide
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi
+#target: *-*-linux-gnu *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: ![check_relro_support]
 
 #failif
diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp
index 09669b5483c..84100a7e6d9 100644
--- a/ld/testsuite/ld-elf/shared.exp
+++ b/ld/testsuite/ld-elf/shared.exp
@@ -516,7 +516,6 @@ run_ld_link_tests {
 
 if { [istarget *-*-linux*]
      || [istarget kvx-*-*]
-     || [istarget *-*-nacl*]
      || [istarget *-*-gnu*] } {
     run_ld_link_tests {
 	{"Weak symbols in dynamic objects 1 (support)"
@@ -1374,7 +1373,6 @@ run_cc_link_tests $build_cxx_tests
 run_ld_link_exec_tests $run_cxx_tests
 
 if { [istarget *-*-linux*]
-     || [istarget *-*-nacl*]
      || [istarget *-*-gnu*] } {
     run_cc_link_tests [list \
 	[list \
@@ -1707,7 +1705,6 @@ if [istarget "sparc*-*-*"] {
 }
 
 if { ([istarget "*-*-linux*"]
-      || [istarget "*-*-nacl*"]
       || [istarget "*-*-gnu*"])
      && ![istarget "mips*-*-*"] } {
     run_ld_link_tests [list \
diff --git a/ld/testsuite/ld-elf/tls.exp b/ld/testsuite/ld-elf/tls.exp
index e53762d2f0c..1768399309e 100644
--- a/ld/testsuite/ld-elf/tls.exp
+++ b/ld/testsuite/ld-elf/tls.exp
@@ -23,7 +23,6 @@
 
 if { !([istarget *-*-linux*]
        || [istarget arm*-*-uclinuxfdpiceabi]
-       || [istarget *-*-nacl*]
        || [istarget *-*-gnu*]) || [istarget *ecoff] } then {
     return
 }
diff --git a/ld/testsuite/ld-elf/tls_common.exp b/ld/testsuite/ld-elf/tls_common.exp
index 31f36efd138..deb22c602fb 100644
--- a/ld/testsuite/ld-elf/tls_common.exp
+++ b/ld/testsuite/ld-elf/tls_common.exp
@@ -25,7 +25,6 @@
 
 if { !([istarget *-*-linux*]
        || [istarget arm*-*-uclinuxfdpiceabi]
-       || [istarget *-*-nacl*]
        || [istarget *-*-gnu*]) || [istarget *ecoff] } then {
     return
 }
diff --git a/ld/testsuite/ld-elfweak/elfweak.exp b/ld/testsuite/ld-elfweak/elfweak.exp
index 6e18d933960..aa6c29af574 100644
--- a/ld/testsuite/ld-elfweak/elfweak.exp
+++ b/ld/testsuite/ld-elfweak/elfweak.exp
@@ -54,8 +54,7 @@ if {    ![istarget alpha*-*-linux*]
      && ![istarget sparc*-*-elf]
      && ![istarget sparc*-*-solaris2*]
      && ![istarget sparc*-*-linux*]
-     && ![istarget x86_64-*-linux*]
-     && ![istarget *-*-nacl*] } {
+     && ![istarget x86_64-*-linux*] } {
     return
 }
 
diff --git a/ld/testsuite/ld-gc/gc.exp b/ld/testsuite/ld-gc/gc.exp
index a1c7bd664e5..556c94729a0 100644
--- a/ld/testsuite/ld-gc/gc.exp
+++ b/ld/testsuite/ld-gc/gc.exp
@@ -142,7 +142,6 @@ if { [is_elf_format] && [check_shared_lib_support] } then {
 
 if { [check_compiler_available] } {
     if { [istarget "*-*-linux*"]
-	 || [istarget "*-*-nacl*"]
 	 || [istarget "*-*-gnu*"] } {
 	ld_compile "$CC_FOR_TARGET -fPIC $cflags" $srcdir/$subdir/pr11218-1.c tmpdir/pr11218-1.o
 	ld_link $ld tmpdir/pr11218-1.so "-shared tmpdir/pr11218-1.o"
diff --git a/ld/testsuite/ld-pie/pie.exp b/ld/testsuite/ld-pie/pie.exp
index 89890093f9f..fc4884e1fc7 100644
--- a/ld/testsuite/ld-pie/pie.exp
+++ b/ld/testsuite/ld-pie/pie.exp
@@ -19,9 +19,7 @@
 # MA 02110-1301, USA.
 #
 
-if { ![istarget *-*-linux*]
-     && ![istarget *-*-nacl*]
-     && ![istarget *-*-gnu*] } {
+if { ![istarget *-*-linux*] && ![istarget *-*-gnu*] } {
     return
 }
 
diff --git a/ld/testsuite/ld-plugin/lto-binutils.exp b/ld/testsuite/ld-plugin/lto-binutils.exp
index 5b4e0a10991..88d35171045 100644
--- a/ld/testsuite/ld-plugin/lto-binutils.exp
+++ b/ld/testsuite/ld-plugin/lto-binutils.exp
@@ -23,7 +23,6 @@
 
 if { !([istarget *-*-linux*]
        || [istarget arm*-*-uclinuxfdpiceabi]
-       || [istarget *-*-nacl*]
        || [istarget *-*-gnu*]) || [istarget *ecoff] } then {
     return
 }
diff --git a/ld/testsuite/ld-scripts/rgn-at3.d b/ld/testsuite/ld-scripts/rgn-at3.d
index b0ea08a260a..1d21956b7b6 100644
--- a/ld/testsuite/ld-scripts/rgn-at3.d
+++ b/ld/testsuite/ld-scripts/rgn-at3.d
@@ -2,13 +2,9 @@
 # source: rgn-at.s
 # ld: -T rgn-at3.t
 # objdump: -w -h
-# xfail: rx-*-* *-*-nacl*
+# xfail: rx-*-*
 #   FAILS on the RX because the linker has to set LMA == VMA for the
 #   Renesas loader.
-#   FAILs on NaCl targets because the linker extends the first segment
-#   to fill out the page, making its p_vaddr+p_memsz cover the sh_addr
-#   of .bss too, which makes BFD compute its LMA from the p_paddr of the
-#   text segment.
 
 .*:     file format .*
 
diff --git a/ld/testsuite/ld-shared/shared.exp b/ld/testsuite/ld-shared/shared.exp
index a8ddac2e4d9..29de93a1957 100644
--- a/ld/testsuite/ld-shared/shared.exp
+++ b/ld/testsuite/ld-shared/shared.exp
@@ -42,7 +42,6 @@ if { ![istarget hppa*64*-*-hpux*] \
      && ![istarget i?86-*-elf*] \
      && ![istarget i?86-*-linux*] \
      && ![istarget i?86-*-gnu*] \
-     && ![istarget *-*-nacl*] \
      && ![istarget ia64-*-elf*] \
      && ![istarget ia64-*-linux*] \
      && ![istarget m68k-*-linux*] \
diff --git a/ld/testsuite/ld-size/size.exp b/ld/testsuite/ld-size/size.exp
index 776341bda72..ae24f3b6633 100644
--- a/ld/testsuite/ld-size/size.exp
+++ b/ld/testsuite/ld-size/size.exp
@@ -26,7 +26,6 @@
 if {!(([istarget "i?86-*-*"]
        || [istarget "x86_64-*-*"])
       && ([istarget "*-*-elf*"]
-	  || [istarget "*-*-nacl*"]
 	  || [istarget "*-*-linux*"]
 	  || [istarget "*-*-gnu*"])) } {
     verbose "Size relocations tests not run - no target support"
@@ -39,13 +38,6 @@ if { ![check_shared_lib_support] } {
     return
 }
 
-# So as to avoid rewriting every last test case here in a nacl variant,
-# we use black magic to massage the generic cases into nacl-variant cases.
-if [istarget "*-*-nacl*"] {
-    # Change all the -melf_i386 to -melf_i386_nacl so linking can succeed.
-    set options_regsub(ld) {-m(\\S+) -m\\1_nacl}
-}
-
 set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
 foreach t $test_list {
     # We need to strip the ".d", but can leave the dirname.
diff --git a/ld/testsuite/ld-vsb/vsb.exp b/ld/testsuite/ld-vsb/vsb.exp
index e44ac398b04..84ae1edc95c 100644
--- a/ld/testsuite/ld-vsb/vsb.exp
+++ b/ld/testsuite/ld-vsb/vsb.exp
@@ -36,7 +36,6 @@ if { ![istarget hppa*64*-*-hpux*] \
      && ![istarget hppa*-*-linux*] \
      && ![istarget i?86-*-linux*] \
      && ![istarget i?86-*-gnu*] \
-     && ![istarget *-*-nacl*] \
      && ![istarget ia64-*-linux*] \
      && ![istarget m68k-*-linux*] \
      && ![istarget mips*-*-linux*] \
@@ -114,7 +113,6 @@ if [istarget arm*-*-linux*] {
 set support_protected "no"
 
 if { [istarget *-*-linux*]
-     || [istarget *-*-nacl*]
      || [istarget *-*-gnu*] } {
     if [ld_compile "$CC_FOR_TARGET -g -DPROTECTED_CHECK" $srcdir/$subdir/main.c $tmpdir/main.o] {
       if [ld_link $CC_FOR_TARGET $tmpdir/main "$tmpdir/main.o"] {