From bbd19b19e44ee6f547291db62cba7150bb407a4c Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 30 Jun 2020 08:47:02 -0700
Subject: [PATCH] Remove x86 NaCl target support

NaCl has been deprecated:

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

and NaCl will completely disappear in 2021:

https://lists.llvm.org/pipermail/llvm-dev/2020-April/141107.html

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

bfd/

	* archures.c (bfd_mach_i386_nacl): Removed.
	(bfd_mach_i386_i386_nacl): Likewise.
	(bfd_mach_x86_64_nacl): Likewise.
	(bfd_mach_x64_32_nacl): Likewise.
	* config.bfd: Remove *-*-nacl* targets.
	* configure.ac: Remove x86 NaCl target vectors.
	* cpu-i386.c (bfd_arch_i386_onebyte_nop_fill): Removed.
	(bfd_x64_32_nacl_arch): Likewise.
	(bfd_x86_64_nacl_arch): Likewise.
	(bfd_i386_nacl_arch): Likewise.
	(bfd_x64_32_arch_intel_syntax): Updated.
	* elf32-i386.c: Don't include "elf-nacl.h".
	(elf_i386_nacl_plt): Removed.
	(elf_i386_nacl_plt0_entry): Likewise.
	(elf_i386_nacl_plt_entry): Likewise.
	(elf_i386_nacl_pic_plt0_entry): Likewise.
	(elf_i386_nacl_pic_plt_entry): Likewise.
	(elf_i386_nacl_eh_frame_plt): Likewise.
	(elf_i386_nacl_plt): Likewise.
	(elf32_i386_nacl_elf_object_p): Likewise.
	(elf_i386_get_synthetic_symtab): Updated.
	(elf_i386_link_setup_gnu_properties): Likewise.
	* elf64-x86-64.c: Don't include "elf-nacl.h".
	(elf_x86_64_nacl_plt): Removed.
	(elf64_x86_64_nacl_elf_object_p): Likewise.
	(elf_x86_64_nacl_plt0_entry): Likewise.
	(elf_x86_64_nacl_plt_entry): Likewise.
	(elf_x86_64_nacl_eh_frame_plt): Likewise.
	(elf_x86_64_nacl_plt): Likewise.
	(elf32_x86_64_nacl_elf_object_p): Likewise.
	(elf_x86_64_get_synthetic_symtab): Updated.
	(elf_x86_64_link_setup_gnu_properties): Likewise.
	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Likewise.
	* targets.c: Remove x86 NaCl target vectors.
	* bfd-in2.h: Regenerated.
	* configure: Likewise.

binutils/

	* NEWS: Mention x86 NaCl target support removal.
	* dwarf.c (init_dwarf_regnames_by_bfd_arch_and_mach): Remove
	x86 NaCl target support.
	* testsuite/binutils-all/elfedit-1.d: Likewise.
	* testsuite/binutils-all/i386/i386.exp: Likewise.
	* testsuite/binutils-all/x86-64/objects.exp: Likewise.
	* testsuite/binutils-all/x86-64/pr23494a-x32.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494a.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494b-x32.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494b.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494c-x32.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494c.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494d-x32.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494d.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494e-x32.d: Likewise.
	* testsuite/binutils-all/x86-64/pr23494e.d: Likewise.
	* testsuite/binutils-all/x86-64/x86-64.exp: Likewise.

gas/

	* NEWS: Mention x86 NaCl target support removal.
	* config/tc-i386.c: Remove x86 NaCl target support.
	* config/tc-i386.h: Likewise.
	* configure.tgt: Likewise.
	* testsuite/gas/i386/i386.exp: Likewise.
	* testsuite/gas/i386/iamcu-1.d: Likewise.
	* testsuite/gas/i386/iamcu-2.d: Likewise.
	* testsuite/gas/i386/iamcu-3.d: Likewise.
	* testsuite/gas/i386/iamcu-4.d: Likewise.
	* testsuite/gas/i386/iamcu-5.d: Likewise.
	* testsuite/gas/i386/k1om.d: Likewise.
	* testsuite/gas/i386/l1om.d: Likewise.

ld/

	* Makefile.am (ALL_EMULATION_SOURCES): Remove eelf_i386_nacl.c,
	eelf32_x86_64_nacl.c, eelf_x86_64_nacl.c.
	Remove x86 NaCl dep files.
	* NEWS: Mention x86 NaCl target support removal.
	* configure.tgt: Remove x86 NaCl target support.
	* testsuite/ld-elf/binutils.exp: Likewise.
	* testsuite/ld-elf/elf.exp: Likewise.
	* testsuite/ld-elfvers/vers.exp: Likewise.
	* testsuite/ld-i386/align-branch-1.d: Likewise.
	* testsuite/ld-i386/export-class.exp: Likewise.
	* testsuite/ld-i386/i386.exp: Likewise.
	* testsuite/ld-i386/load1.d: Likewise.
	* testsuite/ld-i386/pie1.d: Likewise.
	* testsuite/ld-i386/pr12570a.d: Likewise.
	* testsuite/ld-i386/pr12570b.d: Likewise.
	* testsuite/ld-i386/pr19636-1d.d: Likewise.
	* testsuite/ld-i386/pr19636-1l.d: Likewise.
	* testsuite/ld-i386/pr19636-2c.d: Likewise.
	* testsuite/ld-i386/pr19636-2d.d: Likewise.
	* testsuite/ld-i386/pr19636-2e.d: Likewise.
	* testsuite/ld-i386/pr20244-1a.d: Likewise.
	* testsuite/ld-i386/pr20244-1b.d: Likewise.
	* testsuite/ld-i386/pr20244-2a.d: Likewise.
	* testsuite/ld-i386/pr20244-2b.d: Likewise.
	* testsuite/ld-i386/pr20244-2c.d: Likewise.
	* testsuite/ld-i386/pr20244-4a.d: Likewise.
	* testsuite/ld-i386/pr20244-4b.d: Likewise.
	* testsuite/ld-i386/pr21884.d: Likewise.
	* testsuite/ld-ifunc/binutils.exp: Likewise.
	* testsuite/ld-ifunc/ifunc-10-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-10-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-11-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-11-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-12-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-12-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-13-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-13-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-14a-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-14a-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-14b-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-14b-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-14c-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-14c-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-14d-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-14d-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-14e-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-14e-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-14f-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-14f-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-15-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-15-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-16-i386-now.d: Likewise.
	* testsuite/ld-ifunc/ifunc-16-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-16-x86-64-now.d: Likewise.
	* testsuite/ld-ifunc/ifunc-16-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-17a-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-17a-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-17b-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-17b-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-18a-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-18a-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-18b-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-18b-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-19a-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-19a-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-19b-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-19b-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-2-i386-now.d: Likewise.
	* testsuite/ld-ifunc/ifunc-2-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-2-local-i386-now.d: Likewise.
	* testsuite/ld-ifunc/ifunc-2-local-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d: Likewise.
	* testsuite/ld-ifunc/ifunc-2-local-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-2-x86-64-now.d: Likewise.
	* testsuite/ld-ifunc/ifunc-2-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-20-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-20-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-21-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-21-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-22-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-22-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-5a-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-5a-local-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-5a-local-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-5a-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-5b-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-5b-local-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-5b-local-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-5b-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-5r-local-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-5r-local-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-6a-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-6a-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-6b-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-6b-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-7a-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-7a-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-7b-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-7b-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-8-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-8-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-9-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-9-x86-64.d: Likewise.
	* testsuite/ld-ifunc/pr17154-i386-now.d: Likewise.
	* testsuite/ld-ifunc/pr17154-i386.d: Likewise.
	* testsuite/ld-ifunc/pr17154-x86-64-now.d: Likewise.
	* testsuite/ld-ifunc/pr17154-x86-64.d: Likewise.
	* testsuite/ld-plugin/lto.exp: Likewise.
	* testsuite/ld-x86-64/align-branch-1.d: Likewise.
	* testsuite/ld-x86-64/dwarfreloc.exp: Likewise.
	* testsuite/ld-x86-64/line.exp: Likewise.
	* testsuite/ld-x86-64/load1a.d: Likewise.
	* testsuite/ld-x86-64/load1b.d: Likewise.
	* testsuite/ld-x86-64/load1c.d: Likewise.
	* testsuite/ld-x86-64/load1d.d: Likewise.
	* testsuite/ld-x86-64/pie3.d: Likewise.
	* testsuite/ld-x86-64/pr18160.d: Likewise.
	* testsuite/ld-x86-64/pr19013-x32.d: Likewise.
	* testsuite/ld-x86-64/pr19013.d: Likewise.
	* testsuite/ld-x86-64/pr19636-2d.d: Likewise.
	* testsuite/ld-x86-64/pr19636-2l.d: Likewise.
	* testsuite/ld-x86-64/pr20253-1b.d: Likewise.
	* testsuite/ld-x86-64/pr20253-1d.d: Likewise.
	* testsuite/ld-x86-64/pr20253-1f.d: Likewise.
	* testsuite/ld-x86-64/pr20253-1h.d: Likewise.
	* testsuite/ld-x86-64/pr20253-1j.d: Likewise.
	* testsuite/ld-x86-64/pr20253-1l.d: Likewise.
	* testsuite/ld-x86-64/pr21884.d: Likewise.
	* testsuite/ld-x86-64/pr22393-3a.rd: Likewise.
	* testsuite/ld-x86-64/pr22393-3b.rd: Likewise.
	* testsuite/ld-x86-64/tlsgd10.dd: Likewise.
	* testsuite/ld-x86-64/tlsgd5.dd: Likewise.
	* testsuite/ld-x86-64/tlsgd8.dd: Likewise.
	* testsuite/ld-x86-64/x86-64.exp: Likewise.
	* emulparams/elf32_x86_64_nacl.sh: Removed.
	* emulparams/elf_i386_nacl.sh: Likewise.
	* emulparams/elf_x86_64_nacl.sh: Likewise.
	* testsuite/ld-i386/emit-relocs-nacl.rd: Likewise.
	* testsuite/ld-i386/load1-nacl.d: Likewise.
	* testsuite/ld-i386/pie1-nacl.d: Likewise.
	* testsuite/ld-i386/plt-nacl.pd: Likewise.
	* testsuite/ld-i386/plt-pic-nacl.pd: Likewise.
	* testsuite/ld-i386/pr17709-nacl.rd: Likewise.
	* testsuite/ld-i386/pr19636-1d-nacl.d: Likewise.
	* testsuite/ld-i386/pr19636-2c-nacl.d: Likewise.
	* testsuite/ld-i386/pr19636-2d-nacl.d: Likewise.
	* testsuite/ld-i386/pr19636-2e-nacl.d: Likewise.
	* testsuite/ld-i386/pr19827-nacl.rd: Likewise.
	* testsuite/ld-i386/pr21884-nacl.d: Likewise.
	* testsuite/ld-i386/pr21884-nacl.t: Likewise.
	* testsuite/ld-i386/tlsbin-nacl.rd: Likewise.
	* testsuite/ld-i386/tlsbin2-nacl.rd: Likewise.
	* testsuite/ld-i386/tlsbindesc-nacl.rd: Likewise.
	* testsuite/ld-i386/tlsdesc-nacl.rd: Likewise.
	* testsuite/ld-i386/tlsgdesc-nacl.rd: Likewise.
	* testsuite/ld-i386/tlsnopic-nacl.rd: Likewise.
	* testsuite/ld-i386/tlspic-nacl.rd: Likewise.
	* testsuite/ld-i386/tlspic2-nacl.rd: Likewise.
	* testsuite/ld-x86-64/ilp32-4-nacl.d: Likewise.
	* testsuite/ld-x86-64/load1a-nacl.d: Likewise.
	* testsuite/ld-x86-64/load1b-nacl.d: Likewise.
	* testsuite/ld-x86-64/load1c-nacl.d: Likewise.
	* testsuite/ld-x86-64/load1d-nacl.d: Likewise.
	* testsuite/ld-x86-64/pie3-nacl.d: Likewise.
	* testsuite/ld-x86-64/plt-nacl.pd: Likewise.
	* testsuite/ld-x86-64/pr17709-nacl.rd: Likewise.
	* testsuite/ld-x86-64/pr19013-nacl.d: Likewise.
	* testsuite/ld-x86-64/pr19636-2d-nacl.d: Likewise.
	* testsuite/ld-x86-64/pr19827-nacl.rd: Likewise.
	* testsuite/ld-x86-64/pr21884-nacl.d: Likewise.
	* testsuite/ld-x86-64/pr21884-nacl.t: Likewise.
	* testsuite/ld-x86-64/split-by-file-nacl.rd: Likewise.
	* testsuite/ld-x86-64/tlsbin-nacl.rd: Likewise.
	* testsuite/ld-x86-64/tlsbin2-nacl.rd: Likewise.
	* testsuite/ld-x86-64/tlsbindesc-nacl.rd: Likewise.
	* testsuite/ld-x86-64/tlsdesc-nacl.pd: Likewise.
	* testsuite/ld-x86-64/tlsdesc-nacl.rd: Likewise.
	* testsuite/ld-x86-64/tlsgdesc-nacl.rd: Likewise.
	* testsuite/ld-x86-64/tlspic-nacl.rd: Likewise.
	* testsuite/ld-x86-64/tlspic2-nacl.rd: Likewise.
	* Makefile.in: Regenerated.
	* po/BLD-POTFILES.in: Likewise.
---
 bfd/ChangeLog                                 |  39 +++
 bfd/archures.c                                |   4 -
 bfd/bfd-in2.h                                 |   4 -
 bfd/config.bfd                                |  20 +-
 bfd/configure                                 |  13 +-
 bfd/configure.ac                              |  13 +-
 bfd/cpu-i386.c                                |  28 +-
 bfd/elf32-i386.c                              | 204 ------------
 bfd/elf64-x86-64.c                            | 305 +++---------------
 bfd/elfxx-x86.c                               |  10 +-
 bfd/targets.c                                 |   6 -
 binutils/ChangeLog                            |  20 ++
 binutils/NEWS                                 |   2 +
 binutils/dwarf.c                              |   2 -
 binutils/testsuite/binutils-all/elfedit-1.d   |   2 +-
 binutils/testsuite/binutils-all/i386/i386.exp |   4 +-
 .../testsuite/binutils-all/x86-64/objects.exp |   4 +-
 .../binutils-all/x86-64/pr23494a-x32.d        |   1 -
 .../testsuite/binutils-all/x86-64/pr23494a.d  |   1 -
 .../binutils-all/x86-64/pr23494b-x32.d        |   1 -
 .../testsuite/binutils-all/x86-64/pr23494b.d  |   1 -
 .../binutils-all/x86-64/pr23494c-x32.d        |   1 -
 .../testsuite/binutils-all/x86-64/pr23494c.d  |   1 -
 .../binutils-all/x86-64/pr23494d-x32.d        |   1 -
 .../testsuite/binutils-all/x86-64/pr23494d.d  |   1 -
 .../binutils-all/x86-64/pr23494e-x32.d        |   1 -
 .../testsuite/binutils-all/x86-64/pr23494e.d  |   1 -
 .../testsuite/binutils-all/x86-64/x86-64.exp  |   4 +-
 gas/ChangeLog                                 |  15 +
 gas/NEWS                                      |   2 +
 gas/config/tc-i386.c                          |   1 -
 gas/config/tc-i386.h                          |   4 -
 gas/configure.tgt                             |   4 -
 gas/testsuite/gas/i386/i386.exp               |  14 +-
 gas/testsuite/gas/i386/iamcu-1.d              |   1 -
 gas/testsuite/gas/i386/iamcu-2.d              |   1 -
 gas/testsuite/gas/i386/iamcu-3.d              |   1 -
 gas/testsuite/gas/i386/iamcu-4.d              |   1 -
 gas/testsuite/gas/i386/iamcu-5.d              |   1 -
 gas/testsuite/gas/i386/k1om.d                 |   1 -
 gas/testsuite/gas/i386/l1om.d                 |   1 -
 ld/ChangeLog                                  | 185 +++++++++++
 ld/Makefile.am                                |   6 -
 ld/Makefile.in                                |   9 -
 ld/NEWS                                       |   2 +
 ld/configure.tgt                              |  19 +-
 ld/emulparams/elf32_x86_64_nacl.sh            |   4 -
 ld/emulparams/elf_i386_nacl.sh                |   4 -
 ld/emulparams/elf_x86_64_nacl.sh              |   4 -
 ld/po/BLD-POTFILES.in                         |   3 -
 ld/testsuite/ld-elf/binutils.exp              |   4 +-
 ld/testsuite/ld-elf/elf.exp                   |   7 -
 ld/testsuite/ld-elfvers/vers.exp              |   4 +-
 ld/testsuite/ld-i386/align-branch-1.d         |   1 -
 ld/testsuite/ld-i386/emit-relocs-nacl.rd      |   8 -
 ld/testsuite/ld-i386/export-class.exp         |   1 -
 ld/testsuite/ld-i386/i386.exp                 |  33 --
 ld/testsuite/ld-i386/load1-nacl.d             |  59 ----
 ld/testsuite/ld-i386/load1.d                  |   1 -
 ld/testsuite/ld-i386/pie1-nacl.d              |  18 --
 ld/testsuite/ld-i386/pie1.d                   |   1 -
 ld/testsuite/ld-i386/plt-nacl.pd              | 162 ----------
 ld/testsuite/ld-i386/plt-pic-nacl.pd          | 168 ----------
 ld/testsuite/ld-i386/pr12570a.d               |   1 -
 ld/testsuite/ld-i386/pr12570b.d               |   1 -
 ld/testsuite/ld-i386/pr17709-nacl.rd          |   4 -
 ld/testsuite/ld-i386/pr19636-1d-nacl.d        | 124 -------
 ld/testsuite/ld-i386/pr19636-1d.d             |   1 -
 ld/testsuite/ld-i386/pr19636-1l.d             |   1 -
 ld/testsuite/ld-i386/pr19636-2c-nacl.d        | 126 --------
 ld/testsuite/ld-i386/pr19636-2c.d             |   1 -
 ld/testsuite/ld-i386/pr19636-2d-nacl.d        |  21 --
 ld/testsuite/ld-i386/pr19636-2d.d             |   1 -
 ld/testsuite/ld-i386/pr19636-2e-nacl.d        |  21 --
 ld/testsuite/ld-i386/pr19636-2e.d             |   1 -
 ld/testsuite/ld-i386/pr19827-nacl.rd          |   5 -
 ld/testsuite/ld-i386/pr20244-1a.d             |   1 -
 ld/testsuite/ld-i386/pr20244-1b.d             |   1 -
 ld/testsuite/ld-i386/pr20244-2a.d             |   1 -
 ld/testsuite/ld-i386/pr20244-2b.d             |   1 -
 ld/testsuite/ld-i386/pr20244-2c.d             |   1 -
 ld/testsuite/ld-i386/pr20244-4a.d             |   1 -
 ld/testsuite/ld-i386/pr20244-4b.d             |   1 -
 ld/testsuite/ld-i386/pr21884-nacl.d           |  10 -
 ld/testsuite/ld-i386/pr21884-nacl.t           |  11 -
 ld/testsuite/ld-i386/pr21884.d                |   1 -
 ld/testsuite/ld-i386/tlsbin-nacl.rd           | 160 ---------
 ld/testsuite/ld-i386/tlsbin2-nacl.rd          | 153 ---------
 ld/testsuite/ld-i386/tlsbindesc-nacl.rd       | 151 ---------
 ld/testsuite/ld-i386/tlsdesc-nacl.rd          | 145 ---------
 ld/testsuite/ld-i386/tlsgdesc-nacl.rd         |  97 ------
 ld/testsuite/ld-i386/tlsnopic-nacl.rd         | 112 -------
 ld/testsuite/ld-i386/tlspic-nacl.rd           | 150 ---------
 ld/testsuite/ld-i386/tlspic2-nacl.rd          | 143 --------
 ld/testsuite/ld-ifunc/binutils.exp            |   2 -
 ld/testsuite/ld-ifunc/ifunc-10-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-10-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-11-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-11-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-12-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-12-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-13-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-13-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-14a-i386.d        |   2 +-
 ld/testsuite/ld-ifunc/ifunc-14a-x86-64.d      |   1 -
 ld/testsuite/ld-ifunc/ifunc-14b-i386.d        |   2 +-
 ld/testsuite/ld-ifunc/ifunc-14b-x86-64.d      |   1 -
 ld/testsuite/ld-ifunc/ifunc-14c-i386.d        |   2 +-
 ld/testsuite/ld-ifunc/ifunc-14c-x86-64.d      |   1 -
 ld/testsuite/ld-ifunc/ifunc-14d-i386.d        |   2 +-
 ld/testsuite/ld-ifunc/ifunc-14d-x86-64.d      |   1 -
 ld/testsuite/ld-ifunc/ifunc-14e-i386.d        |   2 +-
 ld/testsuite/ld-ifunc/ifunc-14e-x86-64.d      |   1 -
 ld/testsuite/ld-ifunc/ifunc-14f-i386.d        |   2 +-
 ld/testsuite/ld-ifunc/ifunc-14f-x86-64.d      |   1 -
 ld/testsuite/ld-ifunc/ifunc-15-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-15-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-16-i386-now.d     |   2 +-
 ld/testsuite/ld-ifunc/ifunc-16-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-16-x86-64-now.d   |   1 -
 ld/testsuite/ld-ifunc/ifunc-16-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-17a-i386.d        |   2 +-
 ld/testsuite/ld-ifunc/ifunc-17a-x86-64.d      |   1 -
 ld/testsuite/ld-ifunc/ifunc-17b-i386.d        |   2 +-
 ld/testsuite/ld-ifunc/ifunc-17b-x86-64.d      |   1 -
 ld/testsuite/ld-ifunc/ifunc-18a-i386.d        |   2 +-
 ld/testsuite/ld-ifunc/ifunc-18a-x86-64.d      |   1 -
 ld/testsuite/ld-ifunc/ifunc-18b-i386.d        |   2 +-
 ld/testsuite/ld-ifunc/ifunc-18b-x86-64.d      |   1 -
 ld/testsuite/ld-ifunc/ifunc-19a-i386.d        |   2 +-
 ld/testsuite/ld-ifunc/ifunc-19a-x86-64.d      |   1 -
 ld/testsuite/ld-ifunc/ifunc-19b-i386.d        |   2 +-
 ld/testsuite/ld-ifunc/ifunc-19b-x86-64.d      |   1 -
 ld/testsuite/ld-ifunc/ifunc-2-i386-now.d      |   2 +-
 ld/testsuite/ld-ifunc/ifunc-2-i386.d          |   2 +-
 .../ld-ifunc/ifunc-2-local-i386-now.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-2-local-i386.d    |   2 +-
 .../ld-ifunc/ifunc-2-local-x86-64-now.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d  |   1 -
 ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d    |   1 -
 ld/testsuite/ld-ifunc/ifunc-2-x86-64.d        |   1 -
 ld/testsuite/ld-ifunc/ifunc-20-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-20-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-21-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-21-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-22-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-22-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-5a-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d   |   2 +-
 ld/testsuite/ld-ifunc/ifunc-5a-local-x86-64.d |   1 -
 ld/testsuite/ld-ifunc/ifunc-5a-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-5b-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d   |   2 +-
 ld/testsuite/ld-ifunc/ifunc-5b-local-x86-64.d |   1 -
 ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d   |   2 +-
 ld/testsuite/ld-ifunc/ifunc-5r-local-x86-64.d |   1 -
 ld/testsuite/ld-ifunc/ifunc-6a-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-6a-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-6b-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-6b-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-7a-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-7a-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-7b-i386.d         |   2 +-
 ld/testsuite/ld-ifunc/ifunc-7b-x86-64.d       |   1 -
 ld/testsuite/ld-ifunc/ifunc-8-i386.d          |   2 +-
 ld/testsuite/ld-ifunc/ifunc-8-x86-64.d        |   1 -
 ld/testsuite/ld-ifunc/ifunc-9-i386.d          |   2 +-
 ld/testsuite/ld-ifunc/ifunc-9-x86-64.d        |   1 -
 ld/testsuite/ld-ifunc/pr17154-i386-now.d      |   2 +-
 ld/testsuite/ld-ifunc/pr17154-i386.d          |   2 +-
 ld/testsuite/ld-ifunc/pr17154-x86-64-now.d    |   1 -
 ld/testsuite/ld-ifunc/pr17154-x86-64.d        |   1 -
 ld/testsuite/ld-plugin/lto.exp                |   2 -
 ld/testsuite/ld-x86-64/align-branch-1.d       |   1 -
 ld/testsuite/ld-x86-64/dwarfreloc.exp         |   4 +-
 ld/testsuite/ld-x86-64/ilp32-4-nacl.d         |  30 --
 ld/testsuite/ld-x86-64/line.exp               |  11 +-
 ld/testsuite/ld-x86-64/load1a-nacl.d          |  55 ----
 ld/testsuite/ld-x86-64/load1a.d               |   1 -
 ld/testsuite/ld-x86-64/load1b-nacl.d          |  55 ----
 ld/testsuite/ld-x86-64/load1b.d               |   1 -
 ld/testsuite/ld-x86-64/load1c-nacl.d          |  48 ---
 ld/testsuite/ld-x86-64/load1c.d               |   1 -
 ld/testsuite/ld-x86-64/load1d-nacl.d          |  48 ---
 ld/testsuite/ld-x86-64/load1d.d               |   1 -
 ld/testsuite/ld-x86-64/pie3-nacl.d            |  14 -
 ld/testsuite/ld-x86-64/pie3.d                 |   1 -
 ld/testsuite/ld-x86-64/plt-nacl.pd            |  55 ----
 ld/testsuite/ld-x86-64/pr17709-nacl.rd        |   4 -
 ld/testsuite/ld-x86-64/pr18160.d              |   1 -
 ld/testsuite/ld-x86-64/pr19013-nacl.d         |   9 -
 ld/testsuite/ld-x86-64/pr19013-x32.d          |   1 -
 ld/testsuite/ld-x86-64/pr19013.d              |   1 -
 ld/testsuite/ld-x86-64/pr19636-2d-nacl.d      |  37 ---
 ld/testsuite/ld-x86-64/pr19636-2d.d           |   1 -
 ld/testsuite/ld-x86-64/pr19636-2l.d           |   1 -
 ld/testsuite/ld-x86-64/pr19827-nacl.rd        |   5 -
 ld/testsuite/ld-x86-64/pr20253-1b.d           |   1 -
 ld/testsuite/ld-x86-64/pr20253-1d.d           |   1 -
 ld/testsuite/ld-x86-64/pr20253-1f.d           |   1 -
 ld/testsuite/ld-x86-64/pr20253-1h.d           |   1 -
 ld/testsuite/ld-x86-64/pr20253-1j.d           |   1 -
 ld/testsuite/ld-x86-64/pr20253-1l.d           |   1 -
 ld/testsuite/ld-x86-64/pr21884-nacl.d         |  10 -
 ld/testsuite/ld-x86-64/pr21884-nacl.t         |  11 -
 ld/testsuite/ld-x86-64/pr21884.d              |   1 -
 ld/testsuite/ld-x86-64/pr22393-3a.rd          |   2 +-
 ld/testsuite/ld-x86-64/pr22393-3b.rd          |   2 +-
 ld/testsuite/ld-x86-64/split-by-file-nacl.rd  |  15 -
 ld/testsuite/ld-x86-64/tlsbin-nacl.rd         | 147 ---------
 ld/testsuite/ld-x86-64/tlsbin2-nacl.rd        | 140 --------
 ld/testsuite/ld-x86-64/tlsbindesc-nacl.rd     | 138 --------
 ld/testsuite/ld-x86-64/tlsdesc-nacl.pd        |  40 ---
 ld/testsuite/ld-x86-64/tlsdesc-nacl.rd        | 154 ---------
 ld/testsuite/ld-x86-64/tlsgd10.dd             |   2 +-
 ld/testsuite/ld-x86-64/tlsgd5.dd              |   2 +-
 ld/testsuite/ld-x86-64/tlsgd8.dd              |   2 +-
 ld/testsuite/ld-x86-64/tlsgdesc-nacl.rd       |  97 ------
 ld/testsuite/ld-x86-64/tlspic-nacl.rd         | 138 --------
 ld/testsuite/ld-x86-64/tlspic2-nacl.rd        | 139 --------
 ld/testsuite/ld-x86-64/x86-64.exp             |  54 +---
 222 files changed, 383 insertions(+), 4116 deletions(-)
 delete mode 100644 ld/emulparams/elf32_x86_64_nacl.sh
 delete mode 100644 ld/emulparams/elf_i386_nacl.sh
 delete mode 100644 ld/emulparams/elf_x86_64_nacl.sh
 delete mode 100644 ld/testsuite/ld-i386/emit-relocs-nacl.rd
 delete mode 100644 ld/testsuite/ld-i386/load1-nacl.d
 delete mode 100644 ld/testsuite/ld-i386/pie1-nacl.d
 delete mode 100644 ld/testsuite/ld-i386/plt-nacl.pd
 delete mode 100644 ld/testsuite/ld-i386/plt-pic-nacl.pd
 delete mode 100644 ld/testsuite/ld-i386/pr17709-nacl.rd
 delete mode 100644 ld/testsuite/ld-i386/pr19636-1d-nacl.d
 delete mode 100644 ld/testsuite/ld-i386/pr19636-2c-nacl.d
 delete mode 100644 ld/testsuite/ld-i386/pr19636-2d-nacl.d
 delete mode 100644 ld/testsuite/ld-i386/pr19636-2e-nacl.d
 delete mode 100644 ld/testsuite/ld-i386/pr19827-nacl.rd
 delete mode 100644 ld/testsuite/ld-i386/pr21884-nacl.d
 delete mode 100644 ld/testsuite/ld-i386/pr21884-nacl.t
 delete mode 100644 ld/testsuite/ld-i386/tlsbin-nacl.rd
 delete mode 100644 ld/testsuite/ld-i386/tlsbin2-nacl.rd
 delete mode 100644 ld/testsuite/ld-i386/tlsbindesc-nacl.rd
 delete mode 100644 ld/testsuite/ld-i386/tlsdesc-nacl.rd
 delete mode 100644 ld/testsuite/ld-i386/tlsgdesc-nacl.rd
 delete mode 100644 ld/testsuite/ld-i386/tlsnopic-nacl.rd
 delete mode 100644 ld/testsuite/ld-i386/tlspic-nacl.rd
 delete mode 100644 ld/testsuite/ld-i386/tlspic2-nacl.rd
 delete mode 100644 ld/testsuite/ld-x86-64/ilp32-4-nacl.d
 delete mode 100644 ld/testsuite/ld-x86-64/load1a-nacl.d
 delete mode 100644 ld/testsuite/ld-x86-64/load1b-nacl.d
 delete mode 100644 ld/testsuite/ld-x86-64/load1c-nacl.d
 delete mode 100644 ld/testsuite/ld-x86-64/load1d-nacl.d
 delete mode 100644 ld/testsuite/ld-x86-64/pie3-nacl.d
 delete mode 100644 ld/testsuite/ld-x86-64/plt-nacl.pd
 delete mode 100644 ld/testsuite/ld-x86-64/pr17709-nacl.rd
 delete mode 100644 ld/testsuite/ld-x86-64/pr19013-nacl.d
 delete mode 100644 ld/testsuite/ld-x86-64/pr19636-2d-nacl.d
 delete mode 100644 ld/testsuite/ld-x86-64/pr19827-nacl.rd
 delete mode 100644 ld/testsuite/ld-x86-64/pr21884-nacl.d
 delete mode 100644 ld/testsuite/ld-x86-64/pr21884-nacl.t
 delete mode 100644 ld/testsuite/ld-x86-64/split-by-file-nacl.rd
 delete mode 100644 ld/testsuite/ld-x86-64/tlsbin-nacl.rd
 delete mode 100644 ld/testsuite/ld-x86-64/tlsbin2-nacl.rd
 delete mode 100644 ld/testsuite/ld-x86-64/tlsbindesc-nacl.rd
 delete mode 100644 ld/testsuite/ld-x86-64/tlsdesc-nacl.pd
 delete mode 100644 ld/testsuite/ld-x86-64/tlsdesc-nacl.rd
 delete mode 100644 ld/testsuite/ld-x86-64/tlsgdesc-nacl.rd
 delete mode 100644 ld/testsuite/ld-x86-64/tlspic-nacl.rd
 delete mode 100644 ld/testsuite/ld-x86-64/tlspic2-nacl.rd

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 80a800f4b41..fa4799a6bcc 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,42 @@
+2020-06-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* archures.c (bfd_mach_i386_nacl): Removed.
+	(bfd_mach_i386_i386_nacl): Likewise.
+	(bfd_mach_x86_64_nacl): Likewise.
+	(bfd_mach_x64_32_nacl): Likewise.
+	* config.bfd: Remove *-*-nacl* targets.
+	* configure.ac: Remove x86 NaCl target vectors.
+	* cpu-i386.c (bfd_arch_i386_onebyte_nop_fill): Removed.
+	(bfd_x64_32_nacl_arch): Likewise.
+	(bfd_x86_64_nacl_arch): Likewise.
+	(bfd_i386_nacl_arch): Likewise.
+	(bfd_x64_32_arch_intel_syntax): Updated.
+	* elf32-i386.c: Don't include "elf-nacl.h".
+	(elf_i386_nacl_plt): Removed.
+	(elf_i386_nacl_plt0_entry): Likewise.
+	(elf_i386_nacl_plt_entry): Likewise.
+	(elf_i386_nacl_pic_plt0_entry): Likewise.
+	(elf_i386_nacl_pic_plt_entry): Likewise.
+	(elf_i386_nacl_eh_frame_plt): Likewise.
+	(elf_i386_nacl_plt): Likewise.
+	(elf32_i386_nacl_elf_object_p): Likewise.
+	(elf_i386_get_synthetic_symtab): Updated.
+	(elf_i386_link_setup_gnu_properties): Likewise.
+	* elf64-x86-64.c: Don't include "elf-nacl.h".
+	(elf_x86_64_nacl_plt): Removed.
+	(elf64_x86_64_nacl_elf_object_p): Likewise.
+	(elf_x86_64_nacl_plt0_entry): Likewise.
+	(elf_x86_64_nacl_plt_entry): Likewise.
+	(elf_x86_64_nacl_eh_frame_plt): Likewise.
+	(elf_x86_64_nacl_plt): Likewise.
+	(elf32_x86_64_nacl_elf_object_p): Likewise.
+	(elf_x86_64_get_synthetic_symtab): Updated.
+	(elf_x86_64_link_setup_gnu_properties): Likewise.
+	* elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Likewise.
+	* targets.c: Remove x86 NaCl target vectors.
+	* bfd-in2.h: Regenerated.
+	* configure: Likewise.
+
 2020-06-29  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elf32-tic6x.c (elf32_tic6x_size_dynamic_sections): Call
diff --git a/bfd/archures.c b/bfd/archures.c
index 1544b7b4833..551ec8732f0 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -211,10 +211,6 @@ DESCRIPTION
 .  bfd_arch_k1om,      {* Intel K1OM.  *}
 .#define bfd_mach_k1om			(1 << 6)
 .#define bfd_mach_k1om_intel_syntax	(bfd_mach_k1om | bfd_mach_i386_intel_syntax)
-.#define bfd_mach_i386_nacl		(1 << 7)
-.#define bfd_mach_i386_i386_nacl	(bfd_mach_i386_i386 | bfd_mach_i386_nacl)
-.#define bfd_mach_x86_64_nacl		(bfd_mach_x86_64 | bfd_mach_i386_nacl)
-.#define bfd_mach_x64_32_nacl		(bfd_mach_x64_32 | bfd_mach_i386_nacl)
 .  bfd_arch_iamcu,     {* Intel MCU.  *}
 .#define bfd_mach_iamcu			(1 << 8)
 .#define bfd_mach_i386_iamcu		(bfd_mach_i386_i386 | bfd_mach_iamcu)
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index fc3ed0c748d..35ef4d755bb 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1611,10 +1611,6 @@ enum bfd_architecture
   bfd_arch_k1om,      /* Intel K1OM.  */
 #define bfd_mach_k1om                  (1 << 6)
 #define bfd_mach_k1om_intel_syntax     (bfd_mach_k1om | bfd_mach_i386_intel_syntax)
-#define bfd_mach_i386_nacl             (1 << 7)
-#define bfd_mach_i386_i386_nacl        (bfd_mach_i386_i386 | bfd_mach_i386_nacl)
-#define bfd_mach_x86_64_nacl           (bfd_mach_x86_64 | bfd_mach_i386_nacl)
-#define bfd_mach_x64_32_nacl           (bfd_mach_x64_32 | bfd_mach_i386_nacl)
   bfd_arch_iamcu,     /* Intel MCU.  */
 #define bfd_mach_iamcu                 (1 << 8)
 #define bfd_mach_i386_iamcu            (bfd_mach_i386_i386 | bfd_mach_iamcu)
diff --git a/bfd/config.bfd b/bfd/config.bfd
index e19e4b37487..2fa2acb8a32 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -339,15 +339,11 @@ case "${targ}" in
     ;;
   arm-*-nacl*)
     targ_defvec=arm_elf32_nacl_le_vec
-    targ_selvecs="arm_elf32_nacl_be_vec i386_elf32_nacl_vec"
-    targ64_selvecs="x86_64_elf32_nacl_vec x86_64_elf64_nacl_vec"
-    targ_archs="$targ_archs bfd_i386_arch"
+    targ_selvecs="arm_elf32_nacl_be_vec"
     ;;
   armeb-*-nacl*)
     targ_defvec=arm_elf32_nacl_be_vec
-    targ_selvecs="arm_elf32_nacl_le_vec i386_elf32_nacl_vec"
-    targ64_selvecs="x86_64_elf32_nacl_vec x86_64_elf64_nacl_vec"
-    targ_archs="$targ_archs bfd_i386_arch"
+    targ_selvecs="arm_elf32_nacl_le_vec"
     ;;
   armeb-*-netbsdelf*)
     targ_defvec=arm_elf32_be_vec
@@ -635,12 +631,6 @@ case "${targ}" in
     targ_selvecs="iamcu_elf32_vec i386_pei_vec"
     targ64_selvecs="x86_64_elf64_vec x86_64_elf32_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
     ;;
-  i[3-7]86-*-nacl*)
-    targ_defvec=i386_elf32_nacl_vec
-    targ_selvecs="arm_elf32_nacl_be_vec arm_elf32_nacl_le_vec"
-    targ64_selvecs="x86_64_elf64_nacl_vec x86_64_elf32_nacl_vec"
-    targ_archs="$targ_archs bfd_arm_arch"
-    ;;
   i[3-7]86-*-redox*)
     targ_defvec=i386_elf32_vec
     targ_selvecs=
@@ -691,12 +681,6 @@ case "${targ}" in
     targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
     want64=true
     ;;
-  x86_64-*-nacl*)
-    targ_defvec=x86_64_elf32_nacl_vec
-    targ_selvecs="i386_elf32_nacl_vec x86_64_elf64_nacl_vec arm_elf32_nacl_be_vec arm_elf32_nacl_le_vec"
-    targ_archs="$targ_archs bfd_arm_arch"
-    want64=true
-    ;;
   x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin)
     targ_defvec=x86_64_pe_vec
     targ_selvecs="x86_64_pe_vec x86_64_pei_vec x86_64_pe_big_vec x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec i386_pe_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec"
diff --git a/bfd/configure b/bfd/configure
index c8267514ea7..155c8bd6d7c 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -14697,7 +14697,7 @@ coff="cofflink.lo $coffgen"
 ecoff="ecofflink.lo $coffgen"
 xcoff="xcofflink.lo $coffgen"
 
-elfxx_x86="elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo"
+elfxx_x86="elfxx-x86.lo elf-ifunc.lo elf-vxworks.lo"
 for vec in $selvecs
 do
     target_size=32
@@ -14782,7 +14782,6 @@ do
     i386_coff_lynx_vec)		 tb="$tb cf-i386lynx.lo lynx-core.lo $coff" ;;
     i386_elf32_vec)		 tb="$tb elf32-i386.lo $elfxx_x86 elf32.lo $elf" ;;
     i386_elf32_fbsd_vec)	 tb="$tb elf32-i386.lo $elfxx_x86 elf32.lo $elf" ;;
-    i386_elf32_nacl_vec)	 tb="$tb elf32-i386.lo $elfxx_x86 elf32.lo $elf" ;;
     i386_elf32_sol2_vec)	 tb="$tb elf32-i386.lo $elfxx_x86 elf32.lo $elf" ;;
     i386_elf32_vxworks_vec)	 tb="$tb elf32-i386.lo $elfxx_x86 elf32.lo $elf" ;;
     i386_mach_o_vec)		 tb="$tb mach-o-i386.lo" ;;
@@ -14800,10 +14799,10 @@ do
     ia64_pei_vec)		 tb="$tb pei-ia64.lo pepigen.lo $coff"; target_size=64 ;;
     ip2k_elf32_vec)		 tb="$tb elf32-ip2k.lo elf32.lo $elf" ;;
     iq2000_elf32_vec)		 tb="$tb elf32-iq2000.lo elf32.lo $elf" ;;
-    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     lm32_elf32_vec)		 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
     lm32_elf32_fdpic_vec)	 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
     m32c_elf32_vec)		 tb="$tb elf32-m32c.lo elf32.lo $elf" ;;
@@ -14963,11 +14962,9 @@ do
     wasm32_elf32_vec)            tb="$tb elf32-wasm32.lo elf32.lo $elf" ;;
     x86_64_coff_vec)		 tb="$tb coff-x86_64.lo $coff"; target_size=64 ;;
     x86_64_elf32_vec)		 tb="$tb elf64-x86-64.lo $elfxx_x86 elf64.lo elf32.lo $elf"; target_size=64 ;;
-    x86_64_elf32_nacl_vec)	 tb="$tb elf64-x86-64.lo $elfxx_x86 elf64.lo elf32.lo $elf"; target_size=64 ;;
     x86_64_elf64_vec)		 tb="$tb elf64-x86-64.lo $elfxx_x86 elf64.lo $elf"; target_size=64 ;;
     x86_64_elf64_cloudabi_vec)	 tb="$tb elf64-x86-64.lo $elfxx_x86 elf64.lo $elf"; target_size=64 ;;
     x86_64_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo $elfxx_x86 elf64.lo $elf"; target_size=64 ;;
-    x86_64_elf64_nacl_vec)	 tb="$tb elf64-x86-64.lo $elfxx_x86 elf64.lo $elf"; target_size=64 ;;
     x86_64_elf64_sol2_vec)	 tb="$tb elf64-x86-64.lo $elfxx_x86 elf64.lo $elf"; target_size=64 ;;
     x86_64_mach_o_vec)		 tb="$tb mach-o-x86-64.lo" ;;
     x86_64_pe_vec)		 tb="$tb pe-x86_64.lo pex64igen.lo $coff"; target_size=64 ;;
diff --git a/bfd/configure.ac b/bfd/configure.ac
index 1b67cb6caca..8e86f8399ce 100644
--- a/bfd/configure.ac
+++ b/bfd/configure.ac
@@ -433,7 +433,7 @@ coff="cofflink.lo $coffgen"
 ecoff="ecofflink.lo $coffgen"
 xcoff="xcofflink.lo $coffgen"
 
-elfxx_x86="elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo"
+elfxx_x86="elfxx-x86.lo elf-ifunc.lo elf-vxworks.lo"
 for vec in $selvecs
 do
     target_size=32
@@ -518,7 +518,6 @@ do
     i386_coff_lynx_vec)		 tb="$tb cf-i386lynx.lo lynx-core.lo $coff" ;;
     i386_elf32_vec)		 tb="$tb elf32-i386.lo $elfxx_x86 elf32.lo $elf" ;;
     i386_elf32_fbsd_vec)	 tb="$tb elf32-i386.lo $elfxx_x86 elf32.lo $elf" ;;
-    i386_elf32_nacl_vec)	 tb="$tb elf32-i386.lo $elfxx_x86 elf32.lo $elf" ;;
     i386_elf32_sol2_vec)	 tb="$tb elf32-i386.lo $elfxx_x86 elf32.lo $elf" ;;
     i386_elf32_vxworks_vec)	 tb="$tb elf32-i386.lo $elfxx_x86 elf32.lo $elf" ;;
     i386_mach_o_vec)		 tb="$tb mach-o-i386.lo" ;;
@@ -536,10 +535,10 @@ do
     ia64_pei_vec)		 tb="$tb pei-ia64.lo pepigen.lo $coff"; target_size=64 ;;
     ip2k_elf32_vec)		 tb="$tb elf32-ip2k.lo elf32.lo $elf" ;;
     iq2000_elf32_vec)		 tb="$tb elf32-iq2000.lo elf32.lo $elf" ;;
-    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elfxx-x86.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
     lm32_elf32_vec)		 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
     lm32_elf32_fdpic_vec)	 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
     m32c_elf32_vec)		 tb="$tb elf32-m32c.lo elf32.lo $elf" ;;
@@ -699,11 +698,9 @@ do
     wasm32_elf32_vec)            tb="$tb elf32-wasm32.lo elf32.lo $elf" ;;
     x86_64_coff_vec)		 tb="$tb coff-x86_64.lo $coff"; target_size=64 ;;
     x86_64_elf32_vec)		 tb="$tb elf64-x86-64.lo $elfxx_x86 elf64.lo elf32.lo $elf"; target_size=64 ;;
-    x86_64_elf32_nacl_vec)	 tb="$tb elf64-x86-64.lo $elfxx_x86 elf64.lo elf32.lo $elf"; target_size=64 ;;
     x86_64_elf64_vec)		 tb="$tb elf64-x86-64.lo $elfxx_x86 elf64.lo $elf"; target_size=64 ;;
     x86_64_elf64_cloudabi_vec)	 tb="$tb elf64-x86-64.lo $elfxx_x86 elf64.lo $elf"; target_size=64 ;;
     x86_64_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo $elfxx_x86 elf64.lo $elf"; target_size=64 ;;
-    x86_64_elf64_nacl_vec)	 tb="$tb elf64-x86-64.lo $elfxx_x86 elf64.lo $elf"; target_size=64 ;;
     x86_64_elf64_sol2_vec)	 tb="$tb elf64-x86-64.lo $elfxx_x86 elf64.lo $elf"; target_size=64 ;;
     x86_64_mach_o_vec)		 tb="$tb mach-o-x86-64.lo" ;;
     x86_64_pe_vec)		 tb="$tb pe-x86_64.lo pex64igen.lo $coff"; target_size=64 ;;
diff --git a/bfd/cpu-i386.c b/bfd/cpu-i386.c
index 962252d4431..7b644c23351 100644
--- a/bfd/cpu-i386.c
+++ b/bfd/cpu-i386.c
@@ -117,19 +117,6 @@ bfd_arch_i386_long_nop_fill (bfd_size_type count,
   return bfd_arch_i386_fill (count, code, TRUE);
 }
 
-/* Fill the buffer with zero, or one-byte nop instructions if CODE is TRUE.  */
-
-static void *
-bfd_arch_i386_onebyte_nop_fill (bfd_size_type count,
-				bfd_boolean is_bigendian ATTRIBUTE_UNUSED,
-				bfd_boolean code)
-{
-  void *fill = bfd_malloc (count);
-  if (fill != NULL)
-    memset (fill, code ? 0x90 : 0, count);
-  return fill;
-}
-
 #define N(BITS, MACH, NAME, PRINT, DEF, FILL, NEXT)	\
   { BITS, /* Bits in a word.  */		\
     BITS, /* Bits in an address.  */		\
@@ -148,22 +135,9 @@ bfd_arch_i386_onebyte_nop_fill (bfd_size_type count,
   }
 
 
-static const bfd_arch_info_type bfd_x64_32_nacl_arch =
-  N (64, bfd_mach_x64_32_nacl, "i386", "i386:x64-32:nacl",
-     FALSE, bfd_arch_i386_onebyte_nop_fill, NULL);
-
-static const bfd_arch_info_type bfd_x86_64_nacl_arch =
-  N (64, bfd_mach_x86_64_nacl, "i386", "i386:x86-64:nacl",
-     FALSE, bfd_arch_i386_onebyte_nop_fill, &bfd_x64_32_nacl_arch);
-
-const bfd_arch_info_type bfd_i386_nacl_arch =
-  N (32, bfd_mach_i386_i386_nacl, "i386", "i386:nacl",
-     TRUE, bfd_arch_i386_onebyte_nop_fill, &bfd_x86_64_nacl_arch);
-
-
 static const bfd_arch_info_type bfd_x64_32_arch_intel_syntax =
   N (64, bfd_mach_x64_32_intel_syntax, "i386:intel", "i386:x64-32:intel",
-     FALSE, bfd_arch_i386_long_nop_fill, &bfd_i386_nacl_arch);
+     FALSE, bfd_arch_i386_long_nop_fill, NULL);
 
 static const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =
   N (64, bfd_mach_x86_64_intel_syntax, "i386:intel", "i386:x86-64:intel",
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 6f4f7f47186..9045340cc12 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -19,7 +19,6 @@
    MA 02110-1301, USA.  */
 
 #include "elfxx-x86.h"
-#include "elf-nacl.h"
 #include "elf-vxworks.h"
 #include "dwarf2.h"
 #include "opcode/i386.h"
@@ -4098,9 +4097,6 @@ elf_i386_output_arch_local_syms
   return TRUE;
 }
 
-/* Forward declaration.  */
-static const struct elf_x86_lazy_plt_layout elf_i386_nacl_plt;
-
 /* Similar to _bfd_elf_get_synthetic_symtab.  Support PLTs with all
    dynamic relocations.   */
 
@@ -4159,9 +4155,6 @@ elf_i386_get_synthetic_symtab (bfd *abfd,
     case is_vxworks:
       lazy_plt = &elf_i386_lazy_plt;
       break;
-    case is_nacl:
-      lazy_plt = &elf_i386_nacl_plt;
-      break;
     default:
       abort ();
     }
@@ -4327,13 +4320,6 @@ elf_i386_link_setup_gnu_properties (struct bfd_link_info *info)
       init_table.lazy_ibt_plt = NULL;
       init_table.non_lazy_ibt_plt = NULL;
       break;
-    case is_nacl:
-      init_table.plt0_pad_byte = 0x90;
-      init_table.lazy_plt = &elf_i386_nacl_plt;
-      init_table.non_lazy_plt = NULL;
-      init_table.lazy_ibt_plt = NULL;
-      init_table.non_lazy_ibt_plt = NULL;
-      break;
     default:
       abort ();
     }
@@ -4591,196 +4577,6 @@ elf32_iamcu_elf_object_p (bfd *abfd)
 #undef	ELF_MACHINE_CODE
 #define ELF_MACHINE_CODE		EM_386
 
-/* Native Client support.  */
-
-#undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		i386_elf32_nacl_vec
-#undef	TARGET_LITTLE_NAME
-#define	TARGET_LITTLE_NAME		"elf32-i386-nacl"
-#undef	elf32_bed
-#define	elf32_bed			elf32_i386_nacl_bed
-
-#undef	ELF_MAXPAGESIZE
-#define	ELF_MAXPAGESIZE			0x10000
-
-/* Restore defaults.  */
-#undef	ELF_OSABI
-#undef	elf_backend_want_plt_sym
-#define elf_backend_want_plt_sym	0
-#undef	elf_backend_static_tls_alignment
-
-/* NaCl uses substantially different PLT entries for the same effects.  */
-
-#undef	elf_backend_plt_alignment
-#define elf_backend_plt_alignment	5
-#define NACL_PLT_ENTRY_SIZE		64
-#define	NACLMASK			0xe0 /* 32-byte alignment mask.  */
-
-static const bfd_byte elf_i386_nacl_plt0_entry[] =
-  {
-    0xff, 0x35,			  /* pushl contents of address */
-    0, 0, 0, 0,			  /* replaced with address of .got + 4.  */
-    0x8b, 0x0d,			  /* movl contents of address, %ecx */
-    0, 0, 0, 0,			  /* replaced with address of .got + 8.  */
-    0x83, 0xe1, NACLMASK,	  /* andl $NACLMASK, %ecx */
-    0xff, 0xe1			  /* jmp *%ecx */
-  };
-
-static const bfd_byte elf_i386_nacl_plt_entry[NACL_PLT_ENTRY_SIZE] =
-  {
-    0x8b, 0x0d,				/* movl contents of address, %ecx */
-    0, 0, 0, 0,				/* replaced with GOT slot address.  */
-    0x83, 0xe1, NACLMASK,		/* andl $NACLMASK, %ecx */
-    0xff, 0xe1,				/* jmp *%ecx */
-
-    /* Pad to the next 32-byte boundary with nop instructions.  */
-    0x90,
-    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
-    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
-
-    /* Lazy GOT entries point here (32-byte aligned).  */
-    0x68,			       /* pushl immediate */
-    0, 0, 0, 0,			       /* replaced with reloc offset.  */
-    0xe9,			       /* jmp relative */
-    0, 0, 0, 0,			       /* replaced with offset to .plt.  */
-
-    /* Pad to the next 32-byte boundary with nop instructions.  */
-    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
-    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
-    0x90, 0x90
-  };
-
-static const bfd_byte
-elf_i386_nacl_pic_plt0_entry[sizeof (elf_i386_nacl_plt0_entry)] =
-  {
-    0xff, 0x73, 0x04,		/* pushl 4(%ebx) */
-    0x8b, 0x4b, 0x08,		/* mov 0x8(%ebx), %ecx */
-    0x83, 0xe1, 0xe0,		/* and $NACLMASK, %ecx */
-    0xff, 0xe1,			/* jmp *%ecx */
-
-    /* This is expected to be the same size as elf_i386_nacl_plt0_entry,
-       so pad to that size with nop instructions.  */
-    0x90, 0x90, 0x90, 0x90, 0x90, 0x90
-  };
-
-static const bfd_byte elf_i386_nacl_pic_plt_entry[NACL_PLT_ENTRY_SIZE] =
-  {
-    0x8b, 0x8b,		 /* movl offset(%ebx), %ecx */
-    0, 0, 0, 0,		 /* replaced with offset of this symbol in .got.  */
-    0x83, 0xe1, 0xe0,	 /* andl $NACLMASK, %ecx */
-    0xff, 0xe1,		 /* jmp *%ecx */
-
-    /* Pad to the next 32-byte boundary with nop instructions.  */
-    0x90,
-    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
-    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
-
-    /* Lazy GOT entries point here (32-byte aligned).  */
-    0x68,		 /* pushl immediate */
-    0, 0, 0, 0,		 /* replaced with offset into relocation table.  */
-    0xe9,		 /* jmp relative */
-    0, 0, 0, 0,		 /* replaced with offset to start of .plt.  */
-
-    /* Pad to the next 32-byte boundary with nop instructions.  */
-    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
-    0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
-    0x90, 0x90
-  };
-
-static const bfd_byte elf_i386_nacl_eh_frame_plt[] =
-  {
-#if (PLT_CIE_LENGTH != 20				\
-     || PLT_FDE_LENGTH != 36				\
-     || PLT_FDE_START_OFFSET != 4 + PLT_CIE_LENGTH + 8	\
-     || PLT_FDE_LEN_OFFSET != 4 + PLT_CIE_LENGTH + 12)
-# error "Need PLT_CIE_LENGTH parameters for eh_frame_plt offsets!"
-#endif
-    PLT_CIE_LENGTH, 0, 0, 0,		/* CIE length */
-    0, 0, 0, 0,				/* CIE ID */
-    1,					/* CIE version */
-    'z', 'R', 0,			/* Augmentation string */
-    1,					/* Code alignment factor */
-    0x7c,				/* Data alignment factor: -4 */
-    8,					/* Return address column */
-    1,					/* Augmentation size */
-    DW_EH_PE_pcrel | DW_EH_PE_sdata4,	/* FDE encoding */
-    DW_CFA_def_cfa, 4, 4,		/* DW_CFA_def_cfa: r4 (esp) ofs 4 */
-    DW_CFA_offset + 8, 1,		/* DW_CFA_offset: r8 (eip) at cfa-4 */
-    DW_CFA_nop, DW_CFA_nop,
-
-    PLT_FDE_LENGTH, 0, 0, 0,	 /* FDE length */
-    PLT_CIE_LENGTH + 8, 0, 0, 0, /* CIE pointer */
-    0, 0, 0, 0,			 /* R_386_PC32 .plt goes here */
-    0, 0, 0, 0,			 /* .plt size goes here */
-    0,				 /* Augmentation size */
-    DW_CFA_def_cfa_offset, 8,	 /* DW_CFA_def_cfa_offset: 8 */
-    DW_CFA_advance_loc + 6,	 /* DW_CFA_advance_loc: 6 to __PLT__+6 */
-    DW_CFA_def_cfa_offset, 12,	 /* DW_CFA_def_cfa_offset: 12 */
-    DW_CFA_advance_loc + 58,	 /* DW_CFA_advance_loc: 58 to __PLT__+64 */
-    DW_CFA_def_cfa_expression,	 /* DW_CFA_def_cfa_expression */
-    13,				 /* Block length */
-    DW_OP_breg4, 4,		 /* DW_OP_breg4 (esp): 4 */
-    DW_OP_breg8, 0,		 /* DW_OP_breg8 (eip): 0 */
-    DW_OP_const1u, 63, DW_OP_and, DW_OP_const1u, 37, DW_OP_ge,
-    DW_OP_lit2, DW_OP_shl, DW_OP_plus,
-    DW_CFA_nop, DW_CFA_nop
-  };
-
-static const struct elf_x86_lazy_plt_layout elf_i386_nacl_plt =
-  {
-    elf_i386_nacl_plt0_entry,		/* plt0_entry */
-    sizeof (elf_i386_nacl_plt0_entry),	/* plt0_entry_size */
-    elf_i386_nacl_plt_entry,		/* plt_entry */
-    NACL_PLT_ENTRY_SIZE,		/* plt_entry_size */
-    NULL,				/* plt_tlsdesc_entry */
-    0,					/* plt_tlsdesc_entry_size*/
-    0,					/* plt_tlsdesc_got1_offset */
-    0,					/* plt_tlsdesc_got2_offset */
-    0,					/* plt_tlsdesc_got1_insn_end */
-    0,					/* plt_tlsdesc_got2_insn_end */
-    2,					/* plt0_got1_offset */
-    8,					/* plt0_got2_offset */
-    0,					/* plt0_got2_insn_end */
-    2,					/* plt_got_offset */
-    33,					/* plt_reloc_offset */
-    38,					/* plt_plt_offset */
-    0,					/* plt_got_insn_size */
-    0,					/* plt_plt_insn_end */
-    32,					/* plt_lazy_offset */
-    elf_i386_nacl_pic_plt0_entry,	/* pic_plt0_entry */
-    elf_i386_nacl_pic_plt_entry,	/* pic_plt_entry */
-    elf_i386_nacl_eh_frame_plt,		/* eh_frame_plt */
-    sizeof (elf_i386_nacl_eh_frame_plt) /* eh_frame_plt_size */
-  };
-
-static bfd_boolean
-elf32_i386_nacl_elf_object_p (bfd *abfd)
-{
-  /* Set the right machine number for a NaCl i386 ELF32 file.  */
-  bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_i386_i386_nacl);
-  return TRUE;
-}
-
-#undef	ELF_TARGET_OS
-#define ELF_TARGET_OS		is_nacl
-
-#undef	elf_backend_object_p
-#define elf_backend_object_p			elf32_i386_nacl_elf_object_p
-#undef	elf_backend_modify_segment_map
-#define	elf_backend_modify_segment_map		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	nacl_final_write_processing
-
-#include "elf32-target.h"
-
-/* Restore defaults.  */
-#undef	elf_backend_object_p
-#undef	elf_backend_modify_segment_map
-#undef	elf_backend_modify_headers
-#undef	elf_backend_final_write_processing
-
 /* VxWorks support.  */
 
 #undef	TARGET_LITTLE_SYM
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 8562f33fb86..311fb28a905 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -20,7 +20,6 @@
    MA 02110-1301, USA.  */
 
 #include "elfxx-x86.h"
-#include "elf-nacl.h"
 #include "dwarf2.h"
 #include "libiberty.h"
 
@@ -4744,9 +4743,6 @@ elf_x86_64_output_arch_local_syms
   return TRUE;
 }
 
-/* Forward declaration.  */
-static const struct elf_x86_lazy_plt_layout elf_x86_64_nacl_plt;
-
 /* Similar to _bfd_elf_get_synthetic_symtab.  Support PLTs with all
    dynamic relocations.   */
 
@@ -4791,31 +4787,19 @@ elf_x86_64_get_synthetic_symtab (bfd *abfd,
   if (relsize <= 0)
     return -1;
 
-  if (get_elf_backend_data (abfd)->target_os != is_nacl)
+  lazy_plt = &elf_x86_64_lazy_plt;
+  non_lazy_plt = &elf_x86_64_non_lazy_plt;
+  lazy_bnd_plt = &elf_x86_64_lazy_bnd_plt;
+  non_lazy_bnd_plt = &elf_x86_64_non_lazy_bnd_plt;
+  if (ABI_64_P (abfd))
     {
-      lazy_plt = &elf_x86_64_lazy_plt;
-      non_lazy_plt = &elf_x86_64_non_lazy_plt;
-      lazy_bnd_plt = &elf_x86_64_lazy_bnd_plt;
-      non_lazy_bnd_plt = &elf_x86_64_non_lazy_bnd_plt;
-      if (ABI_64_P (abfd))
-	{
-	  lazy_ibt_plt = &elf_x86_64_lazy_ibt_plt;
-	  non_lazy_ibt_plt = &elf_x86_64_non_lazy_ibt_plt;
-	}
-      else
-	{
-	  lazy_ibt_plt = &elf_x32_lazy_ibt_plt;
-	  non_lazy_ibt_plt = &elf_x32_non_lazy_ibt_plt;
-	}
+      lazy_ibt_plt = &elf_x86_64_lazy_ibt_plt;
+      non_lazy_ibt_plt = &elf_x86_64_non_lazy_ibt_plt;
     }
   else
     {
-      lazy_plt = &elf_x86_64_nacl_plt;
-      non_lazy_plt = NULL;
-      lazy_bnd_plt = NULL;
-      non_lazy_bnd_plt = NULL;
-      lazy_ibt_plt = NULL;
-      non_lazy_ibt_plt = NULL;
+      lazy_ibt_plt = &elf_x32_lazy_ibt_plt;
+      non_lazy_ibt_plt = &elf_x32_non_lazy_ibt_plt;
     }
 
   count = 0;
@@ -5130,6 +5114,8 @@ static bfd *
 elf_x86_64_link_setup_gnu_properties (struct bfd_link_info *info)
 {
   struct elf_x86_init_table init_table;
+  const struct elf_backend_data *bed;
+  struct elf_x86_link_hash_table *htab;
 
   if ((int) R_X86_64_standard >= (int) R_X86_64_converted_reloc_bit
       || (int) R_X86_64_max <= (int) R_X86_64_converted_reloc_bit
@@ -5142,42 +5128,30 @@ elf_x86_64_link_setup_gnu_properties (struct bfd_link_info *info)
   /* This is unused for x86-64.  */
   init_table.plt0_pad_byte = 0x90;
 
-  if (get_elf_backend_data (info->output_bfd)->target_os != is_nacl)
+  bed = get_elf_backend_data (info->output_bfd);
+  htab = elf_x86_hash_table (info, bed->target_id);
+  if (!htab)
+    abort ();
+  if (htab->params->bndplt)
     {
-      const struct elf_backend_data *bed
-	= get_elf_backend_data (info->output_bfd);
-      struct elf_x86_link_hash_table *htab
-	= elf_x86_hash_table (info, bed->target_id);
-      if (!htab)
-	abort ();
-      if (htab->params->bndplt)
-	{
-	  init_table.lazy_plt = &elf_x86_64_lazy_bnd_plt;
-	  init_table.non_lazy_plt = &elf_x86_64_non_lazy_bnd_plt;
-	}
-      else
-	{
-	  init_table.lazy_plt = &elf_x86_64_lazy_plt;
-	  init_table.non_lazy_plt = &elf_x86_64_non_lazy_plt;
-	}
+      init_table.lazy_plt = &elf_x86_64_lazy_bnd_plt;
+      init_table.non_lazy_plt = &elf_x86_64_non_lazy_bnd_plt;
+    }
+  else
+    {
+      init_table.lazy_plt = &elf_x86_64_lazy_plt;
+      init_table.non_lazy_plt = &elf_x86_64_non_lazy_plt;
+    }
 
-      if (ABI_64_P (info->output_bfd))
-	{
-	  init_table.lazy_ibt_plt = &elf_x86_64_lazy_ibt_plt;
-	  init_table.non_lazy_ibt_plt = &elf_x86_64_non_lazy_ibt_plt;
-	}
-      else
-	{
-	  init_table.lazy_ibt_plt = &elf_x32_lazy_ibt_plt;
-	  init_table.non_lazy_ibt_plt = &elf_x32_non_lazy_ibt_plt;
-	}
+  if (ABI_64_P (info->output_bfd))
+    {
+      init_table.lazy_ibt_plt = &elf_x86_64_lazy_ibt_plt;
+      init_table.non_lazy_ibt_plt = &elf_x86_64_non_lazy_ibt_plt;
     }
   else
     {
-      init_table.lazy_plt = &elf_x86_64_nacl_plt;
-      init_table.non_lazy_plt = NULL;
-      init_table.lazy_ibt_plt = NULL;
-      init_table.non_lazy_ibt_plt = NULL;
+      init_table.lazy_ibt_plt = &elf_x32_lazy_ibt_plt;
+      init_table.non_lazy_ibt_plt = &elf_x32_non_lazy_ibt_plt;
     }
 
   if (ABI_64_P (info->output_bfd))
@@ -5364,30 +5338,6 @@ elf64_x86_64_copy_solaris_special_section_fields (const bfd *ibfd ATTRIBUTE_UNUS
 
 #include "elf64-target.h"
 
-/* Native Client support.  */
-
-static bfd_boolean
-elf64_x86_64_nacl_elf_object_p (bfd *abfd)
-{
-  /* Set the right machine number for a NaCl x86-64 ELF64 file.  */
-  bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_x86_64_nacl);
-  return TRUE;
-}
-
-#undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		x86_64_elf64_nacl_vec
-#undef	TARGET_LITTLE_NAME
-#define	TARGET_LITTLE_NAME		"elf64-x86-64-nacl"
-#undef	elf64_bed
-#define	elf64_bed			elf64_x86_64_nacl_bed
-
-#undef	ELF_MAXPAGESIZE
-#undef	ELF_MINPAGESIZE
-#undef	ELF_COMMONPAGESIZE
-#define ELF_MAXPAGESIZE			0x10000
-#define ELF_MINPAGESIZE			0x10000
-#define ELF_COMMONPAGESIZE		0x10000
-
 /* Restore defaults.  */
 #undef	ELF_OSABI
 #undef	elf_backend_static_tls_alignment
@@ -5396,188 +5346,6 @@ elf64_x86_64_nacl_elf_object_p (bfd *abfd)
 #undef  elf_backend_strtab_flags
 #undef  elf_backend_copy_special_section_fields
 
-/* NaCl uses substantially different PLT entries for the same effects.  */
-
-#undef	elf_backend_plt_alignment
-#define elf_backend_plt_alignment	5
-#define NACL_PLT_ENTRY_SIZE		64
-#define	NACLMASK			0xe0 /* 32-byte alignment mask.  */
-
-static const bfd_byte elf_x86_64_nacl_plt0_entry[NACL_PLT_ENTRY_SIZE] =
-  {
-    0xff, 0x35, 8, 0, 0, 0,		/* pushq GOT+8(%rip)		*/
-    0x4c, 0x8b, 0x1d, 16, 0, 0, 0,	/* mov GOT+16(%rip), %r11	*/
-    0x41, 0x83, 0xe3, NACLMASK,		/* and $-32, %r11d		*/
-    0x4d, 0x01, 0xfb,			/* add %r15, %r11		*/
-    0x41, 0xff, 0xe3,			/* jmpq *%r11			*/
-
-    /* 9-byte nop sequence to pad out to the next 32-byte boundary.  */
-    0x66, 0x0f, 0x1f, 0x84, 0, 0, 0, 0, 0, /* nopw 0x0(%rax,%rax,1)	*/
-
-    /* 32 bytes of nop to pad out to the standard size.  */
-    0x66, 0x66, 0x66, 0x66, 0x66, 0x66,    /* excess data16 prefixes	*/
-    0x2e, 0x0f, 0x1f, 0x84, 0, 0, 0, 0, 0, /* nopw %cs:0x0(%rax,%rax,1)	*/
-    0x66, 0x66, 0x66, 0x66, 0x66, 0x66,    /* excess data16 prefixes	*/
-    0x2e, 0x0f, 0x1f, 0x84, 0, 0, 0, 0, 0, /* nopw %cs:0x0(%rax,%rax,1)	*/
-    0x66,				   /* excess data16 prefix	*/
-    0x90				   /* nop */
-  };
-
-static const bfd_byte elf_x86_64_nacl_plt_entry[NACL_PLT_ENTRY_SIZE] =
-  {
-    0x4c, 0x8b, 0x1d, 0, 0, 0, 0,	/* mov name@GOTPCREL(%rip),%r11	*/
-    0x41, 0x83, 0xe3, NACLMASK,		/* and $-32, %r11d		*/
-    0x4d, 0x01, 0xfb,			/* add %r15, %r11		*/
-    0x41, 0xff, 0xe3,			/* jmpq *%r11			*/
-
-    /* 15-byte nop sequence to pad out to the next 32-byte boundary.  */
-    0x66, 0x66, 0x66, 0x66, 0x66, 0x66,    /* excess data16 prefixes	*/
-    0x2e, 0x0f, 0x1f, 0x84, 0, 0, 0, 0, 0, /* nopw %cs:0x0(%rax,%rax,1)	*/
-
-    /* Lazy GOT entries point here (32-byte aligned).  */
-    0x68,		  /* pushq immediate */
-    0, 0, 0, 0,		  /* replaced with index into relocation table.	 */
-    0xe9,		  /* jmp relative */
-    0, 0, 0, 0,		  /* replaced with offset to start of .plt0.  */
-
-    /* 22 bytes of nop to pad out to the standard size.	 */
-    0x66, 0x66, 0x66, 0x66, 0x66, 0x66,    /* excess data16 prefixes	*/
-    0x2e, 0x0f, 0x1f, 0x84, 0, 0, 0, 0, 0, /* nopw %cs:0x0(%rax,%rax,1)	*/
-    0x0f, 0x1f, 0x80, 0, 0, 0, 0,	   /* nopl 0x0(%rax)		*/
-  };
-
-/* .eh_frame covering the .plt section.  */
-
-static const bfd_byte elf_x86_64_nacl_eh_frame_plt[] =
-  {
-#if (PLT_CIE_LENGTH != 20				\
-     || PLT_FDE_LENGTH != 36				\
-     || PLT_FDE_START_OFFSET != 4 + PLT_CIE_LENGTH + 8	\
-     || PLT_FDE_LEN_OFFSET != 4 + PLT_CIE_LENGTH + 12)
-# error "Need PLT_CIE_LENGTH parameters for eh_frame_plt offsets!"
-#endif
-    PLT_CIE_LENGTH, 0, 0, 0,	/* CIE length */
-    0, 0, 0, 0,			/* CIE ID */
-    1,				/* CIE version */
-    'z', 'R', 0,		/* Augmentation string */
-    1,				/* Code alignment factor */
-    0x78,			/* Data alignment factor */
-    16,				/* Return address column */
-    1,				/* Augmentation size */
-    DW_EH_PE_pcrel | DW_EH_PE_sdata4, /* FDE encoding */
-    DW_CFA_def_cfa, 7, 8,	/* DW_CFA_def_cfa: r7 (rsp) ofs 8 */
-    DW_CFA_offset + 16, 1,	/* DW_CFA_offset: r16 (rip) at cfa-8 */
-    DW_CFA_nop, DW_CFA_nop,
-
-    PLT_FDE_LENGTH, 0, 0, 0,	/* FDE length */
-    PLT_CIE_LENGTH + 8, 0, 0, 0,/* CIE pointer */
-    0, 0, 0, 0,			/* R_X86_64_PC32 .plt goes here */
-    0, 0, 0, 0,			/* .plt size goes here */
-    0,				/* Augmentation size */
-    DW_CFA_def_cfa_offset, 16,	/* DW_CFA_def_cfa_offset: 16 */
-    DW_CFA_advance_loc + 6,	/* DW_CFA_advance_loc: 6 to __PLT__+6 */
-    DW_CFA_def_cfa_offset, 24,	/* DW_CFA_def_cfa_offset: 24 */
-    DW_CFA_advance_loc + 58,	/* DW_CFA_advance_loc: 58 to __PLT__+64 */
-    DW_CFA_def_cfa_expression,	/* DW_CFA_def_cfa_expression */
-    13,				/* Block length */
-    DW_OP_breg7, 8,		/* DW_OP_breg7 (rsp): 8 */
-    DW_OP_breg16, 0,		/* DW_OP_breg16 (rip): 0 */
-    DW_OP_const1u, 63, DW_OP_and, DW_OP_const1u, 37, DW_OP_ge,
-    DW_OP_lit3, DW_OP_shl, DW_OP_plus,
-    DW_CFA_nop, DW_CFA_nop
-  };
-
-static const struct elf_x86_lazy_plt_layout elf_x86_64_nacl_plt =
-  {
-    elf_x86_64_nacl_plt0_entry,		     /* plt0_entry */
-    NACL_PLT_ENTRY_SIZE,		     /* plt0_entry_size */
-    elf_x86_64_nacl_plt_entry,		     /* plt_entry */
-    NACL_PLT_ENTRY_SIZE,		     /* plt_entry_size */
-    elf_x86_64_nacl_plt0_entry,		     /* plt_tlsdesc_entry */
-    NACL_PLT_ENTRY_SIZE,		     /* plt_tlsdesc_entry_size */
-    2,					     /* plt_tlsdesc_got1_offset */
-    9,					     /* plt_tlsdesc_got2_offset */
-    6,					     /* plt_tlsdesc_got1_insn_end */
-    13,					     /* plt_tlsdesc_got2_insn_end */
-    2,					     /* plt0_got1_offset */
-    9,					     /* plt0_got2_offset */
-    13,					     /* plt0_got2_insn_end */
-    3,					     /* plt_got_offset */
-    33,					     /* plt_reloc_offset */
-    38,					     /* plt_plt_offset */
-    7,					     /* plt_got_insn_size */
-    42,					     /* plt_plt_insn_end */
-    32,					     /* plt_lazy_offset */
-    elf_x86_64_nacl_plt0_entry,		     /* pic_plt0_entry */
-    elf_x86_64_nacl_plt_entry,		     /* pic_plt_entry */
-    elf_x86_64_nacl_eh_frame_plt,	     /* eh_frame_plt */
-    sizeof (elf_x86_64_nacl_eh_frame_plt)    /* eh_frame_plt_size */
-  };
-
-#undef ELF_TARGET_OS
-#define	ELF_TARGET_OS				is_nacl
-
-#undef	elf_backend_object_p
-#define elf_backend_object_p			elf64_x86_64_nacl_elf_object_p
-#undef	elf_backend_modify_segment_map
-#define	elf_backend_modify_segment_map		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	nacl_final_write_processing
-
-#include "elf64-target.h"
-
-/* Native Client x32 support.  */
-
-static bfd_boolean
-elf32_x86_64_nacl_elf_object_p (bfd *abfd)
-{
-  /* Set the right machine number for a NaCl x86-64 ELF32 file.  */
-  bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_x64_32_nacl);
-  return TRUE;
-}
-
-#undef	TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		x86_64_elf32_nacl_vec
-#undef	TARGET_LITTLE_NAME
-#define TARGET_LITTLE_NAME		"elf32-x86-64-nacl"
-#undef	elf32_bed
-#define	elf32_bed			elf32_x86_64_nacl_bed
-
-#define bfd_elf32_bfd_reloc_type_lookup	\
-  elf_x86_64_reloc_type_lookup
-#define bfd_elf32_bfd_reloc_name_lookup \
-  elf_x86_64_reloc_name_lookup
-#define bfd_elf32_get_synthetic_symtab \
-  elf_x86_64_get_synthetic_symtab
-
-#undef elf_backend_object_p
-#define elf_backend_object_p \
-  elf32_x86_64_nacl_elf_object_p
-
-#undef elf_backend_bfd_from_remote_memory
-#define elf_backend_bfd_from_remote_memory \
-  _bfd_elf32_bfd_from_remote_memory
-
-#undef elf_backend_size_info
-#define elf_backend_size_info \
-  _bfd_elf32_size_info
-
-#undef	elf32_bed
-#define	elf32_bed			elf32_x86_64_bed
-
-#include "elf32-target.h"
-
-/* Restore defaults.  */
-#undef	elf_backend_object_p
-#define elf_backend_object_p		    elf64_x86_64_elf_object_p
-#undef	elf_backend_bfd_from_remote_memory
-#undef	elf_backend_size_info
-#undef	elf_backend_modify_segment_map
-#undef	elf_backend_modify_headers
-#undef	elf_backend_final_write_processing
-
 /* Intel L1OM support.  */
 
 static bfd_boolean
@@ -5666,11 +5434,6 @@ elf64_k1om_elf_object_p (bfd *abfd)
 #undef elf_backend_object_p
 #define elf_backend_object_p		    elf64_k1om_elf_object_p
 
-#undef  elf_backend_static_tls_alignment
-
-#undef elf_backend_want_plt_sym
-#define elf_backend_want_plt_sym	    0
-
 #include "elf64-target.h"
 
 /* FreeBSD K1OM support.  */
@@ -5695,6 +5458,7 @@ elf64_k1om_elf_object_p (bfd *abfd)
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME		    "elf32-x86-64"
 #undef	elf32_bed
+#define	elf32_bed			    elf32_x86_64_bed
 
 #undef ELF_ARCH
 #define ELF_ARCH			    bfd_arch_i386
@@ -5704,6 +5468,13 @@ elf64_k1om_elf_object_p (bfd *abfd)
 
 #undef	ELF_OSABI
 
+#define bfd_elf32_bfd_reloc_type_lookup	\
+  elf_x86_64_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup \
+  elf_x86_64_reloc_name_lookup
+#define bfd_elf32_get_synthetic_symtab \
+  elf_x86_64_get_synthetic_symtab
+
 #undef elf_backend_object_p
 #define elf_backend_object_p \
   elf32_x86_64_elf_object_p
diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index 5b1793ae807..e58ddc19cf6 100644
--- a/bfd/elfxx-x86.c
+++ b/bfd/elfxx-x86.c
@@ -2795,9 +2795,6 @@ _bfd_x86_elf_link_setup_gnu_properties
 	  htab->interp = s;
 	}
 
-      /* Don't change PLT section alignment for NaCl since it uses
-	 64-byte PLT entry and sets PLT section alignment to 32
-	 bytes.  Don't create additional PLT sections for NaCl.  */
       if (normal_target)
 	{
 	  flagword pltflags = (bed->dynamic_sec_flags
@@ -2831,8 +2828,7 @@ _bfd_x86_elf_link_setup_gnu_properties
 	      if (use_ibt_plt)
 		{
 		  /* Create the second PLT for Intel IBT support.  IBT
-		     PLT is supported only for non-NaCl target and is
-		     is needed only for lazy binding.  */
+		     PLT is needed only for lazy binding.  */
 		  sec = bfd_make_section_anyway_with_flags (dynobj,
 							    ".plt.sec",
 							    pltflags);
@@ -2845,8 +2841,8 @@ _bfd_x86_elf_link_setup_gnu_properties
 	      else if (htab->params->bndplt && ABI_64_P (dynobj))
 		{
 		  /* Create the second PLT for Intel MPX support.  MPX
-		     PLT is supported only for non-NaCl target in 64-bit
-		     mode and is needed only for lazy binding.  */
+		     PLT is supported only in 64-bit mode and is needed
+		     only for lazy binding.  */
 		  sec = bfd_make_section_anyway_with_flags (dynobj,
 							    ".plt.sec",
 							    pltflags);
diff --git a/bfd/targets.c b/bfd/targets.c
index d95c0aaf3c3..0732c5e4292 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -736,7 +736,6 @@ extern const bfd_target i386_coff_go32stubbed_vec;
 extern const bfd_target i386_coff_lynx_vec;
 extern const bfd_target i386_elf32_vec;
 extern const bfd_target i386_elf32_fbsd_vec;
-extern const bfd_target i386_elf32_nacl_vec;
 extern const bfd_target i386_elf32_sol2_vec;
 extern const bfd_target i386_elf32_vxworks_vec;
 extern const bfd_target i386_mach_o_vec;
@@ -918,11 +917,9 @@ extern const bfd_target wasm_vec;
 extern const bfd_target wasm32_elf32_vec;
 extern const bfd_target x86_64_coff_vec;
 extern const bfd_target x86_64_elf32_vec;
-extern const bfd_target x86_64_elf32_nacl_vec;
 extern const bfd_target x86_64_elf64_vec;
 extern const bfd_target x86_64_elf64_cloudabi_vec;
 extern const bfd_target x86_64_elf64_fbsd_vec;
-extern const bfd_target x86_64_elf64_nacl_vec;
 extern const bfd_target x86_64_elf64_sol2_vec;
 extern const bfd_target x86_64_mach_o_vec;
 extern const bfd_target x86_64_pe_vec;
@@ -1085,7 +1082,6 @@ static const bfd_target * const _bfd_target_vector[] =
 	&i386_coff_lynx_vec,
 	&i386_elf32_vec,
 	&i386_elf32_fbsd_vec,
-	&i386_elf32_nacl_vec,
 	&i386_elf32_sol2_vec,
 	&i386_elf32_vxworks_vec,
 	&i386_mach_o_vec,
@@ -1335,11 +1331,9 @@ static const bfd_target * const _bfd_target_vector[] =
 #ifdef BFD64
 	&x86_64_coff_vec,
 	&x86_64_elf32_vec,
-	&x86_64_elf32_nacl_vec,
 	&x86_64_elf64_vec,
 	&x86_64_elf64_cloudabi_vec,
 	&x86_64_elf64_fbsd_vec,
-	&x86_64_elf64_nacl_vec,
 	&x86_64_elf64_sol2_vec,
 	&x86_64_mach_o_vec,
 	&x86_64_pe_vec,
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 2c1ad92aab9..c37e6f70748 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,23 @@
+2020-06-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* NEWS: Mention x86 NaCl target support removal.
+	* dwarf.c (init_dwarf_regnames_by_bfd_arch_and_mach): Remove
+	x86 NaCl target support.
+	* testsuite/binutils-all/elfedit-1.d: Likewise.
+	* testsuite/binutils-all/i386/i386.exp: Likewise.
+	* testsuite/binutils-all/x86-64/objects.exp: Likewise.
+	* testsuite/binutils-all/x86-64/pr23494a-x32.d: Likewise.
+	* testsuite/binutils-all/x86-64/pr23494a.d: Likewise.
+	* testsuite/binutils-all/x86-64/pr23494b-x32.d: Likewise.
+	* testsuite/binutils-all/x86-64/pr23494b.d: Likewise.
+	* testsuite/binutils-all/x86-64/pr23494c-x32.d: Likewise.
+	* testsuite/binutils-all/x86-64/pr23494c.d: Likewise.
+	* testsuite/binutils-all/x86-64/pr23494d-x32.d: Likewise.
+	* testsuite/binutils-all/x86-64/pr23494d.d: Likewise.
+	* testsuite/binutils-all/x86-64/pr23494e-x32.d: Likewise.
+	* testsuite/binutils-all/x86-64/pr23494e.d: Likewise.
+	* testsuite/binutils-all/x86-64/x86-64.exp: Likewise.
+
 2020-06-30  Nick Clifton  <nickc@redhat.com>
 
 	* dwarf.c (read_and_display_attr_value): Support
diff --git a/binutils/NEWS b/binutils/NEWS
index e1aaf996e89..b0cc156f88f 100644
--- a/binutils/NEWS
+++ b/binutils/NEWS
@@ -1,5 +1,7 @@
 -*- text -*-
 
+* X86 NaCl target support is removed.
+
 * The readelf tool now has a -L or --lint or --enable-checks option which turns
   on warning messages about possible problems with the file(s) being examined.
   These checks include things like zero-sized sections, which are allowed by
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index b2dc6fbba7f..bdabd9c4baa 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -7639,10 +7639,8 @@ init_dwarf_regnames_by_bfd_arch_and_mach (enum bfd_architecture arch,
 	{
 	case bfd_mach_x86_64:
 	case bfd_mach_x86_64_intel_syntax:
-	case bfd_mach_x86_64_nacl:
 	case bfd_mach_x64_32:
 	case bfd_mach_x64_32_intel_syntax:
-	case bfd_mach_x64_32_nacl:
 	  init_dwarf_regnames_x86_64 ();
 	  break;
 
diff --git a/binutils/testsuite/binutils-all/elfedit-1.d b/binutils/testsuite/binutils-all/elfedit-1.d
index d917e561347..629af163c09 100644
--- a/binutils/testsuite/binutils-all/elfedit-1.d
+++ b/binutils/testsuite/binutils-all/elfedit-1.d
@@ -4,7 +4,7 @@
 #readelf: -h
 #name: Update ELF header 1
 #target: x86_64-*-*
-#notarget: x86_64-*-gnux32 x86_64-*-nacl*
+#notarget: x86_64-*-gnux32
 
 #...
 ELF Header:
diff --git a/binutils/testsuite/binutils-all/i386/i386.exp b/binutils/testsuite/binutils-all/i386/i386.exp
index 1ec07fb461c..1b2875cf5af 100644
--- a/binutils/testsuite/binutils-all/i386/i386.exp
+++ b/binutils/testsuite/binutils-all/i386/i386.exp
@@ -16,9 +16,7 @@
 
 if {!([istarget "i*86-*-linux*"]
       || [istarget "i*86-*-gnu*"]
-      || [istarget "i*86-*-nacl*"]
-      || [istarget "x86_64-*-linux*"]
-      || [istarget "x86_64-*-nacl*"])
+      || [istarget "x86_64-*-linux*"])
     || ![is_elf_format]
     || [is_remote host]} then {
     return
diff --git a/binutils/testsuite/binutils-all/x86-64/objects.exp b/binutils/testsuite/binutils-all/x86-64/objects.exp
index 338f1d73665..88fa240a77f 100644
--- a/binutils/testsuite/binutils-all/x86-64/objects.exp
+++ b/binutils/testsuite/binutils-all/x86-64/objects.exp
@@ -16,9 +16,7 @@
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
-if {!([istarget "x86_64-*-linux*"]
-      || [istarget "x86_64-*-nacl*"])
-    || [is_remote host]} {
+if {![istarget "x86_64-*-linux*"] || [is_remote host]} {
     return
 }
 
diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494a-x32.d b/binutils/testsuite/binutils-all/x86-64/pr23494a-x32.d
index 3c255d8bb4f..819551725ca 100644
--- a/binutils/testsuite/binutils-all/x86-64/pr23494a-x32.d
+++ b/binutils/testsuite/binutils-all/x86-64/pr23494a-x32.d
@@ -3,7 +3,6 @@
 #as: --x32 -mx86-used-note=yes
 #objcopy: -O elf64-x86-64
 #readelf: -n
-#notarget: x86_64-*-nacl*
 
 Displaying notes found in: .note.gnu.property
 [ 	]+Owner[ 	]+Data size[ 	]+Description
diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494a.d b/binutils/testsuite/binutils-all/x86-64/pr23494a.d
index 457fd4e2c1f..906273331d3 100644
--- a/binutils/testsuite/binutils-all/x86-64/pr23494a.d
+++ b/binutils/testsuite/binutils-all/x86-64/pr23494a.d
@@ -3,7 +3,6 @@
 #as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #objcopy: -O elf32-x86-64
 #readelf: -n
-#notarget: x86_64-*-nacl*
 
 Displaying notes found in: .note.gnu.property
 [ 	]+Owner[ 	]+Data size[ 	]+Description
diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494b-x32.d b/binutils/testsuite/binutils-all/x86-64/pr23494b-x32.d
index 40a23c050d3..e8ef006037c 100644
--- a/binutils/testsuite/binutils-all/x86-64/pr23494b-x32.d
+++ b/binutils/testsuite/binutils-all/x86-64/pr23494b-x32.d
@@ -3,4 +3,3 @@
 #as: --x32 -mx86-used-note=yes
 #objcopy: -O elf64-x86-64 -R .note.gnu.property
 #readelf: -n
-#notarget: x86_64-*-nacl*
diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494b.d b/binutils/testsuite/binutils-all/x86-64/pr23494b.d
index 74b0bc19813..55c300ac4d7 100644
--- a/binutils/testsuite/binutils-all/x86-64/pr23494b.d
+++ b/binutils/testsuite/binutils-all/x86-64/pr23494b.d
@@ -3,4 +3,3 @@
 #as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #objcopy: -O elf32-x86-64 -R .note.gnu.property
 #readelf: -n
-#notarget: x86_64-*-nacl*
diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494c-x32.d b/binutils/testsuite/binutils-all/x86-64/pr23494c-x32.d
index a11a3fbde05..188705b18ac 100644
--- a/binutils/testsuite/binutils-all/x86-64/pr23494c-x32.d
+++ b/binutils/testsuite/binutils-all/x86-64/pr23494c-x32.d
@@ -3,7 +3,6 @@
 #as: --x32 -mx86-used-note=no
 #objcopy: -O elf64-x86-64
 #readelf: -n
-#notarget: x86_64-*-nacl*
 
 Displaying notes found in: .note.gnu.property
 [ 	]+Owner[ 	]+Data size[ 	]+Description
diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494c.d b/binutils/testsuite/binutils-all/x86-64/pr23494c.d
index 1fd0ab10b50..7fff8e6641c 100644
--- a/binutils/testsuite/binutils-all/x86-64/pr23494c.d
+++ b/binutils/testsuite/binutils-all/x86-64/pr23494c.d
@@ -3,7 +3,6 @@
 #as: --64 -defsym __64_bit__=1 -mx86-used-note=no
 #objcopy: -O elf32-x86-64
 #readelf: -n
-#notarget: x86_64-*-nacl*
 
 Displaying notes found in: .note.gnu.property
 [ 	]+Owner[ 	]+Data size[ 	]+Description
diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494d-x32.d b/binutils/testsuite/binutils-all/x86-64/pr23494d-x32.d
index 724d9c3b82a..eaf5438e1b8 100644
--- a/binutils/testsuite/binutils-all/x86-64/pr23494d-x32.d
+++ b/binutils/testsuite/binutils-all/x86-64/pr23494d-x32.d
@@ -3,7 +3,6 @@
 #as: --x32 -mx86-used-note=yes
 #objcopy: -O elf64-x86-64 --decompress-debug-sections
 #readelf: -n
-#notarget: x86_64-*-nacl*
 
 Displaying notes found in: .note.gnu.property
 [ 	]+Owner[ 	]+Data size[ 	]+Description
diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494d.d b/binutils/testsuite/binutils-all/x86-64/pr23494d.d
index e35dea4e9a4..ef70683dbfc 100644
--- a/binutils/testsuite/binutils-all/x86-64/pr23494d.d
+++ b/binutils/testsuite/binutils-all/x86-64/pr23494d.d
@@ -3,7 +3,6 @@
 #as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #objcopy: -O elf32-x86-64 --decompress-debug-sections
 #readelf: -n
-#notarget: x86_64-*-nacl*
 
 Displaying notes found in: .note.gnu.property
 [ 	]+Owner[ 	]+Data size[ 	]+Description
diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494e-x32.d b/binutils/testsuite/binutils-all/x86-64/pr23494e-x32.d
index b540d7705de..62c655d99fb 100644
--- a/binutils/testsuite/binutils-all/x86-64/pr23494e-x32.d
+++ b/binutils/testsuite/binutils-all/x86-64/pr23494e-x32.d
@@ -3,7 +3,6 @@
 #as: --x32 -mx86-used-note=yes
 #objcopy: -O elf64-x86-64 --decompress-debug-sections
 #readelf: -n
-#notarget: x86_64-*-nacl*
 
 Displaying notes found in: .note.gnu.property
 [ 	]+Owner[ 	]+Data size[ 	]+Description
diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494e.d b/binutils/testsuite/binutils-all/x86-64/pr23494e.d
index fcbda09cd22..6423bbf44d8 100644
--- a/binutils/testsuite/binutils-all/x86-64/pr23494e.d
+++ b/binutils/testsuite/binutils-all/x86-64/pr23494e.d
@@ -3,7 +3,6 @@
 #as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #objcopy: -O elf32-x86-64 --decompress-debug-sections
 #readelf: -n
-#notarget: x86_64-*-nacl*
 
 Displaying notes found in: .note.gnu.property
 [ 	]+Owner[ 	]+Data size[ 	]+Description
diff --git a/binutils/testsuite/binutils-all/x86-64/x86-64.exp b/binutils/testsuite/binutils-all/x86-64/x86-64.exp
index 4e977c3c836..7bd49ab619d 100644
--- a/binutils/testsuite/binutils-all/x86-64/x86-64.exp
+++ b/binutils/testsuite/binutils-all/x86-64/x86-64.exp
@@ -14,9 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
-if {!([istarget "x86_64-*-linux*"]
-      || [istarget "x86_64-*-nacl*"])
-    || [is_remote host]} {
+if {![istarget "x86_64-*-linux*"] || [is_remote host]} {
     return
 }
 
diff --git a/gas/ChangeLog b/gas/ChangeLog
index b91d6afe74f..c249180a019 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,18 @@
+2020-06-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* NEWS: Mention x86 NaCl target support removal.
+	* config/tc-i386.c: Remove x86 NaCl target support.
+	* config/tc-i386.h: Likewise.
+	* configure.tgt: Likewise.
+	* testsuite/gas/i386/i386.exp: Likewise.
+	* testsuite/gas/i386/iamcu-1.d: Likewise.
+	* testsuite/gas/i386/iamcu-2.d: Likewise.
+	* testsuite/gas/i386/iamcu-3.d: Likewise.
+	* testsuite/gas/i386/iamcu-4.d: Likewise.
+	* testsuite/gas/i386/iamcu-5.d: Likewise.
+	* testsuite/gas/i386/k1om.d: Likewise.
+	* testsuite/gas/i386/l1om.d: Likewise.
+
 2020-06-30  Nelson Chu  <nelson.chu@sifive.com>
 
 	* config/tc-riscv.c (riscv_csr_class_check): Removed.  Move the
diff --git a/gas/NEWS b/gas/NEWS
index 815359b08fb..1ce3b6bc610 100644
--- a/gas/NEWS
+++ b/gas/NEWS
@@ -1,5 +1,7 @@
 -*- text -*-
 
+* X86 NaCl target support is removed.
+
 * Extend .symver directive to update visibility of the original symbol
   and assign one original symbol to different versioned symbols.
 
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index be894782a45..46823e24fc4 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -479,7 +479,6 @@ const char extra_symbol_chars[] = "*%-([{}"
      || ((defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF))	\
 	 && !defined (TE_GNU)				\
 	 && !defined (TE_LINUX)				\
-	 && !defined (TE_NACL)				\
 	 && !defined (TE_FreeBSD)			\
 	 && !defined (TE_DragonFly)			\
 	 && !defined (TE_NetBSD)))
diff --git a/gas/config/tc-i386.h b/gas/config/tc-i386.h
index cb426b5b911..e7cb1ea6cbe 100644
--- a/gas/config/tc-i386.h
+++ b/gas/config/tc-i386.h
@@ -59,10 +59,6 @@ extern unsigned long i386_mach (void);
 #define ELF_TARGET_FORMAT64	"elf64-x86-64-freebsd"
 #elif defined (TE_VXWORKS)
 #define ELF_TARGET_FORMAT	"elf32-i386-vxworks"
-#elif defined (TE_NACL)
-#define ELF_TARGET_FORMAT	"elf32-i386-nacl"
-#define ELF_TARGET_FORMAT32	"elf32-x86-64-nacl"
-#define ELF_TARGET_FORMAT64	"elf64-x86-64-nacl"
 #elif defined TE_CLOUDABI
 #define ELF_TARGET_FORMAT64	"elf64-x86-64-cloudabi"
 #endif
diff --git a/gas/configure.tgt b/gas/configure.tgt
index 7c2d178ab59..337249597c5 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -220,10 +220,6 @@ case ${generic_target} in
   i386-*-elf*)				fmt=elf ;;
   i386-*-fuchsia*)			fmt=elf ;;
   i386-*-bsd*)				fmt=aout em=386bsd ;;
-  i386-*-nacl*)				fmt=elf em=nacl
-    case ${cpu} in
-      x86_64*)				arch=x86_64:32 ;;
-    esac ;;
   i386-*-netbsdpe*)			fmt=coff em=pe ;;
   i386-*-netbsd*-gnu* | \
   i386-*-knetbsd*-gnu | \
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index 6bee5fc9d8e..55929d3acb6 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -634,14 +634,12 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
 	    run_list_test "code64-inval" "-I${srcdir}/$subdir -al"
 	}
 
-	if {![istarget "*-*-nacl*"]} then {
-	    run_dump_test "iamcu-1"
-	    run_dump_test "iamcu-2"
-	    run_dump_test "iamcu-3"
-	    run_dump_test "iamcu-4"
-	    run_dump_test "iamcu-5"
-	    run_list_test "iamcu-inval-1" "-march=iamcu -al"
-	}
+	run_dump_test "iamcu-1"
+	run_dump_test "iamcu-2"
+	run_dump_test "iamcu-3"
+	run_dump_test "iamcu-4"
+	run_dump_test "iamcu-5"
+	run_list_test "iamcu-inval-1" "-march=iamcu -al"
     }
 
     # This is a PE specific test.
diff --git a/gas/testsuite/gas/i386/iamcu-1.d b/gas/testsuite/gas/i386/iamcu-1.d
index 8a3bc9f8c2d..fb8fb196ab5 100644
--- a/gas/testsuite/gas/i386/iamcu-1.d
+++ b/gas/testsuite/gas/i386/iamcu-1.d
@@ -1,6 +1,5 @@
 #as: -J -march=iamcu
 #objdump: -dw
-#notarget: *-*-nacl*
 
 .*: +file format elf32-iamcu.*
 
diff --git a/gas/testsuite/gas/i386/iamcu-2.d b/gas/testsuite/gas/i386/iamcu-2.d
index 50c48e7e055..28afce10bc2 100644
--- a/gas/testsuite/gas/i386/iamcu-2.d
+++ b/gas/testsuite/gas/i386/iamcu-2.d
@@ -1,6 +1,5 @@
 #as: -J -march=iamcu
 #objdump: -dw
-#notarget: *-*-nacl*
 
 .*: +file format elf32-iamcu.*
 
diff --git a/gas/testsuite/gas/i386/iamcu-3.d b/gas/testsuite/gas/i386/iamcu-3.d
index 3b4dfd90771..233ec19bfd1 100644
--- a/gas/testsuite/gas/i386/iamcu-3.d
+++ b/gas/testsuite/gas/i386/iamcu-3.d
@@ -1,6 +1,5 @@
 #as: -J -march=iamcu+nop
 #objdump: -dw
-#notarget: *-*-nacl*
 
 .*: +file format elf32-iamcu.*
 
diff --git a/gas/testsuite/gas/i386/iamcu-4.d b/gas/testsuite/gas/i386/iamcu-4.d
index 7ea1bb6823a..e71971f1db7 100644
--- a/gas/testsuite/gas/i386/iamcu-4.d
+++ b/gas/testsuite/gas/i386/iamcu-4.d
@@ -1,6 +1,5 @@
 #as: -J -march=iamcu+sse2+387
 #objdump: -dw
-#notarget: *-*-nacl*
 
 .*: +file format elf32-iamcu.*
 
diff --git a/gas/testsuite/gas/i386/iamcu-5.d b/gas/testsuite/gas/i386/iamcu-5.d
index af3ecd72514..1378f1c0fb3 100644
--- a/gas/testsuite/gas/i386/iamcu-5.d
+++ b/gas/testsuite/gas/i386/iamcu-5.d
@@ -1,6 +1,5 @@
 #as: -J -march=iamcu -I${srcdir}/$subdir
 #objdump: -dw
-#notarget: *-*-nacl*
 
 .*: +file format elf32-iamcu.*
 
diff --git a/gas/testsuite/gas/i386/k1om.d b/gas/testsuite/gas/i386/k1om.d
index 3d47f746afa..4eb13e3a258 100644
--- a/gas/testsuite/gas/i386/k1om.d
+++ b/gas/testsuite/gas/i386/k1om.d
@@ -3,7 +3,6 @@
 #objdump: -dw
 #name: k1om
 #warning_output: x86_64.e
-#notarget: *-*-nacl*
 
 .*: +file format elf64-k1om.*
 
diff --git a/gas/testsuite/gas/i386/l1om.d b/gas/testsuite/gas/i386/l1om.d
index 76040ff1ebc..e56f6a5c4b0 100644
--- a/gas/testsuite/gas/i386/l1om.d
+++ b/gas/testsuite/gas/i386/l1om.d
@@ -3,7 +3,6 @@
 #objdump: -dw --insn-width=7
 #name: l1om
 #warning_output: x86_64.e
-#notarget: *-*-nacl*
 
 .*: +file format elf64-l1om.*
 
diff --git a/ld/ChangeLog b/ld/ChangeLog
index d63a60741ec..f7c6fb08930 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,188 @@
+2020-06-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.am (ALL_EMULATION_SOURCES): Remove eelf_i386_nacl.c,
+	eelf32_x86_64_nacl.c, eelf_x86_64_nacl.c.
+	Remove x86 NaCl dep files.
+	* NEWS: Mention x86 NaCl target support removal.
+	* configure.tgt: Remove x86 NaCl target support.
+	* testsuite/ld-elf/binutils.exp: Likewise.
+	* testsuite/ld-elf/elf.exp: Likewise.
+	* testsuite/ld-elfvers/vers.exp: Likewise.
+	* testsuite/ld-i386/align-branch-1.d: Likewise.
+	* testsuite/ld-i386/export-class.exp: Likewise.
+	* testsuite/ld-i386/i386.exp: Likewise.
+	* testsuite/ld-i386/load1.d: Likewise.
+	* testsuite/ld-i386/pie1.d: Likewise.
+	* testsuite/ld-i386/pr12570a.d: Likewise.
+	* testsuite/ld-i386/pr12570b.d: Likewise.
+	* testsuite/ld-i386/pr19636-1d.d: Likewise.
+	* testsuite/ld-i386/pr19636-1l.d: Likewise.
+	* testsuite/ld-i386/pr19636-2c.d: Likewise.
+	* testsuite/ld-i386/pr19636-2d.d: Likewise.
+	* testsuite/ld-i386/pr19636-2e.d: Likewise.
+	* testsuite/ld-i386/pr20244-1a.d: Likewise.
+	* testsuite/ld-i386/pr20244-1b.d: Likewise.
+	* testsuite/ld-i386/pr20244-2a.d: Likewise.
+	* testsuite/ld-i386/pr20244-2b.d: Likewise.
+	* testsuite/ld-i386/pr20244-2c.d: Likewise.
+	* testsuite/ld-i386/pr20244-4a.d: Likewise.
+	* testsuite/ld-i386/pr20244-4b.d: Likewise.
+	* testsuite/ld-i386/pr21884.d: Likewise.
+	* testsuite/ld-ifunc/binutils.exp: Likewise.
+	* testsuite/ld-ifunc/ifunc-10-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-10-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-11-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-11-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-12-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-12-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-13-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-13-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-14a-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-14a-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-14b-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-14b-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-14c-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-14c-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-14d-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-14d-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-14e-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-14e-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-14f-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-14f-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-15-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-15-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-16-i386-now.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-16-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-16-x86-64-now.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-16-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-17a-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-17a-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-17b-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-17b-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-18a-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-18a-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-18b-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-18b-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-19a-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-19a-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-19b-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-19b-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-2-i386-now.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-2-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-2-local-i386-now.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-2-local-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-2-local-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-2-x86-64-now.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-2-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-20-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-20-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-21-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-21-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-22-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-22-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-5a-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-5a-local-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-5a-local-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-5a-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-5b-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-5b-local-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-5b-local-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-5b-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-5r-local-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-5r-local-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-6a-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-6a-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-6b-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-6b-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-7a-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-7a-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-7b-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-7b-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-8-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-8-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-9-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-9-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/pr17154-i386-now.d: Likewise.
+	* testsuite/ld-ifunc/pr17154-i386.d: Likewise.
+	* testsuite/ld-ifunc/pr17154-x86-64-now.d: Likewise.
+	* testsuite/ld-ifunc/pr17154-x86-64.d: Likewise.
+	* testsuite/ld-plugin/lto.exp: Likewise.
+	* testsuite/ld-x86-64/align-branch-1.d: Likewise.
+	* testsuite/ld-x86-64/dwarfreloc.exp: Likewise.
+	* testsuite/ld-x86-64/line.exp: Likewise.
+	* testsuite/ld-x86-64/load1a.d: Likewise.
+	* testsuite/ld-x86-64/load1b.d: Likewise.
+	* testsuite/ld-x86-64/load1c.d: Likewise.
+	* testsuite/ld-x86-64/load1d.d: Likewise.
+	* testsuite/ld-x86-64/pie3.d: Likewise.
+	* testsuite/ld-x86-64/pr18160.d: Likewise.
+	* testsuite/ld-x86-64/pr19013-x32.d: Likewise.
+	* testsuite/ld-x86-64/pr19013.d: Likewise.
+	* testsuite/ld-x86-64/pr19636-2d.d: Likewise.
+	* testsuite/ld-x86-64/pr19636-2l.d: Likewise.
+	* testsuite/ld-x86-64/pr20253-1b.d: Likewise.
+	* testsuite/ld-x86-64/pr20253-1d.d: Likewise.
+	* testsuite/ld-x86-64/pr20253-1f.d: Likewise.
+	* testsuite/ld-x86-64/pr20253-1h.d: Likewise.
+	* testsuite/ld-x86-64/pr20253-1j.d: Likewise.
+	* testsuite/ld-x86-64/pr20253-1l.d: Likewise.
+	* testsuite/ld-x86-64/pr21884.d: Likewise.
+	* testsuite/ld-x86-64/pr22393-3a.rd: Likewise.
+	* testsuite/ld-x86-64/pr22393-3b.rd: Likewise.
+	* testsuite/ld-x86-64/tlsgd10.dd: Likewise.
+	* testsuite/ld-x86-64/tlsgd5.dd: Likewise.
+	* testsuite/ld-x86-64/tlsgd8.dd: Likewise.
+	* testsuite/ld-x86-64/x86-64.exp: Likewise.
+	* emulparams/elf32_x86_64_nacl.sh: Removed.
+	* emulparams/elf_i386_nacl.sh: Likewise.
+	* emulparams/elf_x86_64_nacl.sh: Likewise.
+	* testsuite/ld-i386/emit-relocs-nacl.rd: Likewise.
+	* testsuite/ld-i386/load1-nacl.d: Likewise.
+	* testsuite/ld-i386/pie1-nacl.d: Likewise.
+	* testsuite/ld-i386/plt-nacl.pd: Likewise.
+	* testsuite/ld-i386/plt-pic-nacl.pd: Likewise.
+	* testsuite/ld-i386/pr17709-nacl.rd: Likewise.
+	* testsuite/ld-i386/pr19636-1d-nacl.d: Likewise.
+	* testsuite/ld-i386/pr19636-2c-nacl.d: Likewise.
+	* testsuite/ld-i386/pr19636-2d-nacl.d: Likewise.
+	* testsuite/ld-i386/pr19636-2e-nacl.d: Likewise.
+	* testsuite/ld-i386/pr19827-nacl.rd: Likewise.
+	* testsuite/ld-i386/pr21884-nacl.d: Likewise.
+	* testsuite/ld-i386/pr21884-nacl.t: Likewise.
+	* testsuite/ld-i386/tlsbin-nacl.rd: Likewise.
+	* testsuite/ld-i386/tlsbin2-nacl.rd: Likewise.
+	* testsuite/ld-i386/tlsbindesc-nacl.rd: Likewise.
+	* testsuite/ld-i386/tlsdesc-nacl.rd: Likewise.
+	* testsuite/ld-i386/tlsgdesc-nacl.rd: Likewise.
+	* testsuite/ld-i386/tlsnopic-nacl.rd: Likewise.
+	* testsuite/ld-i386/tlspic-nacl.rd: Likewise.
+	* testsuite/ld-i386/tlspic2-nacl.rd: Likewise.
+	* testsuite/ld-x86-64/ilp32-4-nacl.d: Likewise.
+	* testsuite/ld-x86-64/load1a-nacl.d: Likewise.
+	* testsuite/ld-x86-64/load1b-nacl.d: Likewise.
+	* testsuite/ld-x86-64/load1c-nacl.d: Likewise.
+	* testsuite/ld-x86-64/load1d-nacl.d: Likewise.
+	* testsuite/ld-x86-64/pie3-nacl.d: Likewise.
+	* testsuite/ld-x86-64/plt-nacl.pd: Likewise.
+	* testsuite/ld-x86-64/pr17709-nacl.rd: Likewise.
+	* testsuite/ld-x86-64/pr19013-nacl.d: Likewise.
+	* testsuite/ld-x86-64/pr19636-2d-nacl.d: Likewise.
+	* testsuite/ld-x86-64/pr19827-nacl.rd: Likewise.
+	* testsuite/ld-x86-64/pr21884-nacl.d: Likewise.
+	* testsuite/ld-x86-64/pr21884-nacl.t: Likewise.
+	* testsuite/ld-x86-64/split-by-file-nacl.rd: Likewise.
+	* testsuite/ld-x86-64/tlsbin-nacl.rd: Likewise.
+	* testsuite/ld-x86-64/tlsbin2-nacl.rd: Likewise.
+	* testsuite/ld-x86-64/tlsbindesc-nacl.rd: Likewise.
+	* testsuite/ld-x86-64/tlsdesc-nacl.pd: Likewise.
+	* testsuite/ld-x86-64/tlsdesc-nacl.rd: Likewise.
+	* testsuite/ld-x86-64/tlsgdesc-nacl.rd: Likewise.
+	* testsuite/ld-x86-64/tlspic-nacl.rd: Likewise.
+	* testsuite/ld-x86-64/tlspic2-nacl.rd: Likewise.
+	* Makefile.in: Regenerated.
+	* po/BLD-POTFILES.in: Likewise.
+
 2020-06-30  Alan Modra  <amodra@gmail.com>
 
 	* testsuite/ld-elf/group1.d: Don't xfail all solaris targets, just
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 5035c5d1d5c..02c4fc16395 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -284,7 +284,6 @@ ALL_EMULATION_SOURCES = \
 	eelf_i386_be.c \
 	eelf_i386_fbsd.c \
 	eelf_i386_ldso.c \
-	eelf_i386_nacl.c \
 	eelf_i386_sol2.c \
 	eelf_i386_vxworks.c \
 	eelf_iamcu.c \
@@ -395,7 +394,6 @@ ALL_64_EMULATION_SOURCES = \
 	eaarch64linux32.c \
 	eaarch64linux32b.c \
 	eelf32_x86_64.c \
-	eelf32_x86_64_nacl.c \
 	eelf32b4300.c \
 	eelf32bmip.c \
 	eelf32bmipn32.c \
@@ -453,7 +451,6 @@ ALL_64_EMULATION_SOURCES = \
 	eelf_x86_64.c \
 	eelf_x86_64_cloudabi.c \
 	eelf_x86_64_fbsd.c \
-	eelf_x86_64_nacl.c \
 	eelf_x86_64_sol2.c \
 	ehppa64linux.c \
 	ei386pep.c \
@@ -773,7 +770,6 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_be.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_fbsd.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_ldso.Pc@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_nacl.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_sol2.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_vxworks.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_iamcu.Pc@am__quote@
@@ -880,7 +876,6 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linux32.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linux32b.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_x86_64.Pc@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_x86_64_nacl.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32b4300.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32bmip.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32bmipn32.Pc@am__quote@
@@ -938,7 +933,6 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Pc@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_nacl.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_sol2.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ehppa64linux.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386pep.Pc@am__quote@
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 49e1f857d2c..2fe12e14f63 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -767,7 +767,6 @@ ALL_EMULATION_SOURCES = \
 	eelf_i386_be.c \
 	eelf_i386_fbsd.c \
 	eelf_i386_ldso.c \
-	eelf_i386_nacl.c \
 	eelf_i386_sol2.c \
 	eelf_i386_vxworks.c \
 	eelf_iamcu.c \
@@ -877,7 +876,6 @@ ALL_64_EMULATION_SOURCES = \
 	eaarch64linux32.c \
 	eaarch64linux32b.c \
 	eelf32_x86_64.c \
-	eelf32_x86_64_nacl.c \
 	eelf32b4300.c \
 	eelf32bmip.c \
 	eelf32bmipn32.c \
@@ -935,7 +933,6 @@ ALL_64_EMULATION_SOURCES = \
 	eelf_x86_64.c \
 	eelf_x86_64_cloudabi.c \
 	eelf_x86_64_fbsd.c \
-	eelf_x86_64_nacl.c \
 	eelf_x86_64_sol2.c \
 	ehppa64linux.c \
 	ei386pep.c \
@@ -1263,7 +1260,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_tic6x_linux_be.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_tic6x_linux_le.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_x86_64.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_x86_64_nacl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32am33lin.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32b4300.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32bfin.Po@am__quote@
@@ -1374,7 +1370,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_be.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_fbsd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_ldso.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_nacl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_sol2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_vxworks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_iamcu.Po@am__quote@
@@ -1386,7 +1381,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_nacl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_sol2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300elf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300elf_linux.Po@am__quote@
@@ -2371,7 +2365,6 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_be.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_fbsd.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_ldso.Pc@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_nacl.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_sol2.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_vxworks.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_iamcu.Pc@am__quote@
@@ -2478,7 +2471,6 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linux32.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linux32b.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_x86_64.Pc@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32_x86_64_nacl.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32b4300.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32bmip.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32bmipn32.Pc@am__quote@
@@ -2536,7 +2528,6 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Pc@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_nacl.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_sol2.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ehppa64linux.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ei386pep.Pc@am__quote@
diff --git a/ld/NEWS b/ld/NEWS
index 4dd4f3c7528..b236e588c6f 100644
--- a/ld/NEWS
+++ b/ld/NEWS
@@ -1,5 +1,7 @@
 -*- text -*-
 
+* X86 NaCl target support is removed.
+
 * Add ELF linker command-line options, --export-dynamic-symbol and
   --export-dynamic-symbol-list, to make symbols dynamic.
 
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 950fa321e28..87c7d9a4cad 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -178,16 +178,12 @@ arm*-*-linux-*)		targ_emul=armelf_linux
 			targ_extra_libpath="armelfb_linux"
 			;;
 arm*b-*-nacl*)		targ_emul=armelfb_nacl
-			targ_extra_emuls="armelf_nacl elf_i386_nacl"
+			targ_extra_emuls="armelf_nacl"
 			targ_extra_libpath=$targ_extra_emuls
-			targ64_extra_emuls="elf32_x86_64_nacl elf_x86_64_nacl"
-			targ64_extra_libpath=$targ64_extra_emuls
 			;;
 arm*-*-nacl*)		targ_emul=armelf_nacl
-			targ_extra_emuls="armelfb_nacl elf_i386_nacl"
+			targ_extra_emuls="armelfb_nacl"
 			targ_extra_libpath=$targ_extra_emuls
-			targ64_extra_emuls="elf32_x86_64_nacl elf_x86_64_nacl"
-			targ64_extra_libpath=$targ64_extra_emuls
 			;;
 arm*-*-uclinux*eabi*)	targ_emul=armelf_linux_eabi
 			targ_extra_emuls=armelfb_linux_eabi
@@ -404,12 +400,6 @@ i[3-7]86-*-vxworks*)	targ_emul=elf_i386_vxworks
 			;;
 i[3-7]86-*-chaos)	targ_emul=elf_i386_chaos
 			;;
-i[3-7]86-*-nacl*)	targ_emul=elf_i386_nacl
-			targ_extra_emuls="armelf_nacl armelfb_nacl"
-			targ_extra_libpath=$targ_extra_emuls
-			targ64_extra_emuls="elf32_x86_64_nacl elf_x86_64_nacl"
-			targ64_extra_libpath=$targ64_extra_emuls
-			;;
 ia16-*-elf*)		targ_emul=elf_i386
 			targ_extra_emuls=i386msdos
 			;;
@@ -997,11 +987,6 @@ x86_64-*-mingw*)	targ_emul=i386pep ;
 			targ_extra_emuls=i386pe
 			targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o"
 			;;
-x86_64-*-nacl*)		targ_emul=elf32_x86_64_nacl
-			targ_extra_emuls="elf_i386_nacl elf_x86_64_nacl armelf_nacl armelfb_nacl"
-			targ_extra_libpath=$targ_extra_emuls
-			tdir_elf_i386_nacl=`echo ${targ_alias} | sed -e 's/x86_64/i386/'`
-			;;
 xc16x-*-elf)		targ_emul=elf32xc16x
 			targ_extra_emuls="elf32xc16xl elf32xc16xs"
 			;;
diff --git a/ld/emulparams/elf32_x86_64_nacl.sh b/ld/emulparams/elf32_x86_64_nacl.sh
deleted file mode 100644
index fd5f3d4cf58..00000000000
--- a/ld/emulparams/elf32_x86_64_nacl.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-source_sh ${srcdir}/emulparams/elf32_x86_64.sh
-source_sh ${srcdir}/emulparams/elf_nacl.sh
-OUTPUT_FORMAT="elf32-x86-64-nacl"
-ARCH="i386:x64-32:nacl"	# The :nacl just means one-byte nops for code fill.
diff --git a/ld/emulparams/elf_i386_nacl.sh b/ld/emulparams/elf_i386_nacl.sh
deleted file mode 100644
index a8cf385fe2f..00000000000
--- a/ld/emulparams/elf_i386_nacl.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-source_sh ${srcdir}/emulparams/elf_i386.sh
-source_sh ${srcdir}/emulparams/elf_nacl.sh
-OUTPUT_FORMAT="elf32-i386-nacl"
-ARCH="i386:nacl"	# The :nacl just means one-byte nops for code fill.
diff --git a/ld/emulparams/elf_x86_64_nacl.sh b/ld/emulparams/elf_x86_64_nacl.sh
deleted file mode 100644
index 3f47e4ca98b..00000000000
--- a/ld/emulparams/elf_x86_64_nacl.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-source_sh ${srcdir}/emulparams/elf_x86_64.sh
-source_sh ${srcdir}/emulparams/elf_nacl.sh
-OUTPUT_FORMAT="elf64-x86-64-nacl"
-ARCH="i386:x86-64:nacl"	# The :nacl just means one-byte nops for code fill.
diff --git a/ld/po/BLD-POTFILES.in b/ld/po/BLD-POTFILES.in
index 699d84ddd4e..4ef0987de07 100644
--- a/ld/po/BLD-POTFILES.in
+++ b/ld/po/BLD-POTFILES.in
@@ -82,7 +82,6 @@ eelf32_tic6x_le.c
 eelf32_tic6x_linux_be.c
 eelf32_tic6x_linux_le.c
 eelf32_x86_64.c
-eelf32_x86_64_nacl.c
 eelf32am33lin.c
 eelf32b4300.c
 eelf32bfin.c
@@ -193,7 +192,6 @@ eelf_i386.c
 eelf_i386_be.c
 eelf_i386_fbsd.c
 eelf_i386_ldso.c
-eelf_i386_nacl.c
 eelf_i386_sol2.c
 eelf_i386_vxworks.c
 eelf_iamcu.c
@@ -205,7 +203,6 @@ eelf_s390.c
 eelf_x86_64.c
 eelf_x86_64_cloudabi.c
 eelf_x86_64_fbsd.c
-eelf_x86_64_nacl.c
 eelf_x86_64_sol2.c
 eh8300elf.c
 eh8300elf_linux.c
diff --git a/ld/testsuite/ld-elf/binutils.exp b/ld/testsuite/ld-elf/binutils.exp
index fc54c9869fa..7813ad36ee1 100644
--- a/ld/testsuite/ld-elf/binutils.exp
+++ b/ld/testsuite/ld-elf/binutils.exp
@@ -165,9 +165,7 @@ if { ([istarget "i?86-*-elf*"]
       || [istarget "i?86-*-linux*"]
       || [istarget "i?86-*-gnu*"]
       || [istarget "x86_64-*-linux*"]
-      || [istarget "amd64-*-linux*"]
-      || [istarget "i?86-*nacl*"]
-      || [istarget "x86_64-*nacl*"]) } {
+      || [istarget "amd64-*-linux*"]) } {
     binutils_test strip "-z relro -shared" relro2
     binutils_test objcopy "-z relro -shared" relro2
 }
diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index 3ae769e3bf9..c0d67d80d27 100644
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -46,13 +46,6 @@ if { [istarget alpha*-*-* ] } {
     set ASFLAGS "$ASFLAGS --defsym NO_SET=1"
 }
 
-if { [istarget "*-*-nacl*"] } {
-    # The eh[1-4] cases are written to expect ELFCLASS64 layout on x86-64.
-    # But the target default is ELFCLASS32.  So the cases explicitly use
-    # -melf_x86_64 to select that, but NaCl needs a different emulation name.
-    set options_regsub(ld) {-melf_x86_64 -melf_x86_64_nacl}
-}
-
 if { [istarget "*-*-solaris*"] } {
     # Same for Solaris
     set options_regsub(ld) {-melf_x86_64 -melf_x86_64_sol2}
diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp
index 8efbac21b96..825b7944d08 100644
--- a/ld/testsuite/ld-elfvers/vers.exp
+++ b/ld/testsuite/ld-elfvers/vers.exp
@@ -37,7 +37,6 @@ if { ![istarget hppa*64*-*-hpux*]
      && ![istarget i?86-*-elf*]
      && ![istarget i?86-*-linux*]
      && ![istarget i?86-*-gnu*]
-     && ![istarget i?86-*-nacl*]
      && ![istarget ia64-*-elf*]
      && ![istarget ia64-*-linux*]
      && ![istarget m68k-*-linux*]
@@ -54,8 +53,7 @@ if { ![istarget hppa*64*-*-hpux*]
      && ![istarget alpha*-*-linux*]
      && ![istarget s390*-*-linux*]
      && ![istarget sh\[34\]*-*-linux*]
-     && ![istarget x86_64-*-linux*]
-     && ![istarget x86_64-*-nacl*] } {
+     && ![istarget x86_64-*-linux*] } {
     return
 }
 
diff --git a/ld/testsuite/ld-i386/align-branch-1.d b/ld/testsuite/ld-i386/align-branch-1.d
index b1347e50555..8c62ee4b5f9 100644
--- a/ld/testsuite/ld-i386/align-branch-1.d
+++ b/ld/testsuite/ld-i386/align-branch-1.d
@@ -1,7 +1,6 @@
 #as: --32 -mbranches-within-32B-boundaries
 #ld: -melf_i386
 #objdump: -dw
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-i386/emit-relocs-nacl.rd b/ld/testsuite/ld-i386/emit-relocs-nacl.rd
deleted file mode 100644
index 520a57e4bbd..00000000000
--- a/ld/testsuite/ld-i386/emit-relocs-nacl.rd
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Relocation section '\.rel\.text' at offset .* contains 1 entry:
- Offset     Info    Type            Sym\.Value  Sym\. Name
-.*  .*04 R_386_PLT32       00000000   foo
-
-Relocation section '\.rel\.plt' at offset .* contains 1 entry:
- Offset     Info    Type            Sym\.Value  Sym\. Name
-.*  .*07 R_386_JUMP_SLOT   00000000   foo
diff --git a/ld/testsuite/ld-i386/export-class.exp b/ld/testsuite/ld-i386/export-class.exp
index e0afb7a977a..e58fdc43d93 100644
--- a/ld/testsuite/ld-i386/export-class.exp
+++ b/ld/testsuite/ld-i386/export-class.exp
@@ -32,7 +32,6 @@ if { ![is_elf_format] } {
 # Exclude some more targets; feel free to include your favorite one
 # if you like.
 if { !([istarget i?86-*-linux*]
-       || [istarget i?86-*-nacl*]
        || [istarget i?86-*-gnu*]) } {
     return
 }
diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index d71b9781648..27ad1693a3c 100644
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -107,9 +107,7 @@ if [istarget "*-*-go32*"] {
 if { !([istarget "i?86-*-elf*"]
        || [istarget "i?86-*-linux*"]
        || [istarget "i?86-*-gnu*"]
-       || [istarget "i?86-*-nacl*"]
        || [istarget "x86_64-*-elf*"]
-       || [istarget "x86_64-*-nacl*"]
        || [istarget "x86_64-*-linux*"]
        || [istarget "amd64-*-linux*"]) } {
     return
@@ -249,29 +247,7 @@ set i386tests {
      { pr19827a.S }  {{readelf {-rW} pr19827.rd}} "pr19827.so"}
 }
 
-# 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.
-    regsub -all elf_i386 $i386tests elf_i386_nacl i386tests
-
-    # Same, applied to all the run_dump_test cases.
-    set options_regsub(ld) {elf_i386 elf_i386_nacl}
-
-    # The section/segment layout differs too much for the vanilla
-    # readelf output files to match.  So massage the cases so that
-    # they refer to a foo-nacl.rd file instead of a foo.rd file.
-    regsub -all {([a-z0-9]+)\.rd} $i386tests {\1-nacl.rd} i386tests
-
-    # Likewise for PLTs.
-    regsub -all -- {([a-z0-9]+)\.pd} $i386tests {\1-nacl.pd} i386tests
-}
-
 proc iamcu_tests {} {
-    if {[istarget "*-*-nacl*"]} then {
-	return
-    }
-
     global as
     global srcdir
     global subdir
@@ -367,7 +343,6 @@ run_dump_test "call3h"
 run_dump_test "jmp1"
 run_dump_test "jmp2"
 run_dump_test "load1"
-run_dump_test "load1-nacl"
 run_dump_test "load2"
 run_dump_test "load3"
 run_dump_test "load4a"
@@ -382,7 +357,6 @@ run_dump_test "pr19636-1a"
 run_dump_test "pr19636-1b"
 run_dump_test "pr19636-1c"
 run_dump_test "pr19636-1d"
-run_dump_test "pr19636-1d-nacl"
 run_dump_test "pr19636-1e"
 run_dump_test "pr19636-1f"
 run_dump_test "pr19636-1g"
@@ -394,11 +368,8 @@ run_dump_test "pr19636-1l"
 run_dump_test "pr19636-2a"
 run_dump_test "pr19636-2b"
 run_dump_test "pr19636-2c"
-run_dump_test "pr19636-2c-nacl"
 run_dump_test "pr19636-2d"
-run_dump_test "pr19636-2d-nacl"
 run_dump_test "pr19636-2e"
-run_dump_test "pr19636-2e-nacl"
 run_dump_test "pr19636-3a"
 run_dump_test "pr19636-3b"
 run_dump_test "pr19636-3c"
@@ -474,9 +445,7 @@ run_dump_test "property-x86-cet5a"
 run_dump_test "property-x86-cet5b"
 run_dump_test "property-x86-cet6"
 run_dump_test "pie1"
-run_dump_test "pie1-nacl"
 run_dump_test "pr21884"
-run_dump_test "pr21884-nacl"
 run_dump_test "pr22115-1a"
 run_dump_test "pr22115-1b"
 run_dump_test "pr22115-1c"
@@ -503,8 +472,6 @@ run_dump_test "pr26018"
 
 if { !([istarget "i?86-*-linux*"]
        || [istarget "i?86-*-gnu*"]
-       || [istarget "i?86-*-nacl*"]
-       || [istarget "x86_64-*-nacl*"]
        || [istarget "x86_64-*-linux*"]) } {
     set ASFLAGS "$saved_ASFLAGS"
     return
diff --git a/ld/testsuite/ld-i386/load1-nacl.d b/ld/testsuite/ld-i386/load1-nacl.d
deleted file mode 100644
index 317d1c40543..00000000000
--- a/ld/testsuite/ld-i386/load1-nacl.d
+++ /dev/null
@@ -1,59 +0,0 @@
-#source: load1.s
-#as: --32
-#ld: -melf_i386
-#objdump: -dw --sym
-#target: i?86-*-nacl* x86_64-*-nacl*
-
-.*: +file format .*
-
-SYMBOL TABLE:
-#...
-10030074 l     O .data	0+1 bar
-#...
-10030075 g     O .data	0+1 foo
-#...
-
-Disassembly of section .text:
-
-0+20000 <_start>:
-[ 	]*[a-f0-9]+:	c7 c0 74 00 03 10    	mov    \$0x10030074,%eax
-[ 	]*[a-f0-9]+:	81 d0 74 00 03 10    	adc    \$0x10030074,%eax
-[ 	]*[a-f0-9]+:	81 c3 74 00 03 10    	add    \$0x10030074,%ebx
-[ 	]*[a-f0-9]+:	81 e1 74 00 03 10    	and    \$0x10030074,%ecx
-[ 	]*[a-f0-9]+:	81 fa 74 00 03 10    	cmp    \$0x10030074,%edx
-[ 	]*[a-f0-9]+:	81 cf 74 00 03 10    	or     \$0x10030074,%edi
-[ 	]*[a-f0-9]+:	81 de 74 00 03 10    	sbb    \$0x10030074,%esi
-[ 	]*[a-f0-9]+:	81 ed 74 00 03 10    	sub    \$0x10030074,%ebp
-[ 	]*[a-f0-9]+:	81 f4 74 00 03 10    	xor    \$0x10030074,%esp
-[ 	]*[a-f0-9]+:	f7 c1 74 00 03 10    	test   \$0x10030074,%ecx
-[ 	]*[a-f0-9]+:	c7 c0 74 00 03 10    	mov    \$0x10030074,%eax
-[ 	]*[a-f0-9]+:	81 d0 74 00 03 10    	adc    \$0x10030074,%eax
-[ 	]*[a-f0-9]+:	81 c3 74 00 03 10    	add    \$0x10030074,%ebx
-[ 	]*[a-f0-9]+:	81 e1 74 00 03 10    	and    \$0x10030074,%ecx
-[ 	]*[a-f0-9]+:	81 fa 74 00 03 10    	cmp    \$0x10030074,%edx
-[ 	]*[a-f0-9]+:	81 cf 74 00 03 10    	or     \$0x10030074,%edi
-[ 	]*[a-f0-9]+:	81 de 74 00 03 10    	sbb    \$0x10030074,%esi
-[ 	]*[a-f0-9]+:	81 ed 74 00 03 10    	sub    \$0x10030074,%ebp
-[ 	]*[a-f0-9]+:	81 f4 74 00 03 10    	xor    \$0x10030074,%esp
-[ 	]*[a-f0-9]+:	f7 c1 74 00 03 10    	test   \$0x10030074,%ecx
-[ 	]*[a-f0-9]+:	c7 c0 75 00 03 10    	mov    \$0x10030075,%eax
-[ 	]*[a-f0-9]+:	81 d0 75 00 03 10    	adc    \$0x10030075,%eax
-[ 	]*[a-f0-9]+:	81 c3 75 00 03 10    	add    \$0x10030075,%ebx
-[ 	]*[a-f0-9]+:	81 e1 75 00 03 10    	and    \$0x10030075,%ecx
-[ 	]*[a-f0-9]+:	81 fa 75 00 03 10    	cmp    \$0x10030075,%edx
-[ 	]*[a-f0-9]+:	81 cf 75 00 03 10    	or     \$0x10030075,%edi
-[ 	]*[a-f0-9]+:	81 de 75 00 03 10    	sbb    \$0x10030075,%esi
-[ 	]*[a-f0-9]+:	81 ed 75 00 03 10    	sub    \$0x10030075,%ebp
-[ 	]*[a-f0-9]+:	81 f4 75 00 03 10    	xor    \$0x10030075,%esp
-[ 	]*[a-f0-9]+:	f7 c1 75 00 03 10    	test   \$0x10030075,%ecx
-[ 	]*[a-f0-9]+:	c7 c0 75 00 03 10    	mov    \$0x10030075,%eax
-[ 	]*[a-f0-9]+:	81 d0 75 00 03 10    	adc    \$0x10030075,%eax
-[ 	]*[a-f0-9]+:	81 c3 75 00 03 10    	add    \$0x10030075,%ebx
-[ 	]*[a-f0-9]+:	81 e1 75 00 03 10    	and    \$0x10030075,%ecx
-[ 	]*[a-f0-9]+:	81 fa 75 00 03 10    	cmp    \$0x10030075,%edx
-[ 	]*[a-f0-9]+:	81 cf 75 00 03 10    	or     \$0x10030075,%edi
-[ 	]*[a-f0-9]+:	81 de 75 00 03 10    	sbb    \$0x10030075,%esi
-[ 	]*[a-f0-9]+:	81 ed 75 00 03 10    	sub    \$0x10030075,%ebp
-[ 	]*[a-f0-9]+:	81 f4 75 00 03 10    	xor    \$0x10030075,%esp
-[ 	]*[a-f0-9]+:	f7 c1 75 00 03 10    	test   \$0x10030075,%ecx
-#pass
diff --git a/ld/testsuite/ld-i386/load1.d b/ld/testsuite/ld-i386/load1.d
index 8e8db9f43be..fb01cf8bad8 100644
--- a/ld/testsuite/ld-i386/load1.d
+++ b/ld/testsuite/ld-i386/load1.d
@@ -1,7 +1,6 @@
 #as: --32 -mrelax-relocations=yes
 #ld: -melf_i386 -z noseparate-code
 #objdump: -dw --sym
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-i386/pie1-nacl.d b/ld/testsuite/ld-i386/pie1-nacl.d
deleted file mode 100644
index aafd6a7ef52..00000000000
--- a/ld/testsuite/ld-i386/pie1-nacl.d
+++ /dev/null
@@ -1,18 +0,0 @@
-#source: pie1.s
-#as: --32
-#ld: -pie -melf_i386 -z relro
-#objdump: -dw --sym
-#target: i?86-*-nacl* x86_64-*-nacl*
-
-.*: +file format .*
-
-SYMBOL TABLE:
-#...
-10020000 l     O .got.plt	0+ _GLOBAL_OFFSET_TABLE_
-#...
-
-Disassembly of section .text:
-
-0+ <_start>:
- +0:	8d 80 00 00 fe ef    	lea    -0x10020000\(%eax\),%eax
-#pass
diff --git a/ld/testsuite/ld-i386/pie1.d b/ld/testsuite/ld-i386/pie1.d
index e7beaa2400a..338d05784d0 100644
--- a/ld/testsuite/ld-i386/pie1.d
+++ b/ld/testsuite/ld-i386/pie1.d
@@ -1,7 +1,6 @@
 #as: --32
 #ld: -pie -melf_i386 -z relro -z noseparate-code
 #objdump: -dw --sym
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-i386/plt-nacl.pd b/ld/testsuite/ld-i386/plt-nacl.pd
deleted file mode 100644
index d95e888e949..00000000000
--- a/ld/testsuite/ld-i386/plt-nacl.pd
+++ /dev/null
@@ -1,162 +0,0 @@
-#source: plt.s
-#as: --32
-#ld: -melf_i386_nacl
-#objdump: -drj.plt
-#target: i?86-*-nacl*
-
-.*: +file format .*
-
-Disassembly of section .plt:
-
-[0-9a-f]+ <.plt>:
- +[0-9a-f]+:	ff 35 ([0-9a-f]{2} ){4} *	pushl  0x[0-9a-f]+
- +[0-9a-f]+:	8b 0d ([0-9a-f]{2} ){4} *	mov    0x[0-9a-f]+,%ecx
- +[0-9a-f]+:	83 e1 e0             	and    \$0xffffffe0,%ecx
- +[0-9a-f]+:	ff e1                	jmp    \*%ecx
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
-
-[0-9a-f]+ <fn1@plt>:
- +[0-9a-f]+:	8b 0d ([0-9a-f]{2} ){4} *	mov    0x[0-9a-f]+,%ecx
- +[0-9a-f]+:	83 e1 e0             	and    \$0xffffffe0,%ecx
- +[0-9a-f]+:	ff e1                	jmp    \*%ecx
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	68 00 00 00 00       	push   \$0x0
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <.plt>
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
-
-[0-9a-f]+ <fn2@plt>:
- +[0-9a-f]+:	8b 0d ([0-9a-f]{2} ){4} *	mov    0x[0-9a-f]+,%ecx
- +[0-9a-f]+:	83 e1 e0             	and    \$0xffffffe0,%ecx
- +[0-9a-f]+:	ff e1                	jmp    \*%ecx
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	68 08 00 00 00       	push   \$0x8
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <.plt>
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
diff --git a/ld/testsuite/ld-i386/plt-pic-nacl.pd b/ld/testsuite/ld-i386/plt-pic-nacl.pd
deleted file mode 100644
index 03aa007c868..00000000000
--- a/ld/testsuite/ld-i386/plt-pic-nacl.pd
+++ /dev/null
@@ -1,168 +0,0 @@
-#source: plt.s
-#as: --32
-#ld: -shared -melf_i386_nacl
-#objdump: -drj.plt
-#target: i?86-*-nacl*
-
-.*: +file format .*
-
-Disassembly of section .plt:
-
-[0-9a-f]+ <.plt>:
- +[0-9a-f]+:	ff 73 04             	pushl  0x4\(%ebx\)
- +[0-9a-f]+:	8b 4b 08             	mov    0x8\(%ebx\),%ecx
- +[0-9a-f]+:	83 e1 e0             	and    \$0xffffffe0,%ecx
- +[0-9a-f]+:	ff e1                	jmp    \*%ecx
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
-
-[0-9a-f]+ <fn1@plt>:
- +[0-9a-f]+:	8b 8b 0c 00 00 00    	mov    0xc\(%ebx\),%ecx
- +[0-9a-f]+:	83 e1 e0             	and    \$0xffffffe0,%ecx
- +[0-9a-f]+:	ff e1                	jmp    \*%ecx
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	68 00 00 00 00       	push   \$0x0
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <.plt>
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
-
-[0-9a-f]+ <fn2@plt>:
- +[0-9a-f]+:	8b 8b 10 00 00 00    	mov    0x10\(%ebx\),%ecx
- +[0-9a-f]+:	83 e1 e0             	and    \$0xffffffe0,%ecx
- +[0-9a-f]+:	ff e1                	jmp    \*%ecx
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	68 08 00 00 00       	push   \$0x8
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmp    [0-9a-f]+ <.plt>
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
- +[0-9a-f]+:	90                   	nop
diff --git a/ld/testsuite/ld-i386/pr12570a.d b/ld/testsuite/ld-i386/pr12570a.d
index d5a466e0dd7..03aeb7b6a57 100644
--- a/ld/testsuite/ld-i386/pr12570a.d
+++ b/ld/testsuite/ld-i386/pr12570a.d
@@ -2,7 +2,6 @@
 #as: --32
 #ld: -melf_i386 -shared
 #readelf: -wf --wide
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 #...
   DW_CFA_def_cfa_expression \(DW_OP_breg4 \(esp\): 4; DW_OP_breg8 \(eip\): 0; DW_OP_lit15; DW_OP_and; DW_OP_lit11; DW_OP_ge; DW_OP_lit2; DW_OP_shl; DW_OP_plus\)
diff --git a/ld/testsuite/ld-i386/pr12570b.d b/ld/testsuite/ld-i386/pr12570b.d
index b295801c99c..0532aacd970 100644
--- a/ld/testsuite/ld-i386/pr12570b.d
+++ b/ld/testsuite/ld-i386/pr12570b.d
@@ -2,7 +2,6 @@
 #as: --32
 #ld: -melf_i386 -shared
 #readelf: -wf --wide
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-i386/pr17709-nacl.rd b/ld/testsuite/ld-i386/pr17709-nacl.rd
deleted file mode 100644
index 8414784b736..00000000000
--- a/ld/testsuite/ld-i386/pr17709-nacl.rd
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Relocation section '.rel\..*' at offset .* contains 1 entry:
- Offset     Info    Type            Sym\.Value  Sym\. Name
-[0-9a-f ]+R_386_COPY +[0-9a-f]+ +foo
diff --git a/ld/testsuite/ld-i386/pr19636-1d-nacl.d b/ld/testsuite/ld-i386/pr19636-1d-nacl.d
deleted file mode 100644
index 27797d6b443..00000000000
--- a/ld/testsuite/ld-i386/pr19636-1d-nacl.d
+++ /dev/null
@@ -1,124 +0,0 @@
-#source: pr19636-1.s
-#as: --32 -mrelax-relocations=no
-#ld: -pie -m elf_i386 --no-dynamic-linker
-#objdump: -dw
-#target: i?86-*-nacl* x86_64-*-nacl*
-
-.*: +file format .*
-
-
-Disassembly of section .plt:
-
-0+ <.plt>:
-[ 	]*[a-f0-9]+:	ff 73 04             	pushl  0x4\(%ebx\)
-[ 	]*[a-f0-9]+:	8b 4b 08             	mov    0x8\(%ebx\),%ecx
-[ 	]*[a-f0-9]+:	83 e1 e0             	and    \$0xffffffe0,%ecx
-[ 	]*[a-f0-9]+:	ff e1                	jmp    \*%ecx
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	8b 8b 0c 00 00 00    	mov    0xc\(%ebx\),%ecx
-[ 	]*[a-f0-9]+:	83 e1 e0             	and    \$0xffffffe0,%ecx
-[ 	]*[a-f0-9]+:	ff e1                	jmp    \*%ecx
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	68 00 00 00 00       	push   \$0x0
-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    6a <\.plt\+0x6a>
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-
-Disassembly of section .text:
-
-0+80 <_start>:
-[ 	]*[a-f0-9]+:	3b 80 f8 ff ff ff    	cmp    -0x8\(%eax\),%eax
-[ 	]*[a-f0-9]+:	ff a0 fc ff ff ff    	jmp    \*-0x4\(%eax\)
-[ 	]*[a-f0-9]+:	e8 af ff ff ff       	call   40 <.*>
diff --git a/ld/testsuite/ld-i386/pr19636-1d.d b/ld/testsuite/ld-i386/pr19636-1d.d
index e667cae2e7a..b034e30dc36 100644
--- a/ld/testsuite/ld-i386/pr19636-1d.d
+++ b/ld/testsuite/ld-i386/pr19636-1d.d
@@ -2,7 +2,6 @@
 #as: --32 -mrelax-relocations=no
 #ld: -pie -m elf_i386 --no-dynamic-linker
 #objdump: -dw
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-i386/pr19636-1l.d b/ld/testsuite/ld-i386/pr19636-1l.d
index 6198c0f082a..4567c53a6c3 100644
--- a/ld/testsuite/ld-i386/pr19636-1l.d
+++ b/ld/testsuite/ld-i386/pr19636-1l.d
@@ -3,7 +3,6 @@
 #ld: -pie -m elf_i386 --no-dynamic-linker -z dynamic-undefined-weak
 #objdump: -dw
 #warning: -z dynamic-undefined-weak ignored
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-i386/pr19636-2c-nacl.d b/ld/testsuite/ld-i386/pr19636-2c-nacl.d
deleted file mode 100644
index de52ec5387a..00000000000
--- a/ld/testsuite/ld-i386/pr19636-2c-nacl.d
+++ /dev/null
@@ -1,126 +0,0 @@
-#source: pr19636-2.s
-#as: --32 -mrelax-relocations=no
-#ld: -pie -m elf_i386
-#objdump: -dw
-#target: i?86-*-nacl* x86_64-*-nacl*
-
-.*: +file format .*
-
-
-Disassembly of section .plt:
-
-0+ <.plt>:
-[ 	]*[a-f0-9]+:	ff 73 04             	pushl  0x4\(%ebx\)
-[ 	]*[a-f0-9]+:	8b 4b 08             	mov    0x8\(%ebx\),%ecx
-[ 	]*[a-f0-9]+:	83 e1 e0             	and    \$0xffffffe0,%ecx
-[ 	]*[a-f0-9]+:	ff e1                	jmp    \*%ecx
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	8b 8b 0c 00 00 00    	mov    0xc\(%ebx\),%ecx
-[ 	]*[a-f0-9]+:	83 e1 e0             	and    \$0xffffffe0,%ecx
-[ 	]*[a-f0-9]+:	ff e1                	jmp    \*%ecx
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	68 00 00 00 00       	push   \$0x0
-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmp    6a <\.plt\+0x6a>
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-[ 	]*[a-f0-9]+:	90                   	nop
-
-Disassembly of section .text:
-
-0+80 <_start>:
-[ 	]*[a-f0-9]+:	3b 80 fc ff ff ff    	cmp    -0x4\(%eax\),%eax
-[ 	]*[a-f0-9]+:	ff a0 fc ff ff ff    	jmp    \*-0x4\(%eax\)
-[ 	]*[a-f0-9]+:	e8 af ff ff ff       	call   40 <.*>
-[ 	]*[a-f0-9]+:	3d 00 00 00 00       	cmp    \$0x0,%eax
-[ 	]*[a-f0-9]+:	e8 fc ff ff ff       	call   97 <.*>
diff --git a/ld/testsuite/ld-i386/pr19636-2c.d b/ld/testsuite/ld-i386/pr19636-2c.d
index b126480b4f2..e3b737bff5f 100644
--- a/ld/testsuite/ld-i386/pr19636-2c.d
+++ b/ld/testsuite/ld-i386/pr19636-2c.d
@@ -2,7 +2,6 @@
 #as: --32 -mrelax-relocations=no
 #ld: -pie -m elf_i386 -z notext
 #objdump: -dw
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-i386/pr19636-2d-nacl.d b/ld/testsuite/ld-i386/pr19636-2d-nacl.d
deleted file mode 100644
index c7b5d10f19f..00000000000
--- a/ld/testsuite/ld-i386/pr19636-2d-nacl.d
+++ /dev/null
@@ -1,21 +0,0 @@
-#source: pr19636-2.s
-#as: --32 -mrelax-relocations=no
-#ld: -shared -m elf_i386
-#readelf : -r --wide --dyn-syms
-#target: i?86-*-nacl* x86_64-*-nacl*
-
-Relocation section '\.rel\.dyn' at offset [0x0-9a-f]+ contains 3 entries:
- +Offset +Info +Type +Sym. Value +Symbol's Name
-[0-9a-f]+ +[0-9a-f]+ +R_386_32 +0+ +func
-[0-9a-f]+ +[0-9a-f]+ +R_386_PC32 +0+ +func
-[0-9a-f]+ +[0-9a-f]+ +R_386_GLOB_DAT +0+ +func
-
-Relocation section '\.rel\.plt' at offset [0x0-9a-f]+ contains 1 entry:
- +Offset +Info +Type +Sym. Value +Symbol's Name
-[0-9a-f]+ +[0-9a-f]+ +R_386_JUMP_SLOT +0+ +func
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
-#...
- +[0-9]+: +[a-f0-9]+ +0 +NOTYPE +WEAK +DEFAULT +UND +func
-#pass
diff --git a/ld/testsuite/ld-i386/pr19636-2d.d b/ld/testsuite/ld-i386/pr19636-2d.d
index 694be367ebb..22f09d83fb1 100644
--- a/ld/testsuite/ld-i386/pr19636-2d.d
+++ b/ld/testsuite/ld-i386/pr19636-2d.d
@@ -2,7 +2,6 @@
 #as: --32 -mrelax-relocations=no
 #ld: -shared -m elf_i386 -z notext
 #readelf : -r --wide --dyn-syms
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 Relocation section '\.rel\.dyn' at offset [0x0-9a-f]+ contains 3 entries:
  +Offset +Info +Type +Sym. Value +Symbol's Name
diff --git a/ld/testsuite/ld-i386/pr19636-2e-nacl.d b/ld/testsuite/ld-i386/pr19636-2e-nacl.d
deleted file mode 100644
index eb0cf8d25a3..00000000000
--- a/ld/testsuite/ld-i386/pr19636-2e-nacl.d
+++ /dev/null
@@ -1,21 +0,0 @@
-#source: pr19636-2.s
-#as: --32 -mrelax-relocations=no
-#ld: -shared -Bsymbolic -m elf_i386
-#readelf : -r --wide --dyn-syms
-#target: i?86-*-nacl* x86_64-*-nacl*
-
-Relocation section '\.rel\.dyn' at offset [0x0-9a-f]+ contains 3 entries:
- +Offset +Info +Type +Sym. Value +Symbol's Name
-[0-9a-f]+ +[0-9a-f]+ +R_386_32 +0+ +func
-[0-9a-f]+ +[0-9a-f]+ +R_386_PC32 +0+ +func
-[0-9a-f]+ +[0-9a-f]+ +R_386_GLOB_DAT +0+ +func
-
-Relocation section '\.rel\.plt' at offset [0x0-9a-f]+ contains 1 entry:
- +Offset +Info +Type +Sym. Value +Symbol's Name
-[0-9a-f]+ +[0-9a-f]+ +R_386_JUMP_SLOT +0+ +func
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
-#...
- +[0-9]+: +[a-f0-9]+ +0 +NOTYPE +WEAK +DEFAULT +UND +func
-#pass
diff --git a/ld/testsuite/ld-i386/pr19636-2e.d b/ld/testsuite/ld-i386/pr19636-2e.d
index c039fcb0a31..89c0d5d44fb 100644
--- a/ld/testsuite/ld-i386/pr19636-2e.d
+++ b/ld/testsuite/ld-i386/pr19636-2e.d
@@ -2,7 +2,6 @@
 #as: --32 -mrelax-relocations=no
 #ld: -shared -Bsymbolic -m elf_i386 -z notext
 #readelf : -r --wide --dyn-syms
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 Relocation section '\.rel\.dyn' at offset [0x0-9a-f]+ contains 3 entries:
  +Offset +Info +Type +Sym. Value +Symbol's Name
diff --git a/ld/testsuite/ld-i386/pr19827-nacl.rd b/ld/testsuite/ld-i386/pr19827-nacl.rd
deleted file mode 100644
index e48d7d56211..00000000000
--- a/ld/testsuite/ld-i386/pr19827-nacl.rd
+++ /dev/null
@@ -1,5 +0,0 @@
-#readelf: -r --wide
-
-Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 1 entry:
- Offset     Info    Type                Sym. Value  Symbol's Name
-[0-9a-f]+ +[0-9a-f]+ +R_386_RELATIVE +
diff --git a/ld/testsuite/ld-i386/pr20244-1a.d b/ld/testsuite/ld-i386/pr20244-1a.d
index 98aaa9e01bb..a2d6c3f094d 100644
--- a/ld/testsuite/ld-i386/pr20244-1a.d
+++ b/ld/testsuite/ld-i386/pr20244-1a.d
@@ -2,7 +2,6 @@
 #as: --32
 #ld: -m elf_i386 -z noseparate-code
 #objdump: --sym -dw
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-i386/pr20244-1b.d b/ld/testsuite/ld-i386/pr20244-1b.d
index f5a1a61ca7e..160ce86e368 100644
--- a/ld/testsuite/ld-i386/pr20244-1b.d
+++ b/ld/testsuite/ld-i386/pr20244-1b.d
@@ -2,7 +2,6 @@
 #as: --32
 #ld: -m elf_i386 -z noseparate-code
 #objdump: -s -j .got
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-i386/pr20244-2a.d b/ld/testsuite/ld-i386/pr20244-2a.d
index 40c6e32c94f..334b89e4ce8 100644
--- a/ld/testsuite/ld-i386/pr20244-2a.d
+++ b/ld/testsuite/ld-i386/pr20244-2a.d
@@ -2,7 +2,6 @@
 #as: --32
 #ld: -m elf_i386 -z noseparate-code
 #objdump: --sym -dw
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-i386/pr20244-2b.d b/ld/testsuite/ld-i386/pr20244-2b.d
index 406d3bd3a73..05364e06c94 100644
--- a/ld/testsuite/ld-i386/pr20244-2b.d
+++ b/ld/testsuite/ld-i386/pr20244-2b.d
@@ -2,7 +2,6 @@
 #as: --32
 #ld: -m elf_i386 -z noseparate-code
 #objdump: -s -j .got.plt
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-i386/pr20244-2c.d b/ld/testsuite/ld-i386/pr20244-2c.d
index 142ec2748b3..a01f6f1e8d7 100644
--- a/ld/testsuite/ld-i386/pr20244-2c.d
+++ b/ld/testsuite/ld-i386/pr20244-2c.d
@@ -2,7 +2,6 @@
 #as: --32
 #ld: -m elf_i386 -z noseparate-code
 #readelf: -rW
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 Relocation section '.rel.plt' at offset 0x74 contains 2 entries:
  Offset     Info    Type                Sym. Value  Symbol's Name
diff --git a/ld/testsuite/ld-i386/pr20244-4a.d b/ld/testsuite/ld-i386/pr20244-4a.d
index 7e6fe3690df..865d339db56 100644
--- a/ld/testsuite/ld-i386/pr20244-4a.d
+++ b/ld/testsuite/ld-i386/pr20244-4a.d
@@ -2,7 +2,6 @@
 #as: --32
 #ld: -m elf_i386 -z noseparate-code
 #objdump: -dw
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-i386/pr20244-4b.d b/ld/testsuite/ld-i386/pr20244-4b.d
index 946f56b0d18..cbf0d65305f 100644
--- a/ld/testsuite/ld-i386/pr20244-4b.d
+++ b/ld/testsuite/ld-i386/pr20244-4b.d
@@ -2,7 +2,6 @@
 #as: --32
 #ld: -m elf_i386 -z noseparate-code
 #objdump: -s -j .got
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-i386/pr21884-nacl.d b/ld/testsuite/ld-i386/pr21884-nacl.d
deleted file mode 100644
index 82daaaafe2c..00000000000
--- a/ld/testsuite/ld-i386/pr21884-nacl.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#source: dummy.s
-#as: --32
-#ld: -m elf_i386 -T pr21884-nacl.t -b binary
-#objdump: -b binary -s
-#target: i?86-*-nacl* x86_64-*-nacl*
-
-.*:     file format binary
-
-Contents of section .data:
-#pass
diff --git a/ld/testsuite/ld-i386/pr21884-nacl.t b/ld/testsuite/ld-i386/pr21884-nacl.t
deleted file mode 100644
index 3ffb56c0703..00000000000
--- a/ld/testsuite/ld-i386/pr21884-nacl.t
+++ /dev/null
@@ -1,11 +0,0 @@
-OUTPUT_FORMAT("elf32-i386-nacl");
-OUTPUT_ARCH(i386);
-
-ENTRY(_start);
-SECTIONS {
-        . = 0x10000;
-        _start = . ;
-        .data : {
-                *(.data)
-        }
-}
diff --git a/ld/testsuite/ld-i386/pr21884.d b/ld/testsuite/ld-i386/pr21884.d
index ea73aa2a759..dc212d3c68a 100644
--- a/ld/testsuite/ld-i386/pr21884.d
+++ b/ld/testsuite/ld-i386/pr21884.d
@@ -2,7 +2,6 @@
 #as: --32
 #ld: -m elf_i386 -T pr21884.t -b binary
 #objdump: -b binary -s
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 .*:     file format binary
 
diff --git a/ld/testsuite/ld-i386/tlsbin-nacl.rd b/ld/testsuite/ld-i386/tlsbin-nacl.rd
deleted file mode 100644
index 38642ce7acf..00000000000
--- a/ld/testsuite/ld-i386/tlsbin-nacl.rd
+++ /dev/null
@@ -1,160 +0,0 @@
-#source: tlsbinpic.s
-#source: tlsbin.s
-#as: --32
-#ld: -melf_i386_nacl tmpdir/libtlslib.so --no-ld-generated-unwind-info
-#readelf: -Ssrl
-#target: i?86-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[[ 0-9]+\] \.plt +.*
- +\[[ 0-9]+\] \.text +PROGBITS +0+21000 .*
- +\[[ 0-9]+\] \.interp +.*
- +\[[ 0-9]+\] \.hash +.*
- +\[[ 0-9]+\] \.dynsym +.*
- +\[[ 0-9]+\] \.dynstr +.*
- +\[[ 0-9]+\] \.rel.dyn +.*
- +\[[ 0-9]+\] \.rel.plt +.*
- +\[[ 0-9]+\] \.tdata +PROGBITS +0*10031000 [0-9a-f]+ 000060 00 WAT +0 +0 4096
- +\[[ 0-9]+\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 000040 00 WAT +0 +0 +1
- +\[[ 0-9]+\] \.dynamic +DYNAMIC +0*10031060 .*
- +\[[ 0-9]+\] \.got +PROGBITS +0*10031100 .*
- +\[[ 0-9]+\] \.got\.plt +PROGBITS +0*10031124 .*
- +\[[ 0-9]+\] \.symtab +.*
- +\[[ 0-9]+\] \.strtab +.*
- +\[[ 0-9]+\] \.shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is EXEC \(Executable file\)
-Entry point 0x0*21188
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +PHDR.*
- +INTERP.*
-.*Requesting program interpreter.*
- +LOAD.*
- +LOAD.*
- +LOAD.*
- +DYNAMIC.*
- +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000
-
- Section to Segment mapping:
- +Segment Sections...
- +00 +
- +01 +.interp *
- +02 +.plt .text *
- +03 +.interp .hash .dynsym .dynstr .rel.dyn .rel.plt *
- +04 +.tdata .dynamic .got .got.plt *
- +05 +.dynamic *
- +06 +.tdata .tbss *
-
-Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
- Offset +Info +Type +Sym.Value +Sym. Name
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG3
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG5
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG7
-[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG2
-[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG4
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG4
-[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG6
-[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG1
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG8
-
-Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 1 entry:
- Offset +Info +Type +Sym.Value +Sym. Name
-[0-9a-f ]+R_386_JUMP_SLOT +[0-9a-f]+ +___tls_get_addr
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG7
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG8
- +[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +UND ___tls_get_addr
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +13 *
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbinpic.o
- +[0-9]+: 00000020 +0 +TLS +LOCAL +DEFAULT +9 sl1
- +[0-9]+: 00000024 +0 +TLS +LOCAL +DEFAULT +9 sl2
- +[0-9]+: 00000028 +0 +TLS +LOCAL +DEFAULT +9 sl3
- +[0-9]+: 0000002c +0 +TLS +LOCAL +DEFAULT +9 sl4
- +[0-9]+: 00000030 +0 +TLS +LOCAL +DEFAULT +9 sl5
- +[0-9]+: 00000034 +0 +TLS +LOCAL +DEFAULT +9 sl6
- +[0-9]+: 00000038 +0 +TLS +LOCAL +DEFAULT +9 sl7
- +[0-9]+: 0000003c +0 +TLS +LOCAL +DEFAULT +9 sl8
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o
- +[0-9]+: 00000080 +0 +TLS +LOCAL +DEFAULT +10 bl1
- +[0-9]+: 00000084 +0 +TLS +LOCAL +DEFAULT +10 bl2
- +[0-9]+: 00000088 +0 +TLS +LOCAL +DEFAULT +10 bl3
- +[0-9]+: 0000008c +0 +TLS +LOCAL +DEFAULT +10 bl4
- +[0-9]+: 00000090 +0 +TLS +LOCAL +DEFAULT +10 bl5
- +[0-9]+: 00000094 +0 +TLS +LOCAL +DEFAULT +10 bl6
- +[0-9]+: 00000098 +0 +TLS +LOCAL +DEFAULT +10 bl7
- +[0-9]+: 0000009c +0 +TLS +LOCAL +DEFAULT +10 bl8
-.* FILE +LOCAL +DEFAULT +ABS 
- +[0-9]+: 0*10031060 +0 +OBJECT +LOCAL +DEFAULT +11 _DYNAMIC
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +13 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3
- +[0-9]+: 0000001c +0 +TLS +GLOBAL +DEFAULT +9 sg8
- +[0-9]+: 0000007c +0 +TLS +GLOBAL +DEFAULT +10 bg8
- +[0-9]+: 00000074 +0 +TLS +GLOBAL +DEFAULT +10 bg6
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
- +[0-9]+: 00000068 +0 +TLS +GLOBAL +DEFAULT +10 bg3
- +[0-9]+: 00000008 +0 +TLS +GLOBAL +DEFAULT +9 sg3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG7
- +[0-9]+: 00000048 +0 +TLS +GLOBAL +HIDDEN +9 sh3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
- +[0-9]+: 0000000c +0 +TLS +GLOBAL +DEFAULT +9 sg4
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: 00000010 +0 +TLS +GLOBAL +DEFAULT +9 sg5
- +[0-9]+: 00000070 +0 +TLS +GLOBAL +DEFAULT +10 bg5
- +[0-9]+: 00000058 +0 +TLS +GLOBAL +HIDDEN +9 sh7
- +[0-9]+: 0000005c +0 +TLS +GLOBAL +HIDDEN +9 sh8
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +9 sg1
- +[0-9]+: 0+21188 +0 +FUNC +GLOBAL +DEFAULT +2 _start
- +[0-9]+: 0000004c +0 +TLS +GLOBAL +HIDDEN +9 sh4
- +[0-9]+: 00000078 +0 +TLS +GLOBAL +DEFAULT +10 bg7
- +[0-9]+: 00000050 +0 +TLS +GLOBAL +HIDDEN +9 sh5
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +13 __bss_start
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
- +[0-9]+: 0+21000 +0 +FUNC +GLOBAL +DEFAULT +2 fn2
- +[0-9]+: 00000004 +0 +TLS +GLOBAL +DEFAULT +9 sg2
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[0-9]+: 00000040 +0 +TLS +GLOBAL +HIDDEN +9 sh1
- +[0-9]+: 00000014 +0 +TLS +GLOBAL +DEFAULT +9 sg6
- +[0-9]+: 00000018 +0 +TLS +GLOBAL +DEFAULT +9 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +13 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +13 _end
- +[0-9]+: 00000044 +0 +TLS +GLOBAL +HIDDEN +9 sh2
- +[0-9]+: 00000054 +0 +TLS +GLOBAL +HIDDEN +9 sh6
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG8
- +[0-9]+: 00000064 +0 +TLS +GLOBAL +DEFAULT +10 bg2
- +[0-9]+: 00000060 +0 +TLS +GLOBAL +DEFAULT +10 bg1
- +[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +UND ___tls_get_addr
- +[0-9]+: 0000006c +0 +TLS +GLOBAL +DEFAULT +10 bg4
diff --git a/ld/testsuite/ld-i386/tlsbin2-nacl.rd b/ld/testsuite/ld-i386/tlsbin2-nacl.rd
deleted file mode 100644
index da69c27cf73..00000000000
--- a/ld/testsuite/ld-i386/tlsbin2-nacl.rd
+++ /dev/null
@@ -1,153 +0,0 @@
-#source: tlsbinpic2.s
-#source: tlsbin.s
-#as: --32
-#ld: -melf_i386_nacl tmpdir/libtlslib.so --no-ld-generated-unwind-info
-#readelf: -Ssrl
-#target: i?86-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[[ 0-9]+\] \.text +PROGBITS +0+20000 .*
- +\[[ 0-9]+\] \.interp +.*
- +\[[ 0-9]+\] \.hash +.*
- +\[[ 0-9]+\] \.dynsym +.*
- +\[[ 0-9]+\] \.dynstr +.*
- +\[[ 0-9]+\] \.rel.dyn +.*
- +\[[ 0-9]+\] \.tdata +PROGBITS +0*10031000 [0-9a-f]+ 000060 00 WAT +0 +0 4096
- +\[[ 0-9]+\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 000040 00 WAT +0 +0 +1
- +\[[ 0-9]+\] \.dynamic +DYNAMIC +0*10031060 .*
- +\[[ 0-9]+\] \.got +PROGBITS +0*100310e0 .*
- +\[[ 0-9]+\] \.got\.plt +PROGBITS +0*10031108 .*
- +\[[ 0-9]+\] \.symtab +.*
- +\[[ 0-9]+\] \.strtab +.*
- +\[[ 0-9]+\] \.shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is EXEC \(Executable file\)
-Entry point 0x0*20188
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +PHDR.*
- +INTERP.*
-.*Requesting program interpreter.*
- +LOAD.*
- +LOAD.*
- +LOAD.*
- +DYNAMIC.*
- +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000
-
- Section to Segment mapping:
- +Segment Sections...
- +00 +
- +01 +.interp *
- +02 +.text *
- +03 +.interp .hash .dynsym .dynstr .rel.dyn *
- +04 +.tdata .dynamic .got .got.plt *
- +05 +.dynamic *
- +06 +.tdata .tbss *
-
-Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 10 entries:
- Offset +Info +Type +Sym.Value +Sym. Name
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG3
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG5
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG7
-[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG2
-[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG4
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG4
-[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG6
-[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG1
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG8
-[0-9a-f ]+R_386_GLOB_DAT +[0-9a-f]+ +___tls_get_addr
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG7
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG8
- +[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +UND ___tls_get_addr
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 *
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbinpic2.o
- +[0-9]+: 00000020 +0 +TLS +LOCAL +DEFAULT +7 sl1
- +[0-9]+: 00000024 +0 +TLS +LOCAL +DEFAULT +7 sl2
- +[0-9]+: 00000028 +0 +TLS +LOCAL +DEFAULT +7 sl3
- +[0-9]+: 0000002c +0 +TLS +LOCAL +DEFAULT +7 sl4
- +[0-9]+: 00000030 +0 +TLS +LOCAL +DEFAULT +7 sl5
- +[0-9]+: 00000034 +0 +TLS +LOCAL +DEFAULT +7 sl6
- +[0-9]+: 00000038 +0 +TLS +LOCAL +DEFAULT +7 sl7
- +[0-9]+: 0000003c +0 +TLS +LOCAL +DEFAULT +7 sl8
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o
- +[0-9]+: 00000080 +0 +TLS +LOCAL +DEFAULT +8 bl1
- +[0-9]+: 00000084 +0 +TLS +LOCAL +DEFAULT +8 bl2
- +[0-9]+: 00000088 +0 +TLS +LOCAL +DEFAULT +8 bl3
- +[0-9]+: 0000008c +0 +TLS +LOCAL +DEFAULT +8 bl4
- +[0-9]+: 00000090 +0 +TLS +LOCAL +DEFAULT +8 bl5
- +[0-9]+: 00000094 +0 +TLS +LOCAL +DEFAULT +8 bl6
- +[0-9]+: 00000098 +0 +TLS +LOCAL +DEFAULT +8 bl7
- +[0-9]+: 0000009c +0 +TLS +LOCAL +DEFAULT +8 bl8
-.* FILE +LOCAL +DEFAULT +ABS 
- +[0-9]+: 0*10031060 +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3
- +[0-9]+: 0000001c +0 +TLS +GLOBAL +DEFAULT +7 sg8
- +[0-9]+: 0000007c +0 +TLS +GLOBAL +DEFAULT +8 bg8
- +[0-9]+: 00000074 +0 +TLS +GLOBAL +DEFAULT +8 bg6
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
- +[0-9]+: 00000068 +0 +TLS +GLOBAL +DEFAULT +8 bg3
- +[0-9]+: 00000008 +0 +TLS +GLOBAL +DEFAULT +7 sg3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG7
- +[0-9]+: 00000048 +0 +TLS +GLOBAL +HIDDEN +7 sh3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
- +[0-9]+: 0000000c +0 +TLS +GLOBAL +DEFAULT +7 sg4
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: 00000010 +0 +TLS +GLOBAL +DEFAULT +7 sg5
- +[0-9]+: 00000070 +0 +TLS +GLOBAL +DEFAULT +8 bg5
- +[0-9]+: 00000058 +0 +TLS +GLOBAL +HIDDEN +7 sh7
- +[0-9]+: 0000005c +0 +TLS +GLOBAL +HIDDEN +7 sh8
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +7 sg1
- +[0-9]+: 0+20188 +0 +FUNC +GLOBAL +DEFAULT +1 _start
- +[0-9]+: 0000004c +0 +TLS +GLOBAL +HIDDEN +7 sh4
- +[0-9]+: 00000078 +0 +TLS +GLOBAL +DEFAULT +8 bg7
- +[0-9]+: 00000050 +0 +TLS +GLOBAL +HIDDEN +7 sh5
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 __bss_start
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
- +[0-9]+: 0+20000 +0 +FUNC +GLOBAL +DEFAULT +1 fn2
- +[0-9]+: 00000004 +0 +TLS +GLOBAL +DEFAULT +7 sg2
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[0-9]+: 00000040 +0 +TLS +GLOBAL +HIDDEN +7 sh1
- +[0-9]+: 00000014 +0 +TLS +GLOBAL +DEFAULT +7 sg6
- +[0-9]+: 00000018 +0 +TLS +GLOBAL +DEFAULT +7 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _end
- +[0-9]+: 00000044 +0 +TLS +GLOBAL +HIDDEN +7 sh2
- +[0-9]+: 00000054 +0 +TLS +GLOBAL +HIDDEN +7 sh6
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG8
- +[0-9]+: 00000064 +0 +TLS +GLOBAL +DEFAULT +8 bg2
- +[0-9]+: 00000060 +0 +TLS +GLOBAL +DEFAULT +8 bg1
- +[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +UND ___tls_get_addr
- +[0-9]+: 0000006c +0 +TLS +GLOBAL +DEFAULT +8 bg4
diff --git a/ld/testsuite/ld-i386/tlsbindesc-nacl.rd b/ld/testsuite/ld-i386/tlsbindesc-nacl.rd
deleted file mode 100644
index f86ad798d6c..00000000000
--- a/ld/testsuite/ld-i386/tlsbindesc-nacl.rd
+++ /dev/null
@@ -1,151 +0,0 @@
-#source: tlsbindesc.s
-#source: tlsbin.s
-#as: --32
-#ld: -melf_i386_nacl tmpdir/libtlslib.so --no-ld-generated-unwind-info
-#readelf: -Ssrl
-#target: i?86-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[[ 0-9]+\] \.text +PROGBITS +0+20000 .*
- +\[[ 0-9]+\] \.interp +.*
- +\[[ 0-9]+\] \.hash +.*
- +\[[ 0-9]+\] \.dynsym +.*
- +\[[ 0-9]+\] \.dynstr +.*
- +\[[ 0-9]+\] \.rel.dyn +.*
- +\[[ 0-9]+\] \.tdata +PROGBITS +0*10031000 [0-9a-f]+ 000060 00 WAT +0 +0 4096
- +\[[ 0-9]+\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 000040 00 WAT +0 +0 +1
- +\[[ 0-9]+\] \.dynamic +DYNAMIC +0*10031060 .*
- +\[[ 0-9]+\] \.got +PROGBITS +0*100310e0 .*
- +\[[ 0-9]+\] \.got\.plt +PROGBITS +0*10031104 .*
- +\[[ 0-9]+\] \.symtab +.*
- +\[[ 0-9]+\] \.strtab +.*
- +\[[ 0-9]+\] \.shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is EXEC \(Executable file\)
-Entry point 0x0*20156
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +PHDR.*
- +INTERP.*
-.*Requesting program interpreter.*
- +LOAD.*
- +LOAD.*
- +LOAD.*
- +DYNAMIC.*
- +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+a0 R +0x1000
-
- Section to Segment mapping:
- +Segment Sections...
- +00 +
- +01 +.interp *
- +02 +.text *
- +03 +.interp .hash .dynsym .dynstr .rel.dyn *
- +04 +.tdata .dynamic .got .got.plt *
- +05 +.dynamic *
- +06 +.tdata .tbss *
-
-Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
- Offset +Info +Type +Sym.Value +Sym. Name
-0*100310e0 +0000010e R_386_TLS_TPOFF +0+ +sG3
-0*100310e4 +0000020e R_386_TLS_TPOFF +0+ +sG5
-0*100310e8 +0000030e R_386_TLS_TPOFF +0+ +sG7
-0*100310ec +00000425 R_386_TLS_TPOFF32 0+ +sG2
-0*100310f0 +00000525 R_386_TLS_TPOFF32 0+ +sG4
-0*100310f4 +0000050e R_386_TLS_TPOFF +0+ +sG4
-0*100310f8 +00000625 R_386_TLS_TPOFF32 0+ +sG6
-0*100310fc +00000725 R_386_TLS_TPOFF32 0+ +sG1
-0*10031100 +0000080e R_386_TLS_TPOFF +0+ +sG8
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG7
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG8
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 *
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbindesc.o
- +[0-9]+: 00000020 +0 +TLS +LOCAL +DEFAULT +7 sl1
- +[0-9]+: 00000024 +0 +TLS +LOCAL +DEFAULT +7 sl2
- +[0-9]+: 00000028 +0 +TLS +LOCAL +DEFAULT +7 sl3
- +[0-9]+: 0000002c +0 +TLS +LOCAL +DEFAULT +7 sl4
- +[0-9]+: 00000030 +0 +TLS +LOCAL +DEFAULT +7 sl5
- +[0-9]+: 00000034 +0 +TLS +LOCAL +DEFAULT +7 sl6
- +[0-9]+: 00000038 +0 +TLS +LOCAL +DEFAULT +7 sl7
- +[0-9]+: 0000003c +0 +TLS +LOCAL +DEFAULT +7 sl8
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o
- +[0-9]+: 00000080 +0 +TLS +LOCAL +DEFAULT +8 bl1
- +[0-9]+: 00000084 +0 +TLS +LOCAL +DEFAULT +8 bl2
- +[0-9]+: 00000088 +0 +TLS +LOCAL +DEFAULT +8 bl3
- +[0-9]+: 0000008c +0 +TLS +LOCAL +DEFAULT +8 bl4
- +[0-9]+: 00000090 +0 +TLS +LOCAL +DEFAULT +8 bl5
- +[0-9]+: 00000094 +0 +TLS +LOCAL +DEFAULT +8 bl6
- +[0-9]+: 00000098 +0 +TLS +LOCAL +DEFAULT +8 bl7
- +[0-9]+: 0000009c +0 +TLS +LOCAL +DEFAULT +8 bl8
-.* FILE +LOCAL +DEFAULT +ABS 
- +[0-9]+: 00001000 +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_
- +[0-9]+: 0*10031060 +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3
- +[0-9]+: 0000001c +0 +TLS +GLOBAL +DEFAULT +7 sg8
- +[0-9]+: 0000007c +0 +TLS +GLOBAL +DEFAULT +8 bg8
- +[0-9]+: 00000074 +0 +TLS +GLOBAL +DEFAULT +8 bg6
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
- +[0-9]+: 00000068 +0 +TLS +GLOBAL +DEFAULT +8 bg3
- +[0-9]+: 00000008 +0 +TLS +GLOBAL +DEFAULT +7 sg3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG7
- +[0-9]+: 00000048 +0 +TLS +GLOBAL +HIDDEN +7 sh3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
- +[0-9]+: 0000000c +0 +TLS +GLOBAL +DEFAULT +7 sg4
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: 00000010 +0 +TLS +GLOBAL +DEFAULT +7 sg5
- +[0-9]+: 00000070 +0 +TLS +GLOBAL +DEFAULT +8 bg5
- +[0-9]+: 00000058 +0 +TLS +GLOBAL +HIDDEN +7 sh7
- +[0-9]+: 0000005c +0 +TLS +GLOBAL +HIDDEN +7 sh8
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +7 sg1
- +[0-9]+: 0+20156 +0 +FUNC +GLOBAL +DEFAULT +1 _start
- +[0-9]+: 0000004c +0 +TLS +GLOBAL +HIDDEN +7 sh4
- +[0-9]+: 00000078 +0 +TLS +GLOBAL +DEFAULT +8 bg7
- +[0-9]+: 00000050 +0 +TLS +GLOBAL +HIDDEN +7 sh5
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 __bss_start
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
- +[0-9]+: 0+20000 +0 +FUNC +GLOBAL +DEFAULT +1 fn2
- +[0-9]+: 00000004 +0 +TLS +GLOBAL +DEFAULT +7 sg2
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[0-9]+: 00000040 +0 +TLS +GLOBAL +HIDDEN +7 sh1
- +[0-9]+: 00000014 +0 +TLS +GLOBAL +DEFAULT +7 sg6
- +[0-9]+: 00000018 +0 +TLS +GLOBAL +DEFAULT +7 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _end
- +[0-9]+: 00000044 +0 +TLS +GLOBAL +HIDDEN +7 sh2
- +[0-9]+: 00000054 +0 +TLS +GLOBAL +HIDDEN +7 sh6
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG8
- +[0-9]+: 00000064 +0 +TLS +GLOBAL +DEFAULT +8 bg2
- +[0-9]+: 00000060 +0 +TLS +GLOBAL +DEFAULT +8 bg1
- +[0-9]+: 0000006c +0 +TLS +GLOBAL +DEFAULT +8 bg4
diff --git a/ld/testsuite/ld-i386/tlsdesc-nacl.rd b/ld/testsuite/ld-i386/tlsdesc-nacl.rd
deleted file mode 100644
index 62376918a3b..00000000000
--- a/ld/testsuite/ld-i386/tlsdesc-nacl.rd
+++ /dev/null
@@ -1,145 +0,0 @@
-#source: tlsdesc.s
-#source: tlspic2.s
-#as: --32
-#ld: -shared -melf_i386_nacl --no-ld-generated-unwind-info
-#readelf: -Ssrl
-#target: i?86-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[[ 0-9]+\] \.text +.*
- +\[[ 0-9]+\] \.hash +.*
- +\[[ 0-9]+\] \.dynsym +.*
- +\[[ 0-9]+\] \.dynstr +.*
- +\[[ 0-9]+\] \.rel.dyn +.*
- +\[[ 0-9]+\] \.rel.plt +.*
- +\[[ 0-9]+\] \.tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000060 00 WAT +0 +0 +1
- +\[[ 0-9]+\] \.tbss +NOBITS +[0-9aa-f]+ [0-9a-f]+ 000020 00 WAT +0 +0 +1
- +\[[ 0-9]+\] \.dynamic +.*
- +\[[ 0-9]+\] \.got +.*
- +\[[ 0-9]+\] \.got.plt +.*
- +\[[ 0-9]+\] \.symtab +.*
- +\[[ 0-9]+\] \.strtab +.*
- +\[[ 0-9]+\] \.shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is DYN \(Shared object file\)
-Entry point 0x[0-9a-f]+
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD.*
- +LOAD.*
- +LOAD.*
- +DYNAMIC.*
- +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1
-
- Section to Segment mapping:
- +Segment Sections...
- +00 +.text *
- +01 +.hash .dynsym .dynstr .rel.dyn .rel.plt *
- +02 +.tdata .dynamic .got .got.plt *
- +03 +.dynamic *
- +04 +.tdata .tbss *
-
-Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries:
- Offset +Info +Type +Sym.Value +Sym. Name
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF +0+8 +sg3
-[0-9a-f ]+R_386_TLS_TPOFF32 0+c +sg4
-[0-9a-f ]+R_386_TLS_TPOFF +0+c +sg4
-[0-9a-f ]+R_386_TLS_TPOFF +0+10 +sg5
-[0-9a-f ]+R_386_TLS_TPOFF32 0+4 +sg2
-
-Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 5 entries:
- Offset +Info +Type +Sym.Value +Sym. Name
-[0-9a-f ]+R_386_TLS_DESC * 0+ +sg1
-[0-9a-f ]+R_386_TLS_DESC *
-[0-9a-f ]+R_386_TLS_DESC *
-[0-9a-f ]+R_386_TLS_DESC *
-[0-9a-f ]+R_386_TLS_DESC *
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +7 sg8
- +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +7 sg3
- +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +7 sg4
- +[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +7 sg5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +7 sg1
- +[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +1 fn1
- +[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +7 sg2
- +[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +7 sg6
- +[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +7 sg7
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 *
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsdesc.o
- +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +7 sl1
- +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +7 sl2
- +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +7 sl3
- +[0-9]+: 0+2c +0 +TLS +LOCAL +DEFAULT +7 sl4
- +[0-9]+: 0+30 +0 +TLS +LOCAL +DEFAULT +7 sl5
- +[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +7 sl6
- +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +7 sl7
- +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +7 sl8
-.* FILE +LOCAL +DEFAULT +ABS 
- +[0-9]+: 0+60 +0 +TLS +LOCAL +DEFAULT +8 sH1
- +[0-9]+: 0+ +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
- +[0-9]+: 0+48 +0 +TLS +LOCAL +DEFAULT +7 sh3
- +[0-9]+: 0+64 +0 +TLS +LOCAL +DEFAULT +8 sH2
- +[0-9]+: 0+78 +0 +TLS +LOCAL +DEFAULT +8 sH7
- +[0-9]+: 0+58 +0 +TLS +LOCAL +DEFAULT +7 sh7
- +[0-9]+: 0+5c +0 +TLS +LOCAL +DEFAULT +7 sh8
- +[0-9]+: 0+6c +0 +TLS +LOCAL +DEFAULT +8 sH4
- +[0-9]+: 0+4c +0 +TLS +LOCAL +DEFAULT +7 sh4
- +[0-9]+: 0+68 +0 +TLS +LOCAL +DEFAULT +8 sH3
- +[0-9]+: 0+50 +0 +TLS +LOCAL +DEFAULT +7 sh5
- +[0-9]+: 0+70 +0 +TLS +LOCAL +DEFAULT +8 sH5
- +[0-9]+: 0+74 +0 +TLS +LOCAL +DEFAULT +8 sH6
- +[0-9]+: 0+7c +0 +TLS +LOCAL +DEFAULT +8 sH8
- +[0-9]+: 0+40 +0 +TLS +LOCAL +DEFAULT +7 sh1
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+44 +0 +TLS +LOCAL +DEFAULT +7 sh2
- +[0-9]+: 0+54 +0 +TLS +LOCAL +DEFAULT +7 sh6
- +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +7 sg8
- +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +7 sg3
- +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +7 sg4
- +[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +7 sg5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +7 sg1
- +[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +1 fn1
- +[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +7 sg2
- +[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +7 sg6
- +[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +7 sg7
diff --git a/ld/testsuite/ld-i386/tlsgdesc-nacl.rd b/ld/testsuite/ld-i386/tlsgdesc-nacl.rd
deleted file mode 100644
index 9107fd49e9a..00000000000
--- a/ld/testsuite/ld-i386/tlsgdesc-nacl.rd
+++ /dev/null
@@ -1,97 +0,0 @@
-#source: tlsgdesc.s
-#as: --32
-#ld: -shared -melf_i386_nacl --no-ld-generated-unwind-info
-#readelf: -Ssrl
-#target: i?86-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[[ 0-9]+\] \.plt +.*
- +\[[ 0-9]+\] \.text +.*
- +\[[ 0-9]+\] \.hash +.*
- +\[[ 0-9]+\] \.dynsym +.*
- +\[[ 0-9]+\] \.dynstr +.*
- +\[[ 0-9]+\] \.rel.dyn +.*
- +\[[ 0-9]+\] \.rel.plt +.*
- +\[[ 0-9]+\] \.dynamic +.*
- +\[[ 0-9]+\] \.got +.*
- +\[[ 0-9]+\] \.got.plt +.*
- +\[[ 0-9]+\] \.symtab +.*
- +\[[ 0-9]+\] \.strtab +.*
- +\[[ 0-9]+\] \.shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is DYN \(Shared object file\)
-Entry point 0x[0-9a-f]+
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD.*
- +LOAD.*
- +LOAD.*
- +DYNAMIC.*
-
- Section to Segment mapping:
- +Segment Sections...
- +00 +.plt .text *
- +01 +.hash .dynsym .dynstr .rel.dyn .rel.plt *
- +02 +.dynamic .got .got.plt *
- +03 +.dynamic *
-
-Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 8 entries:
- Offset +Info +Type +Sym.Value +Sym. Name
-[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG3
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG5
-[0-9a-f ]+R_386_TLS_DTPMOD3 0+ +sG2
-[0-9a-f ]+R_386_TLS_DTPOFF3 0+ +sG2
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG4
-[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG6
-[0-9a-f ]+R_386_TLS_DTPMOD3 0+ +sG1
-[0-9a-f ]+R_386_TLS_DTPOFF3 0+ +sG1
-
-Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 3 entries:
- Offset +Info +Type +Sym.Value +Sym. Name
-[0-9a-f ]+R_386_JUMP_SLOT +0+ +___tls_get_addr
-[0-9a-f ]+R_386_TLS_DESC +0+ +sG1
-[0-9a-f ]+R_386_TLS_DESC +0+ +sG2
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
- +[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +2 fc1
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +8 _DYNAMIC
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +10 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
- +[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +2 fc1
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
diff --git a/ld/testsuite/ld-i386/tlsnopic-nacl.rd b/ld/testsuite/ld-i386/tlsnopic-nacl.rd
deleted file mode 100644
index e981c86d0fd..00000000000
--- a/ld/testsuite/ld-i386/tlsnopic-nacl.rd
+++ /dev/null
@@ -1,112 +0,0 @@
-#source: tlsnopic1.s
-#source: tlsnopic2.s
-#as: --32
-#ld: -shared -melf_i386_nacl --no-ld-generated-unwind-info
-#readelf: -Ssrl
-#target: i?86-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[[ 0-9]+\] \.text +PROGBITS +0+ .*
- +\[[ 0-9]+\] \.hash +.*
- +\[[ 0-9]+\] \.dynsym +.*
- +\[[ 0-9]+\] \.dynstr +.*
- +\[[ 0-9]+\] \.rel.dyn +.*
- +\[[ 0-9]+\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 000024 00 WAT +0 +0 +1
- +\[[ 0-9]+\] \.dynamic +DYNAMIC +0*10010230 .*
- +\[[ 0-9]+\] \.got +PROGBITS +0*100102b0 .*
- +\[[ 0-9]+\] \.got.plt +PROGBITS +0*100102c8 .*
- +\[[ 0-9]+\] \.symtab +.*
- +\[[ 0-9]+\] \.strtab +.*
- +\[[ 0-9]+\] \.shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is DYN \(Shared object file\)
-Entry point 0x0+
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD.*
- +LOAD.*
- +LOAD.*
- +DYNAMIC.*
- +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+ 0x0+24 R +0x1
-
- Section to Segment mapping:
- +Segment Sections...
- +00 +.text *
- +01 +.hash .dynsym .dynstr .rel.dyn *
- +02 +.dynamic .got .got.plt *
- +03 +.dynamic *
- +04 +.tbss *
-
-Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries:
- Offset +Info +Type +Sym.Value +Sym. Name
-[0-9a-f ]+R_386_RELATIVE +
-[0-9a-f ]+R_386_RELATIVE +
-[0-9a-f ]+R_386_RELATIVE +
-[0-9a-f ]+R_386_RELATIVE +
-[0-9a-f ]+R_386_RELATIVE +
-[0-9a-f ]+R_386_RELATIVE +
-[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sg3
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF +
-[0-9a-f ]+R_386_TLS_TPOFF +
-[0-9a-f ]+R_386_TLS_TPOFF +
-[0-9a-f ]+R_386_TLS_TPOFF +
-[0-9a-f ]+R_386_TLS_TPOFF +
-[0-9a-f ]+R_386_TLS_TPOFF +
-[0-9a-f ]+R_386_TLS_TPOFF +
-[0-9a-f ]+R_386_TLS_TPOFF +
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sg4
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sg5
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sg1
-[0-9a-f ]+R_386_TLS_TPOFF +0+ +sg2
-
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg4
- +[0-9]+: 0+ +0 +FUNC +GLOBAL +DEFAULT +1 fn3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg1
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg2
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsnopic1.o
- +[0-9]+: 0+00 +0 +TLS +LOCAL +DEFAULT +6 bl1
- +[0-9]+: 0+04 +0 +TLS +LOCAL +DEFAULT +6 bl2
- +[0-9]+: 0+08 +0 +TLS +LOCAL +DEFAULT +6 bl3
- +[0-9]+: 0+0c +0 +TLS +LOCAL +DEFAULT +6 bl4
- +[0-9]+: 0+10 +0 +TLS +LOCAL +DEFAULT +6 bl5
-.* FILE +LOCAL +DEFAULT +ABS 
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +7 _DYNAMIC
- +[0-9]+: 0+1c +0 +TLS +LOCAL +DEFAULT +6 sh3
- +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +6 sh4
- +[0-9]+: 0+14 +0 +TLS +LOCAL +DEFAULT +6 sh1
- +[0-9]+: 0*100102c8 +0 +OBJECT +LOCAL +DEFAULT +9 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+18 +0 +TLS +LOCAL +DEFAULT +6 sh2
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg4
- +[0-9]+: 0+ +0 +FUNC +GLOBAL +DEFAULT +1 fn3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg1
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg2
diff --git a/ld/testsuite/ld-i386/tlspic-nacl.rd b/ld/testsuite/ld-i386/tlspic-nacl.rd
deleted file mode 100644
index 38aaf6ad7ea..00000000000
--- a/ld/testsuite/ld-i386/tlspic-nacl.rd
+++ /dev/null
@@ -1,150 +0,0 @@
-#source: tlspic1.s
-#source: tlspic2.s
-#as: --32
-#ld: -shared -melf_i386_nacl --no-ld-generated-unwind-info
-#readelf: -Ssrl
-#target: i?86-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[[ 0-9]+\] \.plt +.*
- +\[[ 0-9]+\] \.text +.*
- +\[[ 0-9]+\] \.hash +.*
- +\[[ 0-9]+\] \.dynsym +.*
- +\[[ 0-9]+\] \.dynstr +.*
- +\[[ 0-9]+\] \.rel.dyn +.*
- +\[[ 0-9]+\] \.rel.plt +.*
- +\[[ 0-9]+\] \.tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000060 00 WAT +0 +0 +1
- +\[[ 0-9]+\] \.tbss +NOBITS +[0-9aa-f]+ [0-9a-f]+ 000020 00 WAT +0 +0 +1
- +\[[ 0-9]+\] \.dynamic +.*
- +\[[ 0-9]+\] \.got +.*
- +\[[ 0-9]+\] \.got.plt +.*
- +\[[ 0-9]+\] \.symtab +.*
- +\[[ 0-9]+\] \.strtab +.*
- +\[[ 0-9]+\] \.shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is DYN \(Shared object file\)
-Entry point 0x[0-9a-f]+
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD.*
- +LOAD.*
- +LOAD.*
- +DYNAMIC.*
- +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1
-
- Section to Segment mapping:
- +Segment Sections...
- +00 +.plt .text *
- +01 +.hash .dynsym .dynstr .rel.dyn .rel.plt *
- +02 +.tdata .dynamic .got .got.plt *
- +03 +.dynamic *
- +04 +.tdata .tbss *
-
-Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 26 entries:
- Offset +Info +Type +Sym.Value +Sym. Name
-[0-9a-f ]+R_386_TLS_DTPMOD3
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_DTPMOD3
-[0-9a-f ]+R_386_TLS_DTPMOD3
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_DTPMOD3
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF +0+8 +sg3
-[0-9a-f ]+R_386_TLS_TPOFF32 0+c +sg4
-[0-9a-f ]+R_386_TLS_TPOFF +0+c +sg4
-[0-9a-f ]+R_386_TLS_TPOFF +0+10 +sg5
-[0-9a-f ]+R_386_TLS_DTPMOD3 0+ +sg1
-[0-9a-f ]+R_386_TLS_DTPOFF3 0+ +sg1
-[0-9a-f ]+R_386_TLS_TPOFF32 0+4 +sg2
-
-Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 1 entry:
- Offset +Info +Type +Sym.Value +Sym. Name
-[0-9a-f ]+R_386_JUMP_SLOT +0+ +___tls_get_addr
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +8 sg8
- +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +8 sg3
- +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +8 sg4
- +[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +8 sg5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +8 sg1
- +[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +2 fn1
- +[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +8 sg2
- +[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +8 sg6
- +[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +8 sg7
- +[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 *
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlspic1.o
- +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +8 sl1
- +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +8 sl2
- +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +8 sl3
- +[0-9]+: 0+2c +0 +TLS +LOCAL +DEFAULT +8 sl4
- +[0-9]+: 0+30 +0 +TLS +LOCAL +DEFAULT +8 sl5
- +[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +8 sl6
- +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +8 sl7
- +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +8 sl8
-.* FILE +LOCAL +DEFAULT +ABS 
- +[0-9]+: 0+60 +0 +TLS +LOCAL +DEFAULT +9 sH1
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
- +[0-9]+: 0+48 +0 +TLS +LOCAL +DEFAULT +8 sh3
- +[0-9]+: 0+64 +0 +TLS +LOCAL +DEFAULT +9 sH2
- +[0-9]+: 0+78 +0 +TLS +LOCAL +DEFAULT +9 sH7
- +[0-9]+: 0+58 +0 +TLS +LOCAL +DEFAULT +8 sh7
- +[0-9]+: 0+5c +0 +TLS +LOCAL +DEFAULT +8 sh8
- +[0-9]+: 0+6c +0 +TLS +LOCAL +DEFAULT +9 sH4
- +[0-9]+: 0+4c +0 +TLS +LOCAL +DEFAULT +8 sh4
- +[0-9]+: 0+68 +0 +TLS +LOCAL +DEFAULT +9 sH3
- +[0-9]+: 0+50 +0 +TLS +LOCAL +DEFAULT +8 sh5
- +[0-9]+: 0+70 +0 +TLS +LOCAL +DEFAULT +9 sH5
- +[0-9]+: 0+74 +0 +TLS +LOCAL +DEFAULT +9 sH6
- +[0-9]+: 0+7c +0 +TLS +LOCAL +DEFAULT +9 sH8
- +[0-9]+: 0+40 +0 +TLS +LOCAL +DEFAULT +8 sh1
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+44 +0 +TLS +LOCAL +DEFAULT +8 sh2
- +[0-9]+: 0+54 +0 +TLS +LOCAL +DEFAULT +8 sh6
- +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +8 sg8
- +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +8 sg3
- +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +8 sg4
- +[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +8 sg5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +8 sg1
- +[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +2 fn1
- +[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +8 sg2
- +[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +8 sg6
- +[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +8 sg7
- +[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
diff --git a/ld/testsuite/ld-i386/tlspic2-nacl.rd b/ld/testsuite/ld-i386/tlspic2-nacl.rd
deleted file mode 100644
index c5e8a0ed085..00000000000
--- a/ld/testsuite/ld-i386/tlspic2-nacl.rd
+++ /dev/null
@@ -1,143 +0,0 @@
-#source: tlspic3.s
-#source: tlspic2.s
-#as: --32
-#ld: -shared -melf_i386_nacl --no-ld-generated-unwind-info
-#readelf: -Ssrl
-#target: i?86-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[[ 0-9]+\] \.text +.*
- +\[[ 0-9]+\] \.hash +.*
- +\[[ 0-9]+\] \.dynsym +.*
- +\[[ 0-9]+\] \.dynstr +.*
- +\[[ 0-9]+\] \.rel.dyn +.*
- +\[[ 0-9]+\] \.tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000060 00 WAT +0 +0 +1
- +\[[ 0-9]+\] \.tbss +NOBITS +[0-9aa-f]+ [0-9a-f]+ 000020 00 WAT +0 +0 +1
- +\[[ 0-9]+\] \.dynamic +.*
- +\[[ 0-9]+\] \.got +.*
- +\[[ 0-9]+\] \.got.plt +.*
- +\[[ 0-9]+\] \.symtab +.*
- +\[[ 0-9]+\] \.strtab +.*
- +\[[ 0-9]+\] \.shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is DYN \(Shared object file\)
-Entry point 0x[0-9a-f]+
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD.*
- +LOAD.*
- +LOAD.*
- +DYNAMIC.*
- +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1
-
- Section to Segment mapping:
- +Segment Sections...
- +00 +.text *
- +01 +.hash .dynsym .dynstr .rel.dyn *
- +02 +.tdata .dynamic .got .got.plt *
- +03 +.dynamic *
- +04 +.tdata .tbss *
-
-Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 27 entries:
- Offset +Info +Type +Sym.Value +Sym. Name
-[0-9a-f ]+R_386_TLS_DTPMOD3
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_DTPMOD3
-[0-9a-f ]+R_386_TLS_DTPMOD3
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_TPOFF *
-[0-9a-f ]+R_386_TLS_DTPMOD3
-[0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF +0+8 +sg3
-[0-9a-f ]+R_386_TLS_TPOFF32 0+c +sg4
-[0-9a-f ]+R_386_TLS_TPOFF +0+c +sg4
-[0-9a-f ]+R_386_TLS_TPOFF +0+10 +sg5
-[0-9a-f ]+R_386_TLS_DTPMOD3 0+ +sg1
-[0-9a-f ]+R_386_TLS_DTPOFF3 0+ +sg1
-[0-9a-f ]+R_386_TLS_TPOFF32 0+4 +sg2
-[0-9a-f ]+R_386_GLOB_DAT +0+ +___tls_get_addr
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +6 sg8
- +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +6 sg3
- +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +6 sg4
- +[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +6 sg5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +6 sg1
- +[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +1 fn1
- +[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +6 sg2
- +[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +6 sg6
- +[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +6 sg7
- +[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlspic3.o
- +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +6 sl1
- +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +6 sl2
- +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +6 sl3
- +[0-9]+: 0+2c +0 +TLS +LOCAL +DEFAULT +6 sl4
- +[0-9]+: 0+30 +0 +TLS +LOCAL +DEFAULT +6 sl5
- +[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +6 sl6
- +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +6 sl7
- +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +6 sl8
-.* FILE +LOCAL +DEFAULT +ABS 
- +[0-9]+: 0+60 +0 +TLS +LOCAL +DEFAULT +7 sH1
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +8 _DYNAMIC
- +[0-9]+: 0+48 +0 +TLS +LOCAL +DEFAULT +6 sh3
- +[0-9]+: 0+64 +0 +TLS +LOCAL +DEFAULT +7 sH2
- +[0-9]+: 0+78 +0 +TLS +LOCAL +DEFAULT +7 sH7
- +[0-9]+: 0+58 +0 +TLS +LOCAL +DEFAULT +6 sh7
- +[0-9]+: 0+5c +0 +TLS +LOCAL +DEFAULT +6 sh8
- +[0-9]+: 0+6c +0 +TLS +LOCAL +DEFAULT +7 sH4
- +[0-9]+: 0+4c +0 +TLS +LOCAL +DEFAULT +6 sh4
- +[0-9]+: 0+68 +0 +TLS +LOCAL +DEFAULT +7 sH3
- +[0-9]+: 0+50 +0 +TLS +LOCAL +DEFAULT +6 sh5
- +[0-9]+: 0+70 +0 +TLS +LOCAL +DEFAULT +7 sH5
- +[0-9]+: 0+74 +0 +TLS +LOCAL +DEFAULT +7 sH6
- +[0-9]+: 0+7c +0 +TLS +LOCAL +DEFAULT +7 sH8
- +[0-9]+: 0+40 +0 +TLS +LOCAL +DEFAULT +6 sh1
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +10 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+44 +0 +TLS +LOCAL +DEFAULT +6 sh2
- +[0-9]+: 0+54 +0 +TLS +LOCAL +DEFAULT +6 sh6
- +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +6 sg8
- +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +6 sg3
- +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +6 sg4
- +[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +6 sg5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +6 sg1
- +[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +1 fn1
- +[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +6 sg2
- +[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +6 sg6
- +[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +6 sg7
- +[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
diff --git a/ld/testsuite/ld-ifunc/binutils.exp b/ld/testsuite/ld-ifunc/binutils.exp
index 4b6c8ebe3ee..baad8a2cc31 100644
--- a/ld/testsuite/ld-ifunc/binutils.exp
+++ b/ld/testsuite/ld-ifunc/binutils.exp
@@ -27,8 +27,6 @@
 if { !([istarget "i?86-*-elf*"]
        || [istarget "i?86-*-linux*"]
        || [istarget "i?86-*-gnu*"]
-       || [istarget "i?86-*-nacl*"]
-       || [istarget "x86_64-*-nacl*"]
        || [istarget "x86_64-*-linux*"]
        || [istarget "amd64-*-linux*"]) } {
     return
diff --git a/ld/testsuite/ld-ifunc/ifunc-10-i386.d b/ld/testsuite/ld-ifunc/ifunc-10-i386.d
index baff0fc7f6f..6ff3f75ec25 100644
--- a/ld/testsuite/ld-ifunc/ifunc-10-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-10-i386.d
@@ -2,6 +2,6 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 There are no relocations in this file.
diff --git a/ld/testsuite/ld-ifunc/ifunc-10-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-10-x86-64.d
index bd83721db0e..8ece379efbc 100644
--- a/ld/testsuite/ld-ifunc/ifunc-10-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-10-x86-64.d
@@ -2,6 +2,5 @@
 #as: --64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 There are no relocations in this file.
diff --git a/ld/testsuite/ld-ifunc/ifunc-11-i386.d b/ld/testsuite/ld-ifunc/ifunc-11-i386.d
index baff0fc7f6f..6ff3f75ec25 100644
--- a/ld/testsuite/ld-ifunc/ifunc-11-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-11-i386.d
@@ -2,6 +2,6 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 There are no relocations in this file.
diff --git a/ld/testsuite/ld-ifunc/ifunc-11-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-11-x86-64.d
index bd83721db0e..8ece379efbc 100644
--- a/ld/testsuite/ld-ifunc/ifunc-11-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-11-x86-64.d
@@ -2,6 +2,5 @@
 #as: --64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 There are no relocations in this file.
diff --git a/ld/testsuite/ld-ifunc/ifunc-12-i386.d b/ld/testsuite/ld-ifunc/ifunc-12-i386.d
index 217b5ca9170..68f99d76862 100644
--- a/ld/testsuite/ld-ifunc/ifunc-12-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-12-i386.d
@@ -2,6 +2,6 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 There are no relocations in this file.
diff --git a/ld/testsuite/ld-ifunc/ifunc-12-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-12-x86-64.d
index dbbc9dfd18b..40f07c38bb7 100644
--- a/ld/testsuite/ld-ifunc/ifunc-12-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-12-x86-64.d
@@ -2,6 +2,5 @@
 #as: --64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 There are no relocations in this file.
diff --git a/ld/testsuite/ld-ifunc/ifunc-13-i386.d b/ld/testsuite/ld-ifunc/ifunc-13-i386.d
index 1af22fd35d6..c7ebede720f 100644
--- a/ld/testsuite/ld-ifunc/ifunc-13-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-13-i386.d
@@ -4,7 +4,7 @@
 #as: --32 -mrelax-relocations=yes
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.ifunc' at offset 0x[0-9a-f]+ contains 1 entry:
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-13-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-13-x86-64.d
index 5987bfe4532..115194d319b 100644
--- a/ld/testsuite/ld-ifunc/ifunc-13-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-13-x86-64.d
@@ -4,7 +4,6 @@
 #as: --64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.ifunc' at offset 0x[0-9a-f]+ contains 1 entry:
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-14a-i386.d b/ld/testsuite/ld-ifunc/ifunc-14a-i386.d
index 4a1c967ec01..2f248239c10 100644
--- a/ld/testsuite/ld-ifunc/ifunc-14a-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-14a-i386.d
@@ -4,7 +4,7 @@
 #as: --32
 #readelf: -d --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-ifunc/ifunc-14a-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-14a-x86-64.d
index 9f04458e330..2c4ebbb03b9 100644
--- a/ld/testsuite/ld-ifunc/ifunc-14a-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-14a-x86-64.d
@@ -4,7 +4,6 @@
 #as: --64
 #readelf: -d
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-ifunc/ifunc-14b-i386.d b/ld/testsuite/ld-ifunc/ifunc-14b-i386.d
index eeb6ce20ee8..fb2232da104 100644
--- a/ld/testsuite/ld-ifunc/ifunc-14b-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-14b-i386.d
@@ -4,7 +4,7 @@
 #as: --32
 #readelf: -d --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-ifunc/ifunc-14b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-14b-x86-64.d
index dc7aa2702ab..cc1f5ae6b2a 100644
--- a/ld/testsuite/ld-ifunc/ifunc-14b-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-14b-x86-64.d
@@ -4,7 +4,6 @@
 #as: --64
 #readelf: -d
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-ifunc/ifunc-14c-i386.d b/ld/testsuite/ld-ifunc/ifunc-14c-i386.d
index f8e50642a5a..45b01fdec45 100644
--- a/ld/testsuite/ld-ifunc/ifunc-14c-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-14c-i386.d
@@ -4,7 +4,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-ifunc/ifunc-14c-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-14c-x86-64.d
index 4f0c4b1e62a..76bfa84a2f0 100644
--- a/ld/testsuite/ld-ifunc/ifunc-14c-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-14c-x86-64.d
@@ -4,7 +4,6 @@
 #as: --64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-ifunc/ifunc-14d-i386.d b/ld/testsuite/ld-ifunc/ifunc-14d-i386.d
index 95099144067..a6c97b59935 100644
--- a/ld/testsuite/ld-ifunc/ifunc-14d-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-14d-i386.d
@@ -4,7 +4,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-ifunc/ifunc-14d-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-14d-x86-64.d
index 011da6cee76..789584bc309 100644
--- a/ld/testsuite/ld-ifunc/ifunc-14d-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-14d-x86-64.d
@@ -4,7 +4,6 @@
 #as: --64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-ifunc/ifunc-14e-i386.d b/ld/testsuite/ld-ifunc/ifunc-14e-i386.d
index 45f29b82512..d568cc440f7 100644
--- a/ld/testsuite/ld-ifunc/ifunc-14e-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-14e-i386.d
@@ -5,7 +5,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-ifunc/ifunc-14e-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-14e-x86-64.d
index 5a3eec84531..0955c92f138 100644
--- a/ld/testsuite/ld-ifunc/ifunc-14e-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-14e-x86-64.d
@@ -5,7 +5,6 @@
 #as: --64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-ifunc/ifunc-14f-i386.d b/ld/testsuite/ld-ifunc/ifunc-14f-i386.d
index 50a209bf562..76e2fac4225 100644
--- a/ld/testsuite/ld-ifunc/ifunc-14f-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-14f-i386.d
@@ -5,7 +5,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-ifunc/ifunc-14f-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-14f-x86-64.d
index b1b053f056d..12fb2257a84 100644
--- a/ld/testsuite/ld-ifunc/ifunc-14f-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-14f-x86-64.d
@@ -5,7 +5,6 @@
 #as: --64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-ifunc/ifunc-15-i386.d b/ld/testsuite/ld-ifunc/ifunc-15-i386.d
index c0194b225af..c41beb18b9f 100644
--- a/ld/testsuite/ld-ifunc/ifunc-15-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-15-i386.d
@@ -3,7 +3,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.got' at offset 0x[0-9a-f]+ contains 1 entry:
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-15-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-15-x86-64.d
index 438f176da17..e039cef718c 100644
--- a/ld/testsuite/ld-ifunc/ifunc-15-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-15-x86-64.d
@@ -3,7 +3,6 @@
 #as: --64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.got' at offset 0x[0-9a-f]+ contains 1 entry:
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-16-i386-now.d b/ld/testsuite/ld-ifunc/ifunc-16-i386-now.d
index 42386028c7f..4f4327add78 100644
--- a/ld/testsuite/ld-ifunc/ifunc-16-i386-now.d
+++ b/ld/testsuite/ld-ifunc/ifunc-16-i386-now.d
@@ -3,7 +3,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-16-i386.d b/ld/testsuite/ld-ifunc/ifunc-16-i386.d
index 3fca3fc5c2d..7f30e03dc66 100644
--- a/ld/testsuite/ld-ifunc/ifunc-16-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-16-i386.d
@@ -3,7 +3,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-16-x86-64-now.d b/ld/testsuite/ld-ifunc/ifunc-16-x86-64-now.d
index 00f24274bcb..db6c0e285a1 100644
--- a/ld/testsuite/ld-ifunc/ifunc-16-x86-64-now.d
+++ b/ld/testsuite/ld-ifunc/ifunc-16-x86-64-now.d
@@ -3,7 +3,6 @@
 #ld: -z now -shared -melf_x86_64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-16-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-16-x86-64.d
index dfa36177fca..d69626d3021 100644
--- a/ld/testsuite/ld-ifunc/ifunc-16-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-16-x86-64.d
@@ -3,7 +3,6 @@
 #ld: -shared -melf_x86_64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-17a-i386.d b/ld/testsuite/ld-ifunc/ifunc-17a-i386.d
index 7d79ca7bb5a..6297cfa1f75 100644
--- a/ld/testsuite/ld-ifunc/ifunc-17a-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-17a-i386.d
@@ -4,7 +4,7 @@
 #as: --32
 #readelf: -s --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 #...
  +[0-9]+: +[0-9a-f]+ +4 +OBJECT +GLOBAL +DEFAULT +[1-9] foo
diff --git a/ld/testsuite/ld-ifunc/ifunc-17a-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-17a-x86-64.d
index 4bc877bf829..965ef6343dc 100644
--- a/ld/testsuite/ld-ifunc/ifunc-17a-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-17a-x86-64.d
@@ -4,7 +4,6 @@
 #as: --64
 #readelf: -s --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 #...
  +[0-9]+: +[0-9a-f]+ +4 +OBJECT +GLOBAL +DEFAULT +[1-9] foo
diff --git a/ld/testsuite/ld-ifunc/ifunc-17b-i386.d b/ld/testsuite/ld-ifunc/ifunc-17b-i386.d
index e8ab4208036..e431012180a 100644
--- a/ld/testsuite/ld-ifunc/ifunc-17b-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-17b-i386.d
@@ -4,7 +4,7 @@
 #as: --32
 #readelf: -s --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 #...
  +[0-9]+: +[0-9a-f]+ +4 +OBJECT +GLOBAL +DEFAULT +[1-9] foo
diff --git a/ld/testsuite/ld-ifunc/ifunc-17b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-17b-x86-64.d
index fc449dfcfa6..7527eae9be7 100644
--- a/ld/testsuite/ld-ifunc/ifunc-17b-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-17b-x86-64.d
@@ -4,7 +4,6 @@
 #as: --64
 #readelf: -s --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 #...
  +[0-9]+: +[0-9a-f]+ +4 +OBJECT +GLOBAL +DEFAULT +[1-9] foo
diff --git a/ld/testsuite/ld-ifunc/ifunc-18a-i386.d b/ld/testsuite/ld-ifunc/ifunc-18a-i386.d
index d0fa3dad1e8..5ae71122b56 100644
--- a/ld/testsuite/ld-ifunc/ifunc-18a-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-18a-i386.d
@@ -4,7 +4,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.ifunc' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-18a-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-18a-x86-64.d
index 2b262dd578e..e9d603176c7 100644
--- a/ld/testsuite/ld-ifunc/ifunc-18a-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-18a-x86-64.d
@@ -4,7 +4,6 @@
 #ld: -shared -melf_x86_64 -z nocombreloc
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.ifunc' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-18b-i386.d b/ld/testsuite/ld-ifunc/ifunc-18b-i386.d
index 448323e59dc..699af7c08d9 100644
--- a/ld/testsuite/ld-ifunc/ifunc-18b-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-18b-i386.d
@@ -4,7 +4,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.ifunc' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-18b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-18b-x86-64.d
index 0c95b28acb8..b4ff6c3c41c 100644
--- a/ld/testsuite/ld-ifunc/ifunc-18b-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-18b-x86-64.d
@@ -4,7 +4,6 @@
 #ld: -shared -melf_x86_64 -z nocombreloc
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.ifunc' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-19a-i386.d b/ld/testsuite/ld-ifunc/ifunc-19a-i386.d
index 6b11169188b..f44a048afb6 100644
--- a/ld/testsuite/ld-ifunc/ifunc-19a-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-19a-i386.d
@@ -4,7 +4,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.ifunc' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-19a-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-19a-x86-64.d
index bd4c65e8720..fe576d2d333 100644
--- a/ld/testsuite/ld-ifunc/ifunc-19a-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-19a-x86-64.d
@@ -4,7 +4,6 @@
 #ld: -shared -melf_x86_64 -z nocombreloc
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.ifunc' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-19b-i386.d b/ld/testsuite/ld-ifunc/ifunc-19b-i386.d
index ae6831671a9..da6b3b9d49d 100644
--- a/ld/testsuite/ld-ifunc/ifunc-19b-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-19b-i386.d
@@ -4,7 +4,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.ifunc' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-19b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-19b-x86-64.d
index 5f7a1c7f8d4..35fa3285fd5 100644
--- a/ld/testsuite/ld-ifunc/ifunc-19b-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-19b-x86-64.d
@@ -4,7 +4,6 @@
 #ld: -shared -melf_x86_64 -z nocombreloc
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.ifunc' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d b/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d
index 2b6864a66d1..622def06277 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d
@@ -3,7 +3,7 @@
 #as: --32
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-2-i386.d b/ld/testsuite/ld-ifunc/ifunc-2-i386.d
index bc00d526c00..04131dd4c5b 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-i386.d
@@ -2,7 +2,7 @@
 #as: --32
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 #...
 [ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-f]+<\*ABS\*@plt>
diff --git a/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d b/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d
index c25f27a81df..87ae6823a5e 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d
@@ -3,7 +3,7 @@
 #as: --32
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-2-local-i386.d b/ld/testsuite/ld-ifunc/ifunc-2-local-i386.d
index bc00d526c00..04131dd4c5b 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-local-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-local-i386.d
@@ -2,7 +2,7 @@
 #as: --32
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 #...
 [ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-f]+<\*ABS\*@plt>
diff --git a/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d
index 2ba25e53da6..75aa37f30cf 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d
@@ -3,7 +3,6 @@
 #ld: -z now -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
index 75cd566166d..14a57280327 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
@@ -2,7 +2,6 @@
 #ld: -shared -melf_x86_64 --hash-style=sysv -z noseparate-code
 #objdump: -dw
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 #...
 [ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*\+0x190@plt>
diff --git a/ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d b/ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d
index 694ec344256..591825d541a 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d
@@ -3,7 +3,6 @@
 #ld: -z now -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d
index 6f6717d4a8c..2a1f2698a2a 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-x86-64.d
@@ -2,7 +2,6 @@
 #ld: -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 #...
 [ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*\+0x190@plt>
diff --git a/ld/testsuite/ld-ifunc/ifunc-20-i386.d b/ld/testsuite/ld-ifunc/ifunc-20-i386.d
index b7edd370a3a..229833d0c8a 100644
--- a/ld/testsuite/ld-ifunc/ifunc-20-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-20-i386.d
@@ -3,7 +3,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.ifunc' at offset 0x[0-9a-f]+ contains 1 entry:
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-20-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-20-x86-64.d
index 57c0568a6a3..0ea46a6a2d2 100644
--- a/ld/testsuite/ld-ifunc/ifunc-20-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-20-x86-64.d
@@ -3,7 +3,6 @@
 #as: --64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.ifunc' at offset 0x[0-9a-f]+ contains 1 entry:
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-21-i386.d b/ld/testsuite/ld-ifunc/ifunc-21-i386.d
index 24f287fae92..d4ff9348f54 100644
--- a/ld/testsuite/ld-ifunc/ifunc-21-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-21-i386.d
@@ -2,7 +2,7 @@
 #as: --32 -mrelax-relocations=yes
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d
index ac7674b0c54..dbddc55dc3f 100644
--- a/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d
@@ -2,7 +2,6 @@
 #ld: -melf_x86_64 -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-22-i386.d b/ld/testsuite/ld-ifunc/ifunc-22-i386.d
index 24f287fae92..d4ff9348f54 100644
--- a/ld/testsuite/ld-ifunc/ifunc-22-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-22-i386.d
@@ -2,7 +2,7 @@
 #as: --32 -mrelax-relocations=yes
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d
index ac7674b0c54..dbddc55dc3f 100644
--- a/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d
@@ -2,7 +2,6 @@
 #ld: -melf_x86_64 -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-5a-i386.d b/ld/testsuite/ld-ifunc/ifunc-5a-i386.d
index b64e5b818c1..e391ee554c9 100644
--- a/ld/testsuite/ld-ifunc/ifunc-5a-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-5a-i386.d
@@ -3,7 +3,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d b/ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d
index d4ad13a4bab..cc54588f3a5 100644
--- a/ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d
@@ -3,7 +3,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-5a-local-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-5a-local-x86-64.d
index 1926145f1af..73a822dbf49 100644
--- a/ld/testsuite/ld-ifunc/ifunc-5a-local-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-5a-local-x86-64.d
@@ -3,7 +3,6 @@
 #ld: -melf_x86_64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-5a-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-5a-x86-64.d
index 5a19c9ab2e5..46f41863bc8 100644
--- a/ld/testsuite/ld-ifunc/ifunc-5a-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-5a-x86-64.d
@@ -3,7 +3,6 @@
 #ld: -melf_x86_64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-5b-i386.d b/ld/testsuite/ld-ifunc/ifunc-5b-i386.d
index 2c971ba09c3..cc11eb8e5e1 100644
--- a/ld/testsuite/ld-ifunc/ifunc-5b-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-5b-i386.d
@@ -3,7 +3,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.got' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d b/ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d
index eb6d83be136..78655d7da87 100644
--- a/ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d
@@ -3,7 +3,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-5b-local-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-5b-local-x86-64.d
index ded6fc90571..3913dd60c9c 100644
--- a/ld/testsuite/ld-ifunc/ifunc-5b-local-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-5b-local-x86-64.d
@@ -3,7 +3,6 @@
 #ld: -melf_x86_64 -shared -z nocombreloc
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d
index af208b9bbd1..02aff6b7c85 100644
--- a/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d
@@ -3,7 +3,6 @@
 #ld: -melf_x86_64 -shared -z nocombreloc
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.got' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d b/ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d
index f66b796bea0..59c9f232f84 100644
--- a/ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d
@@ -3,7 +3,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.text' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-5r-local-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-5r-local-x86-64.d
index 710778c74ed..2ce53a9efa6 100644
--- a/ld/testsuite/ld-ifunc/ifunc-5r-local-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-5r-local-x86-64.d
@@ -3,7 +3,6 @@
 #ld: -r -melf_x86_64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.text' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-6a-i386.d b/ld/testsuite/ld-ifunc/ifunc-6a-i386.d
index 8d0c14ba3a8..3c8db808748 100644
--- a/ld/testsuite/ld-ifunc/ifunc-6a-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-6a-i386.d
@@ -3,7 +3,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-6a-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-6a-x86-64.d
index 1333fbecb11..cc3ff94d5ee 100644
--- a/ld/testsuite/ld-ifunc/ifunc-6a-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-6a-x86-64.d
@@ -3,7 +3,6 @@
 #ld: -melf_x86_64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-6b-i386.d b/ld/testsuite/ld-ifunc/ifunc-6b-i386.d
index 36aa8328c5c..a67c7fdb98d 100644
--- a/ld/testsuite/ld-ifunc/ifunc-6b-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-6b-i386.d
@@ -3,7 +3,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.got' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-6b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-6b-x86-64.d
index 34fdb4249d7..16ccfd7cfd1 100644
--- a/ld/testsuite/ld-ifunc/ifunc-6b-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-6b-x86-64.d
@@ -3,7 +3,6 @@
 #ld: -melf_x86_64 -shared -z nocombreloc
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.got' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-7a-i386.d b/ld/testsuite/ld-ifunc/ifunc-7a-i386.d
index d9bbb60abde..03723fc6047 100644
--- a/ld/testsuite/ld-ifunc/ifunc-7a-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-7a-i386.d
@@ -3,7 +3,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-7a-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-7a-x86-64.d
index a2dca3d84fc..25444019693 100644
--- a/ld/testsuite/ld-ifunc/ifunc-7a-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-7a-x86-64.d
@@ -3,7 +3,6 @@
 #ld: -melf_x86_64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-7b-i386.d b/ld/testsuite/ld-ifunc/ifunc-7b-i386.d
index dee920f15de..cd1a730f43f 100644
--- a/ld/testsuite/ld-ifunc/ifunc-7b-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-7b-i386.d
@@ -3,7 +3,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-7b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-7b-x86-64.d
index b44150f43ca..846fe34e89f 100644
--- a/ld/testsuite/ld-ifunc/ifunc-7b-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-7b-x86-64.d
@@ -3,7 +3,6 @@
 #ld: -melf_x86_64 -shared
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-8-i386.d b/ld/testsuite/ld-ifunc/ifunc-8-i386.d
index 67472fa190a..ed907956ac4 100644
--- a/ld/testsuite/ld-ifunc/ifunc-8-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-8-i386.d
@@ -4,7 +4,7 @@
 #as: --32
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-8-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-8-x86-64.d
index a9c039a4547..ad6a5ddfacc 100644
--- a/ld/testsuite/ld-ifunc/ifunc-8-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-8-x86-64.d
@@ -4,7 +4,6 @@
 #ld: -melf_x86_64
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-9-i386.d b/ld/testsuite/ld-ifunc/ifunc-9-i386.d
index 79007c2b4d7..f4bf7ac0df6 100644
--- a/ld/testsuite/ld-ifunc/ifunc-9-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-9-i386.d
@@ -3,7 +3,7 @@
 #ld: -m elf_i386 --export-dynamic
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 Relocation section '.rel.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/ifunc-9-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-9-x86-64.d
index 37ff2ec4296..85c3a691502 100644
--- a/ld/testsuite/ld-ifunc/ifunc-9-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-9-x86-64.d
@@ -3,7 +3,6 @@
 #ld: -melf_x86_64 --export-dynamic
 #readelf: -r --wide
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 Relocation section '.rela.plt' at .*
 [ ]+Offset[ ]+Info[ ]+Type[ ]+.*
diff --git a/ld/testsuite/ld-ifunc/pr17154-i386-now.d b/ld/testsuite/ld-ifunc/pr17154-i386-now.d
index d977aab1440..c6667b7062b 100644
--- a/ld/testsuite/ld-ifunc/pr17154-i386-now.d
+++ b/ld/testsuite/ld-ifunc/pr17154-i386-now.d
@@ -3,7 +3,7 @@
 #as: --32
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-ifunc/pr17154-i386.d b/ld/testsuite/ld-ifunc/pr17154-i386.d
index 4ca5b776372..b2c8cf29467 100644
--- a/ld/testsuite/ld-ifunc/pr17154-i386.d
+++ b/ld/testsuite/ld-ifunc/pr17154-i386.d
@@ -3,7 +3,7 @@
 #as: --32
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
-#notarget: *-*-lynxos *-*-nacl* *-*-nto*
+#notarget: *-*-lynxos *-*-nto*
 
 #...
 0+180 <.*>:
diff --git a/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d b/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d
index cf94a0c2419..690514863cf 100644
--- a/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d
+++ b/ld/testsuite/ld-ifunc/pr17154-x86-64-now.d
@@ -3,7 +3,6 @@
 #ld: -z now -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-ifunc/pr17154-x86-64.d b/ld/testsuite/ld-ifunc/pr17154-x86-64.d
index 6069b6aa8a9..bd8f7398017 100644
--- a/ld/testsuite/ld-ifunc/pr17154-x86-64.d
+++ b/ld/testsuite/ld-ifunc/pr17154-x86-64.d
@@ -3,7 +3,6 @@
 #ld: -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
 #target: x86_64-*-*
-#notarget: x86_64-*-nacl*
 
 #...
 0+240 <.*>:
diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
index 5a6ba7ad837..2d6ca6888b4 100644
--- a/ld/testsuite/ld-plugin/lto.exp
+++ b/ld/testsuite/ld-plugin/lto.exp
@@ -597,8 +597,6 @@ if { [at_least_gcc_version 4 7] } {
     if { ([istarget "i?86-*-elf*"]
 	   || [istarget "i?86-*-linux*"]
 	   || [istarget "i?86-*-gnu*"]
-	   || [istarget "i?86-*-nacl*"]
-	   || [istarget "x86_64-*-nacl*"]
 	   || [istarget "x86_64-*-linux*"]
 	   || [istarget "amd64-*-linux*"]) } {
 	set testname "PR ld/12365"
diff --git a/ld/testsuite/ld-x86-64/align-branch-1.d b/ld/testsuite/ld-x86-64/align-branch-1.d
index 19a6a4d4a46..c980b90af64 100644
--- a/ld/testsuite/ld-x86-64/align-branch-1.d
+++ b/ld/testsuite/ld-x86-64/align-branch-1.d
@@ -1,7 +1,6 @@
 #as: --64 -mbranches-within-32B-boundaries
 #ld: -melf_x86_64
 #objdump: -dw
-#notarget: i?86-*-nacl* x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/dwarfreloc.exp b/ld/testsuite/ld-x86-64/dwarfreloc.exp
index af327153c54..54583aa59fc 100644
--- a/ld/testsuite/ld-x86-64/dwarfreloc.exp
+++ b/ld/testsuite/ld-x86-64/dwarfreloc.exp
@@ -34,9 +34,7 @@
 #     <5d>   DW_AT_type        : <0x0>
 
 # Only the testcase .s files are arch-dependent, the relocations are cross-arch.
-if { !([istarget "x86_64-*-elf*"]
-       || [istarget "x86_64-*-nacl*"]
-       || [istarget "x86_64-*-linux*"]) } {
+if { !([istarget "x86_64-*-elf*"] || [istarget "x86_64-*-linux*"]) } {
     return
 }
 
diff --git a/ld/testsuite/ld-x86-64/ilp32-4-nacl.d b/ld/testsuite/ld-x86-64/ilp32-4-nacl.d
deleted file mode 100644
index 01cb85a8178..00000000000
--- a/ld/testsuite/ld-x86-64/ilp32-4-nacl.d
+++ /dev/null
@@ -1,30 +0,0 @@
-#source: ilp32-4.s
-#as: --x32
-#ld: -m elf32_x86_64_nacl -shared --no-ld-generated-unwind-info --hash-style=sysv
-#readelf: -d -S --wide
-#target: x86_64-*-nacl*
-
-There are 9 section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Addr +Off +Size +ES +Flg +Lk +Inf +Al
- +\[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
- +\[ 1\] \.text +PROGBITS +0+ 0+10000 +0+1 +00 +AX +0 +0 +1
- +\[ 2\] \.hash +HASH +100000b4 +0+b4 +0+14 +04 +A +3 +0 +4
- +\[ 3\] \.dynsym +DYNSYM +100000c8 +0+c8 +0+20 +10 +A +4 +1 +4
- +\[ 4\] \.dynstr +STRTAB +100000e8 +0+e8 +0+8 +00 +A +0 +0 +1
- +\[ 5\] \.dynamic +DYNAMIC +100100f0 +0+f0 +0+58 +08 +WA +4 +0 +4
- +\[ 6\] \.symtab +SYMTAB +0+0 +[0-9a-f]+ +[0-9a-f]+ +10 +7 +[0-9] +4
- +\[ 7\] \.strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +00 +0 +0 +1
- +\[ 8\] \.shstrtab +STRTAB +0+ +[0-9a-f]+ +0+40 +00 +0 +0 +1
-Key to Flags:
-#...
-
-Dynamic section at offset 0xf0 contains 6 entries:
-  Tag        Type                         Name/Value
- 0x00000004 \(HASH\)                       0x100000b4
- 0x00000005 \(STRTAB\)                     0x100000e8
- 0x00000006 \(SYMTAB\)                     0x100000c8
- 0x0000000a \(STRSZ\)                      8 \(bytes\)
- 0x0000000b \(SYMENT\)                     16 \(bytes\)
- 0x00000000 \(NULL\)                       0x0
diff --git a/ld/testsuite/ld-x86-64/line.exp b/ld/testsuite/ld-x86-64/line.exp
index 7eb6cf732ab..1a43d27cb1f 100644
--- a/ld/testsuite/ld-x86-64/line.exp
+++ b/ld/testsuite/ld-x86-64/line.exp
@@ -19,18 +19,11 @@
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
-if { !([istarget "x86_64-*-elf*"]
-       || [istarget "x86_64-*-nacl*"]
-       || [istarget "x86_64-*-linux*"]) } {
+if { !([istarget "x86_64-*-elf*"] || [istarget "x86_64-*-linux*"]) } {
     return
 }
 
-if [istarget "*-*-nacl*"] {
-    set emul "elf_x86_64_nacl"
-} else {
-    set emul "elf_x86_64"
-}
-
+set emul "elf_x86_64"
 set testline "undefined line"
 
 if ![ld_assemble $as "--64 $srcdir/$subdir/undefined.s" tmpdir/undefined.o] {
diff --git a/ld/testsuite/ld-x86-64/load1a-nacl.d b/ld/testsuite/ld-x86-64/load1a-nacl.d
deleted file mode 100644
index f038400a5ee..00000000000
--- a/ld/testsuite/ld-x86-64/load1a-nacl.d
+++ /dev/null
@@ -1,55 +0,0 @@
-#source: load1.s
-#as: --64
-#ld: -melf_x86_64
-#objdump: -dw --sym
-#target: x86_64-*-nacl*
-
-.*: +file format .*
-
-SYMBOL TABLE:
-#...
-0+100300b0 l     O .data	0+1 bar
-#...
-0+100300b1 g     O .data	0+1 foo
-#...
-
-Disassembly of section .text:
-
-0+20000 <_start>:
-[ 	]*[a-f0-9]+:	81 d0 b0 00 03 10    	adc    \$0x100300b0,%eax
-[ 	]*[a-f0-9]+:	81 c3 b0 00 03 10    	add    \$0x100300b0,%ebx
-[ 	]*[a-f0-9]+:	81 e1 b0 00 03 10    	and    \$0x100300b0,%ecx
-[ 	]*[a-f0-9]+:	81 fa b0 00 03 10    	cmp    \$0x100300b0,%edx
-[ 	]*[a-f0-9]+:	81 ce b0 00 03 10    	or     \$0x100300b0,%esi
-[ 	]*[a-f0-9]+:	81 df b0 00 03 10    	sbb    \$0x100300b0,%edi
-[ 	]*[a-f0-9]+:	81 ed b0 00 03 10    	sub    \$0x100300b0,%ebp
-[ 	]*[a-f0-9]+:	41 81 f0 b0 00 03 10 	xor    \$0x100300b0,%r8d
-[ 	]*[a-f0-9]+:	41 f7 c7 b0 00 03 10 	test   \$0x100300b0,%r15d
-[ 	]*[a-f0-9]+:	48 81 d0 b0 00 03 10 	adc    \$0x100300b0,%rax
-[ 	]*[a-f0-9]+:	48 81 c3 b0 00 03 10 	add    \$0x100300b0,%rbx
-[ 	]*[a-f0-9]+:	48 81 e1 b0 00 03 10 	and    \$0x100300b0,%rcx
-[ 	]*[a-f0-9]+:	48 81 fa b0 00 03 10 	cmp    \$0x100300b0,%rdx
-[ 	]*[a-f0-9]+:	48 81 cf b0 00 03 10 	or     \$0x100300b0,%rdi
-[ 	]*[a-f0-9]+:	48 81 de b0 00 03 10 	sbb    \$0x100300b0,%rsi
-[ 	]*[a-f0-9]+:	48 81 ed b0 00 03 10 	sub    \$0x100300b0,%rbp
-[ 	]*[a-f0-9]+:	49 81 f0 b0 00 03 10 	xor    \$0x100300b0,%r8
-[ 	]*[a-f0-9]+:	49 f7 c7 b0 00 03 10 	test   \$0x100300b0,%r15
-[ 	]*[a-f0-9]+:	81 d0 b1 00 03 10    	adc    \$0x100300b1,%eax
-[ 	]*[a-f0-9]+:	81 c3 b1 00 03 10    	add    \$0x100300b1,%ebx
-[ 	]*[a-f0-9]+:	81 e1 b1 00 03 10    	and    \$0x100300b1,%ecx
-[ 	]*[a-f0-9]+:	81 fa b1 00 03 10    	cmp    \$0x100300b1,%edx
-[ 	]*[a-f0-9]+:	81 ce b1 00 03 10    	or     \$0x100300b1,%esi
-[ 	]*[a-f0-9]+:	81 df b1 00 03 10    	sbb    \$0x100300b1,%edi
-[ 	]*[a-f0-9]+:	81 ed b1 00 03 10    	sub    \$0x100300b1,%ebp
-[ 	]*[a-f0-9]+:	41 81 f0 b1 00 03 10 	xor    \$0x100300b1,%r8d
-[ 	]*[a-f0-9]+:	41 f7 c7 b1 00 03 10 	test   \$0x100300b1,%r15d
-[ 	]*[a-f0-9]+:	48 81 d0 b1 00 03 10 	adc    \$0x100300b1,%rax
-[ 	]*[a-f0-9]+:	48 81 c3 b1 00 03 10 	add    \$0x100300b1,%rbx
-[ 	]*[a-f0-9]+:	48 81 e1 b1 00 03 10 	and    \$0x100300b1,%rcx
-[ 	]*[a-f0-9]+:	48 81 fa b1 00 03 10 	cmp    \$0x100300b1,%rdx
-[ 	]*[a-f0-9]+:	48 81 cf b1 00 03 10 	or     \$0x100300b1,%rdi
-[ 	]*[a-f0-9]+:	48 81 de b1 00 03 10 	sbb    \$0x100300b1,%rsi
-[ 	]*[a-f0-9]+:	48 81 ed b1 00 03 10 	sub    \$0x100300b1,%rbp
-[ 	]*[a-f0-9]+:	49 81 f0 b1 00 03 10 	xor    \$0x100300b1,%r8
-[ 	]*[a-f0-9]+:	49 f7 c7 b1 00 03 10 	test   \$0x100300b1,%r15
-#pass
diff --git a/ld/testsuite/ld-x86-64/load1a.d b/ld/testsuite/ld-x86-64/load1a.d
index 09dacb4f249..194d3043f0d 100644
--- a/ld/testsuite/ld-x86-64/load1a.d
+++ b/ld/testsuite/ld-x86-64/load1a.d
@@ -2,7 +2,6 @@
 #as: --64 -mrelax-relocations=yes
 #ld: -melf_x86_64 -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw --sym
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/load1b-nacl.d b/ld/testsuite/ld-x86-64/load1b-nacl.d
deleted file mode 100644
index f4ab3bea071..00000000000
--- a/ld/testsuite/ld-x86-64/load1b-nacl.d
+++ /dev/null
@@ -1,55 +0,0 @@
-#source: load1.s
-#as: --x32
-#ld: -melf32_x86_64
-#objdump: -dw --sym
-#target: x86_64-*-nacl*
-
-.*: +file format .*
-
-SYMBOL TABLE:
-#...
-10030074 l     O .data	0+1 bar
-#...
-10030075 g     O .data	0+1 foo
-#...
-
-Disassembly of section .text:
-
-0+20000 <_start>:
- +[a-f0-9]+:	81 d0 74 00 03 10    	adc    \$0x10030074,%eax
- +[a-f0-9]+:	81 c3 74 00 03 10    	add    \$0x10030074,%ebx
- +[a-f0-9]+:	81 e1 74 00 03 10    	and    \$0x10030074,%ecx
- +[a-f0-9]+:	81 fa 74 00 03 10    	cmp    \$0x10030074,%edx
- +[a-f0-9]+:	81 ce 74 00 03 10    	or     \$0x10030074,%esi
- +[a-f0-9]+:	81 df 74 00 03 10    	sbb    \$0x10030074,%edi
- +[a-f0-9]+:	81 ed 74 00 03 10    	sub    \$0x10030074,%ebp
- +[a-f0-9]+:	41 81 f0 74 00 03 10 	xor    \$0x10030074,%r8d
- +[a-f0-9]+:	41 f7 c7 74 00 03 10 	test   \$0x10030074,%r15d
- +[a-f0-9]+:	48 81 d0 74 00 03 10 	adc    \$0x10030074,%rax
- +[a-f0-9]+:	48 81 c3 74 00 03 10 	add    \$0x10030074,%rbx
- +[a-f0-9]+:	48 81 e1 74 00 03 10 	and    \$0x10030074,%rcx
- +[a-f0-9]+:	48 81 fa 74 00 03 10 	cmp    \$0x10030074,%rdx
- +[a-f0-9]+:	48 81 cf 74 00 03 10 	or     \$0x10030074,%rdi
- +[a-f0-9]+:	48 81 de 74 00 03 10 	sbb    \$0x10030074,%rsi
- +[a-f0-9]+:	48 81 ed 74 00 03 10 	sub    \$0x10030074,%rbp
- +[a-f0-9]+:	49 81 f0 74 00 03 10 	xor    \$0x10030074,%r8
- +[a-f0-9]+:	49 f7 c7 74 00 03 10 	test   \$0x10030074,%r15
- +[a-f0-9]+:	81 d0 75 00 03 10    	adc    \$0x10030075,%eax
- +[a-f0-9]+:	81 c3 75 00 03 10    	add    \$0x10030075,%ebx
- +[a-f0-9]+:	81 e1 75 00 03 10    	and    \$0x10030075,%ecx
- +[a-f0-9]+:	81 fa 75 00 03 10    	cmp    \$0x10030075,%edx
- +[a-f0-9]+:	81 ce 75 00 03 10    	or     \$0x10030075,%esi
- +[a-f0-9]+:	81 df 75 00 03 10    	sbb    \$0x10030075,%edi
- +[a-f0-9]+:	81 ed 75 00 03 10    	sub    \$0x10030075,%ebp
- +[a-f0-9]+:	41 81 f0 75 00 03 10 	xor    \$0x10030075,%r8d
- +[a-f0-9]+:	41 f7 c7 75 00 03 10 	test   \$0x10030075,%r15d
- +[a-f0-9]+:	48 81 d0 75 00 03 10 	adc    \$0x10030075,%rax
- +[a-f0-9]+:	48 81 c3 75 00 03 10 	add    \$0x10030075,%rbx
- +[a-f0-9]+:	48 81 e1 75 00 03 10 	and    \$0x10030075,%rcx
- +[a-f0-9]+:	48 81 fa 75 00 03 10 	cmp    \$0x10030075,%rdx
- +[a-f0-9]+:	48 81 cf 75 00 03 10 	or     \$0x10030075,%rdi
- +[a-f0-9]+:	48 81 de 75 00 03 10 	sbb    \$0x10030075,%rsi
- +[a-f0-9]+:	48 81 ed 75 00 03 10 	sub    \$0x10030075,%rbp
- +[a-f0-9]+:	49 81 f0 75 00 03 10 	xor    \$0x10030075,%r8
- +[a-f0-9]+:	49 f7 c7 75 00 03 10 	test   \$0x10030075,%r15
-#pass
diff --git a/ld/testsuite/ld-x86-64/load1b.d b/ld/testsuite/ld-x86-64/load1b.d
index 74cc05962bf..e38707c53ec 100644
--- a/ld/testsuite/ld-x86-64/load1b.d
+++ b/ld/testsuite/ld-x86-64/load1b.d
@@ -2,7 +2,6 @@
 #as: --x32 -mrelax-relocations=yes
 #ld: -melf32_x86_64 -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw --sym
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/load1c-nacl.d b/ld/testsuite/ld-x86-64/load1c-nacl.d
deleted file mode 100644
index f677b8d85e1..00000000000
--- a/ld/testsuite/ld-x86-64/load1c-nacl.d
+++ /dev/null
@@ -1,48 +0,0 @@
-#source: load1.s
-#as: --64
-#ld: -shared -melf_x86_64 --hash-style=sysv
-#objdump: -dw
-#target: x86_64-*-nacl*
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+ <_start>:
- +[a-f0-9]+:	13 05 9a 02 01 10    	adc    0x1001029a\(%rip\),%eax        # 100102a0 <.got>
- +[a-f0-9]+:	03 1d 94 02 01 10    	add    0x10010294\(%rip\),%ebx        # 100102a0 <.got>
- +[a-f0-9]+:	23 0d 8e 02 01 10    	and    0x1001028e\(%rip\),%ecx        # 100102a0 <.got>
- +[a-f0-9]+:	3b 15 88 02 01 10    	cmp    0x10010288\(%rip\),%edx        # 100102a0 <.got>
- +[a-f0-9]+:	0b 35 82 02 01 10    	or     0x10010282\(%rip\),%esi        # 100102a0 <.got>
- +[a-f0-9]+:	1b 3d 7c 02 01 10    	sbb    0x1001027c\(%rip\),%edi        # 100102a0 <.got>
- +[a-f0-9]+:	2b 2d 76 02 01 10    	sub    0x10010276\(%rip\),%ebp        # 100102a0 <.got>
- +[a-f0-9]+:	44 33 05 6f 02 01 10 	xor    0x1001026f\(%rip\),%r8d        # 100102a0 <.got>
- +[a-f0-9]+:	44 85 3d 68 02 01 10 	test   %r15d,0x10010268\(%rip\)        # 100102a0 <.got>
- +[a-f0-9]+:	48 13 05 61 02 01 10 	adc    0x10010261\(%rip\),%rax        # 100102a0 <.got>
- +[a-f0-9]+:	48 03 1d 5a 02 01 10 	add    0x1001025a\(%rip\),%rbx        # 100102a0 <.got>
- +[a-f0-9]+:	48 23 0d 53 02 01 10 	and    0x10010253\(%rip\),%rcx        # 100102a0 <.got>
- +[a-f0-9]+:	48 3b 15 4c 02 01 10 	cmp    0x1001024c\(%rip\),%rdx        # 100102a0 <.got>
- +[a-f0-9]+:	48 0b 3d 45 02 01 10 	or     0x10010245\(%rip\),%rdi        # 100102a0 <.got>
- +[a-f0-9]+:	48 1b 35 3e 02 01 10 	sbb    0x1001023e\(%rip\),%rsi        # 100102a0 <.got>
- +[a-f0-9]+:	48 2b 2d 37 02 01 10 	sub    0x10010237\(%rip\),%rbp        # 100102a0 <.got>
- +[a-f0-9]+:	4c 33 05 30 02 01 10 	xor    0x10010230\(%rip\),%r8        # 100102a0 <.got>
- +[a-f0-9]+:	4c 85 3d 29 02 01 10 	test   %r15,0x10010229\(%rip\)        # 100102a0 <.got>
- +[a-f0-9]+:	13 05 2b 02 01 10    	adc    0x1001022b\(%rip\),%eax        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	03 1d 25 02 01 10    	add    0x10010225\(%rip\),%ebx        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	23 0d 1f 02 01 10    	and    0x1001021f\(%rip\),%ecx        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	3b 15 19 02 01 10    	cmp    0x10010219\(%rip\),%edx        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	0b 35 13 02 01 10    	or     0x10010213\(%rip\),%esi        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	1b 3d 0d 02 01 10    	sbb    0x1001020d\(%rip\),%edi        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	2b 2d 07 02 01 10    	sub    0x10010207\(%rip\),%ebp        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	44 33 05 00 02 01 10 	xor    0x10010200\(%rip\),%r8d        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	44 85 3d f9 01 01 10 	test   %r15d,0x100101f9\(%rip\)        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	48 13 05 f2 01 01 10 	adc    0x100101f2\(%rip\),%rax        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	48 03 1d eb 01 01 10 	add    0x100101eb\(%rip\),%rbx        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	48 23 0d e4 01 01 10 	and    0x100101e4\(%rip\),%rcx        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	48 3b 15 dd 01 01 10 	cmp    0x100101dd\(%rip\),%rdx        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	48 0b 3d d6 01 01 10 	or     0x100101d6\(%rip\),%rdi        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	48 1b 35 cf 01 01 10 	sbb    0x100101cf\(%rip\),%rsi        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	48 2b 2d c8 01 01 10 	sub    0x100101c8\(%rip\),%rbp        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	4c 33 05 c1 01 01 10 	xor    0x100101c1\(%rip\),%r8        # 100102a8 <foo-0x21>
- +[a-f0-9]+:	4c 85 3d ba 01 01 10 	test   %r15,0x100101ba\(%rip\)        # 100102a8 <foo-0x21>
-#pass
diff --git a/ld/testsuite/ld-x86-64/load1c.d b/ld/testsuite/ld-x86-64/load1c.d
index 3b753529249..db9c69fadbf 100644
--- a/ld/testsuite/ld-x86-64/load1c.d
+++ b/ld/testsuite/ld-x86-64/load1c.d
@@ -2,7 +2,6 @@
 #as: --64
 #ld: -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/load1d-nacl.d b/ld/testsuite/ld-x86-64/load1d-nacl.d
deleted file mode 100644
index db1f7af6127..00000000000
--- a/ld/testsuite/ld-x86-64/load1d-nacl.d
+++ /dev/null
@@ -1,48 +0,0 @@
-#source: load1.s
-#as: --x32
-#ld: -shared -melf32_x86_64 --hash-style=sysv
-#objdump: -dw
-#target: x86_64-*-nacl*
-
-.*: +file format .*
-
-Disassembly of section .text:
-
-0+ <_start>:
- +[a-f0-9]+:	13 05 8a 01 01 10    	adc    0x1001018a\(%rip\),%eax        # 10010190 <.got>
- +[a-f0-9]+:	03 1d 84 01 01 10    	add    0x10010184\(%rip\),%ebx        # 10010190 <.got>
- +[a-f0-9]+:	23 0d 7e 01 01 10    	and    0x1001017e\(%rip\),%ecx        # 10010190 <.got>
- +[a-f0-9]+:	3b 15 78 01 01 10    	cmp    0x10010178\(%rip\),%edx        # 10010190 <.got>
- +[a-f0-9]+:	0b 35 72 01 01 10    	or     0x10010172\(%rip\),%esi        # 10010190 <.got>
- +[a-f0-9]+:	1b 3d 6c 01 01 10    	sbb    0x1001016c\(%rip\),%edi        # 10010190 <.got>
- +[a-f0-9]+:	2b 2d 66 01 01 10    	sub    0x10010166\(%rip\),%ebp        # 10010190 <.got>
- +[a-f0-9]+:	44 33 05 5f 01 01 10 	xor    0x1001015f\(%rip\),%r8d        # 10010190 <.got>
- +[a-f0-9]+:	44 85 3d 58 01 01 10 	test   %r15d,0x10010158\(%rip\)        # 10010190 <.got>
- +[a-f0-9]+:	48 13 05 51 01 01 10 	adc    0x10010151\(%rip\),%rax        # 10010190 <.got>
- +[a-f0-9]+:	48 03 1d 4a 01 01 10 	add    0x1001014a\(%rip\),%rbx        # 10010190 <.got>
- +[a-f0-9]+:	48 23 0d 43 01 01 10 	and    0x10010143\(%rip\),%rcx        # 10010190 <.got>
- +[a-f0-9]+:	48 3b 15 3c 01 01 10 	cmp    0x1001013c\(%rip\),%rdx        # 10010190 <.got>
- +[a-f0-9]+:	48 0b 3d 35 01 01 10 	or     0x10010135\(%rip\),%rdi        # 10010190 <.got>
- +[a-f0-9]+:	48 1b 35 2e 01 01 10 	sbb    0x1001012e\(%rip\),%rsi        # 10010190 <.got>
- +[a-f0-9]+:	48 2b 2d 27 01 01 10 	sub    0x10010127\(%rip\),%rbp        # 10010190 <.got>
- +[a-f0-9]+:	4c 33 05 20 01 01 10 	xor    0x10010120\(%rip\),%r8        # 10010190 <.got>
- +[a-f0-9]+:	4c 85 3d 19 01 01 10 	test   %r15,0x10010119\(%rip\)        # 10010190 <.got>
- +[a-f0-9]+:	13 05 1b 01 01 10    	adc    0x1001011b\(%rip\),%eax        # 10010198 <foo-0x21>
- +[a-f0-9]+:	03 1d 15 01 01 10    	add    0x10010115\(%rip\),%ebx        # 10010198 <foo-0x21>
- +[a-f0-9]+:	23 0d 0f 01 01 10    	and    0x1001010f\(%rip\),%ecx        # 10010198 <foo-0x21>
- +[a-f0-9]+:	3b 15 09 01 01 10    	cmp    0x10010109\(%rip\),%edx        # 10010198 <foo-0x21>
- +[a-f0-9]+:	0b 35 03 01 01 10    	or     0x10010103\(%rip\),%esi        # 10010198 <foo-0x21>
- +[a-f0-9]+:	1b 3d fd 00 01 10    	sbb    0x100100fd\(%rip\),%edi        # 10010198 <foo-0x21>
- +[a-f0-9]+:	2b 2d f7 00 01 10    	sub    0x100100f7\(%rip\),%ebp        # 10010198 <foo-0x21>
- +[a-f0-9]+:	44 33 05 f0 00 01 10 	xor    0x100100f0\(%rip\),%r8d        # 10010198 <foo-0x21>
- +[a-f0-9]+:	44 85 3d e9 00 01 10 	test   %r15d,0x100100e9\(%rip\)        # 10010198 <foo-0x21>
- +[a-f0-9]+:	48 13 05 e2 00 01 10 	adc    0x100100e2\(%rip\),%rax        # 10010198 <foo-0x21>
- +[a-f0-9]+:	48 03 1d db 00 01 10 	add    0x100100db\(%rip\),%rbx        # 10010198 <foo-0x21>
- +[a-f0-9]+:	48 23 0d d4 00 01 10 	and    0x100100d4\(%rip\),%rcx        # 10010198 <foo-0x21>
- +[a-f0-9]+:	48 3b 15 cd 00 01 10 	cmp    0x100100cd\(%rip\),%rdx        # 10010198 <foo-0x21>
- +[a-f0-9]+:	48 0b 3d c6 00 01 10 	or     0x100100c6\(%rip\),%rdi        # 10010198 <foo-0x21>
- +[a-f0-9]+:	48 1b 35 bf 00 01 10 	sbb    0x100100bf\(%rip\),%rsi        # 10010198 <foo-0x21>
- +[a-f0-9]+:	48 2b 2d b8 00 01 10 	sub    0x100100b8\(%rip\),%rbp        # 10010198 <foo-0x21>
- +[a-f0-9]+:	4c 33 05 b1 00 01 10 	xor    0x100100b1\(%rip\),%r8        # 10010198 <foo-0x21>
- +[a-f0-9]+:	4c 85 3d aa 00 01 10 	test   %r15,0x100100aa\(%rip\)        # 10010198 <foo-0x21>
-#pass
diff --git a/ld/testsuite/ld-x86-64/load1d.d b/ld/testsuite/ld-x86-64/load1d.d
index c7550e28d73..7ccae532f27 100644
--- a/ld/testsuite/ld-x86-64/load1d.d
+++ b/ld/testsuite/ld-x86-64/load1d.d
@@ -2,7 +2,6 @@
 #as: --x32
 #ld: -shared -melf32_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/pie3-nacl.d b/ld/testsuite/ld-x86-64/pie3-nacl.d
deleted file mode 100644
index efb74ed0fd4..00000000000
--- a/ld/testsuite/ld-x86-64/pie3-nacl.d
+++ /dev/null
@@ -1,14 +0,0 @@
-#source: pie3.s
-#as: --64
-#ld: -pie -melf_x86_64 --hash-style=sysv
-#objdump: -dw
-#target: x86_64-*-nacl*
-
-.*: +file format .*
-
-
-Disassembly of section .text:
-
-0+ <_start>:
- +0:	48 8d 05 f9 ff ff ff 	lea    -0x7\(%rip\),%rax        # 0 <_start>
-#pass
diff --git a/ld/testsuite/ld-x86-64/pie3.d b/ld/testsuite/ld-x86-64/pie3.d
index 6457fbd32fa..b943837bf64 100644
--- a/ld/testsuite/ld-x86-64/pie3.d
+++ b/ld/testsuite/ld-x86-64/pie3.d
@@ -1,7 +1,6 @@
 #as: --64
 #ld: -pie -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/plt-nacl.pd b/ld/testsuite/ld-x86-64/plt-nacl.pd
deleted file mode 100644
index 9f572fdd198..00000000000
--- a/ld/testsuite/ld-x86-64/plt-nacl.pd
+++ /dev/null
@@ -1,55 +0,0 @@
-#source: plt.s
-#as: --64
-#ld: -melf_x86_64_nacl
-#objdump: -drj.plt
-#target: x86_64-*-nacl*
-
-.*: +file format .*
-
-Disassembly of section .plt:
-
-[0-9a-f]+ <.plt>:
- +[0-9a-f]+:	ff 35 ([0-9a-f]{2} ){4} *	pushq  0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x8>
- +[0-9a-f]+:	4c 8b 1d ([0-9a-f]{2} ){4} *	mov    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x10>
- +[0-9a-f]+:	41 83 e3 e0          	and    \$0xffffffe0,%r11d
- +[0-9a-f]+:	4d 01 fb             	add    %r15,%r11
- +[0-9a-f]+:	41 ff e3             	jmpq   \*%r11
- +[0-9a-f]+:	66 0f 1f 84 00 00 00 	nopw   0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	00 00 *
- +[0-9a-f]+:	66 66 66 66 66 66 2e 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	0f 1f 84 00 00 00 00 *
- +[0-9a-f]+:	00 *
- +[0-9a-f]+:	66 66 66 66 66 66 2e 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	0f 1f 84 00 00 00 00 *
- +[0-9a-f]+:	00 *
- +[0-9a-f]+:	66 90                	xchg   %ax,%ax
-
-[0-9a-f]+ <fn1@plt>:
- +[0-9a-f]+:	4c 8b 1d ([0-9a-f]{2} ){4} *	mov    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <fn1>
- +[0-9a-f]+:	41 83 e3 e0          	and    \$0xffffffe0,%r11d
- +[0-9a-f]+:	4d 01 fb             	add    %r15,%r11
- +[0-9a-f]+:	41 ff e3             	jmpq   \*%r11
- +[0-9a-f]+:	66 66 66 66 66 66 2e 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	0f 1f 84 00 00 00 00 *
- +[0-9a-f]+:	00 *
- +[0-9a-f]+:	68 00 00 00 00       	pushq  \$0x0
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmpq   [0-9a-f]+ <.plt>
- +[0-9a-f]+:	66 66 66 66 66 66 2e 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	0f 1f 84 00 00 00 00 *
- +[0-9a-f]+:	00 *
- +[0-9a-f]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%rax\)
-
-[0-9a-f]+ <fn2@plt>:
- +[0-9a-f]+:	4c 8b 1d ([0-9a-f]{2} ){4} *	mov    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <fn2>
- +[0-9a-f]+:	41 83 e3 e0          	and    \$0xffffffe0,%r11d
- +[0-9a-f]+:	4d 01 fb             	add    %r15,%r11
- +[0-9a-f]+:	41 ff e3             	jmpq   \*%r11
- +[0-9a-f]+:	66 66 66 66 66 66 2e 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	0f 1f 84 00 00 00 00 *
- +[0-9a-f]+:	00 *
- +[0-9a-f]+:	68 01 00 00 00       	pushq  \$0x1
- +[0-9a-f]+:	e9 ([0-9a-f]{2} ){4} *	jmpq   [0-9a-f]+ <.plt>
- +[0-9a-f]+:	66 66 66 66 66 66 2e 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	0f 1f 84 00 00 00 00 *
- +[0-9a-f]+:	00 *
- +[0-9a-f]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%rax\)
diff --git a/ld/testsuite/ld-x86-64/pr17709-nacl.rd b/ld/testsuite/ld-x86-64/pr17709-nacl.rd
deleted file mode 100644
index beffd3cb34c..00000000000
--- a/ld/testsuite/ld-x86-64/pr17709-nacl.rd
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Relocation section '.rela\..*' at offset .* contains 1 entry:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f ]+R_X86_64_COPY+[0-9a-f ]+ +foo \+ 0
diff --git a/ld/testsuite/ld-x86-64/pr18160.d b/ld/testsuite/ld-x86-64/pr18160.d
index ebbda3a6731..b944bbe376a 100644
--- a/ld/testsuite/ld-x86-64/pr18160.d
+++ b/ld/testsuite/ld-x86-64/pr18160.d
@@ -1,7 +1,6 @@
 #as: --64
 #ld: --gc-sections -melf_x86_64 -T pr18160.t
 #objdump: -dw
-#notarget: x86_64-*-nacl*
 
 .*: +file format elf32-i386
 
diff --git a/ld/testsuite/ld-x86-64/pr19013-nacl.d b/ld/testsuite/ld-x86-64/pr19013-nacl.d
deleted file mode 100644
index 990a5088a5d..00000000000
--- a/ld/testsuite/ld-x86-64/pr19013-nacl.d
+++ /dev/null
@@ -1,9 +0,0 @@
-#source: pr19013.s
-#as: --x32
-#ld: --oformat elf32-i386-nacl
-#objdump: -s -j .rodata
-#target: x86_64-*-nacl*
-
-#...
- [0-9a-f]+ 02030041 42434400 +...ABCD. +
-#pass
diff --git a/ld/testsuite/ld-x86-64/pr19013-x32.d b/ld/testsuite/ld-x86-64/pr19013-x32.d
index 97fb8419960..5634b87f7c8 100644
--- a/ld/testsuite/ld-x86-64/pr19013-x32.d
+++ b/ld/testsuite/ld-x86-64/pr19013-x32.d
@@ -2,7 +2,6 @@
 #as: --x32
 #ld: --oformat elf32-i386 -m elf32_x86_64
 #objdump: -s -j .rodata
-#notarget: x86_64-*-nacl*
 
 #...
  [0-9a-f]+ 02030041 42434400 +...ABCD. +
diff --git a/ld/testsuite/ld-x86-64/pr19013.d b/ld/testsuite/ld-x86-64/pr19013.d
index 554e6e8710a..97137a793e1 100644
--- a/ld/testsuite/ld-x86-64/pr19013.d
+++ b/ld/testsuite/ld-x86-64/pr19013.d
@@ -1,7 +1,6 @@
 #as: --64
 #ld: --oformat elf32-i386 -m elf_x86_64
 #objdump: -s -j .rodata
-#notarget: x86_64-*-nacl*
 
 #...
  [0-9a-f]+ 00000203 00414243 4400 +.....ABCD. +
diff --git a/ld/testsuite/ld-x86-64/pr19636-2d-nacl.d b/ld/testsuite/ld-x86-64/pr19636-2d-nacl.d
deleted file mode 100644
index f584bda5448..00000000000
--- a/ld/testsuite/ld-x86-64/pr19636-2d-nacl.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#source: pr19636-2.s
-#as: --64 -mrelax-relocations=no
-#ld: -pie -m elf_x86_64 --no-dynamic-linker --hash-style=sysv
-#objdump: -dw
-#target: x86_64-*-nacl*
-
-.*: +file format .*
-
-
-Disassembly of section .plt:
-
-0+ <.plt>:
-[ 	]*[a-f0-9]+:	ff 35 42 02 01 10    	pushq  0x10010242\(%rip\)        # 10010248 <_GLOBAL_OFFSET_TABLE_\+0x8>
-[ 	]*[a-f0-9]+:	4c 8b 1d 43 02 01 10 	mov    0x10010243\(%rip\),%r11        # 10010250 <_GLOBAL_OFFSET_TABLE_\+0x10>
-[ 	]*[a-f0-9]+:	41 83 e3 e0          	and    \$0xffffffe0,%r11d
-[ 	]*[a-f0-9]+:	4d 01 fb             	add    %r15,%r11
-[ 	]*[a-f0-9]+:	41 ff e3             	jmpq   \*%r11
-[ 	]*[a-f0-9]+:	66 0f 1f 84 00 00 00 00 00 	nopw   0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	66 90                	xchg   %ax,%ax
-[ 	]*[a-f0-9]+:	4c 8b 1d 11 02 01 10 	mov    0x10010211\(%rip\),%r11        # 10010258 <_GLOBAL_OFFSET_TABLE_\+0x18>
-[ 	]*[a-f0-9]+:	41 83 e3 e0          	and    \$0xffffffe0,%r11d
-[ 	]*[a-f0-9]+:	4d 01 fb             	add    %r15,%r11
-[ 	]*[a-f0-9]+:	41 ff e3             	jmpq   \*%r11
-[ 	]*[a-f0-9]+:	66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	68 00 00 00 00       	pushq  \$0x0
-[ 	]*[a-f0-9]+:	e9 00 00 00 00       	jmpq   6a <\.plt\+0x6a>
-[ 	]*[a-f0-9]+:	66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
-[ 	]*[a-f0-9]+:	0f 1f 80 00 00 00 00 	nopl   0x0\(%rax\)
-
-Disassembly of section .text:
-
-0+80 <_start>:
-[ 	]*[a-f0-9]+:	48 3b 05 a9 01 01 10 	cmp    0x100101a9\(%rip\),%rax        # 10010230 <\.got>
-[ 	]*[a-f0-9]+:	ff 25 ab 01 01 10    	jmpq   \*0x100101ab\(%rip\)        # 10010238 <\.got\+0x8>
-[ 	]*[a-f0-9]+:	e8 ae ff ff ff       	callq  40 <\.plt\+0x40>
diff --git a/ld/testsuite/ld-x86-64/pr19636-2d.d b/ld/testsuite/ld-x86-64/pr19636-2d.d
index b0e71d9e069..1815d2caea3 100644
--- a/ld/testsuite/ld-x86-64/pr19636-2d.d
+++ b/ld/testsuite/ld-x86-64/pr19636-2d.d
@@ -2,7 +2,6 @@
 #as: --64 -mrelax-relocations=no
 #ld: -pie -m elf_x86_64 --no-dynamic-linker --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/pr19636-2l.d b/ld/testsuite/ld-x86-64/pr19636-2l.d
index e99c06abc6c..994a6da5bd2 100644
--- a/ld/testsuite/ld-x86-64/pr19636-2l.d
+++ b/ld/testsuite/ld-x86-64/pr19636-2l.d
@@ -3,7 +3,6 @@
 #ld: -pie -m elf_x86_64 --no-dynamic-linker --hash-style=sysv -z dynamic-undefined-weak -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
 #warning: -z dynamic-undefined-weak ignored
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/pr19827-nacl.rd b/ld/testsuite/ld-x86-64/pr19827-nacl.rd
deleted file mode 100644
index bd701300d25..00000000000
--- a/ld/testsuite/ld-x86-64/pr19827-nacl.rd
+++ /dev/null
@@ -1,5 +0,0 @@
-#readelf: -r --wide
-
-Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entry:
-    Offset             Info             Type               Symbol's Value  Symbol's Name \+ Addend
-[0-9a-f]+ +[0-9a-f]+ +R_X86_64_RELATIVE +[0-9a-f]+
diff --git a/ld/testsuite/ld-x86-64/pr20253-1b.d b/ld/testsuite/ld-x86-64/pr20253-1b.d
index 21ff6f3ba97..fdf94e1f8c3 100644
--- a/ld/testsuite/ld-x86-64/pr20253-1b.d
+++ b/ld/testsuite/ld-x86-64/pr20253-1b.d
@@ -2,7 +2,6 @@
 #as: --64
 #ld: -melf_x86_64 -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/pr20253-1d.d b/ld/testsuite/ld-x86-64/pr20253-1d.d
index 34bd4e75948..aed1605519f 100644
--- a/ld/testsuite/ld-x86-64/pr20253-1d.d
+++ b/ld/testsuite/ld-x86-64/pr20253-1d.d
@@ -2,7 +2,6 @@
 #as: --64
 #ld: -pie -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/pr20253-1f.d b/ld/testsuite/ld-x86-64/pr20253-1f.d
index cdf10f4c008..884d1274a94 100644
--- a/ld/testsuite/ld-x86-64/pr20253-1f.d
+++ b/ld/testsuite/ld-x86-64/pr20253-1f.d
@@ -2,7 +2,6 @@
 #as: --64
 #ld: -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/pr20253-1h.d b/ld/testsuite/ld-x86-64/pr20253-1h.d
index ed903a32b6d..d21a7afb88c 100644
--- a/ld/testsuite/ld-x86-64/pr20253-1h.d
+++ b/ld/testsuite/ld-x86-64/pr20253-1h.d
@@ -2,7 +2,6 @@
 #as: --x32
 #ld: -melf32_x86_64 -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/pr20253-1j.d b/ld/testsuite/ld-x86-64/pr20253-1j.d
index db4895268a8..94365446fa4 100644
--- a/ld/testsuite/ld-x86-64/pr20253-1j.d
+++ b/ld/testsuite/ld-x86-64/pr20253-1j.d
@@ -2,7 +2,6 @@
 #as: --x32
 #ld: -pie -melf32_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/pr20253-1l.d b/ld/testsuite/ld-x86-64/pr20253-1l.d
index 49aa5c156e4..3d37f34859f 100644
--- a/ld/testsuite/ld-x86-64/pr20253-1l.d
+++ b/ld/testsuite/ld-x86-64/pr20253-1l.d
@@ -2,7 +2,6 @@
 #as: --x32
 #ld: -shared -melf32_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
-#notarget: x86_64-*-nacl*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/pr21884-nacl.d b/ld/testsuite/ld-x86-64/pr21884-nacl.d
deleted file mode 100644
index 88835055c32..00000000000
--- a/ld/testsuite/ld-x86-64/pr21884-nacl.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#source: dummy.s
-#as: --64
-#ld: -m elf_x86_64 -T pr21884-nacl.t -b binary
-#objdump: -b binary -s
-#target: x86_64-*-nacl*
-
-.*:     file format binary
-
-Contents of section .data:
-#pass
diff --git a/ld/testsuite/ld-x86-64/pr21884-nacl.t b/ld/testsuite/ld-x86-64/pr21884-nacl.t
deleted file mode 100644
index 722312e0812..00000000000
--- a/ld/testsuite/ld-x86-64/pr21884-nacl.t
+++ /dev/null
@@ -1,11 +0,0 @@
-OUTPUT_FORMAT("elf64-x86-64-nacl");
-OUTPUT_ARCH(i386:x86-64);
-
-ENTRY(_start);
-SECTIONS {
-        . = 0x10000;
-        _start = . ;
-        .data : {
-                *(.data)
-        }
-}
diff --git a/ld/testsuite/ld-x86-64/pr21884.d b/ld/testsuite/ld-x86-64/pr21884.d
index 7a2a3f361c6..a62d8bc4f7a 100644
--- a/ld/testsuite/ld-x86-64/pr21884.d
+++ b/ld/testsuite/ld-x86-64/pr21884.d
@@ -2,7 +2,6 @@
 #as: --64
 #ld: -m elf_x86_64 -T pr21884.t -b binary
 #objdump: -b binary -s
-#notarget: x86_64-*-nacl*
 
 .*:     file format binary
 
diff --git a/ld/testsuite/ld-x86-64/pr22393-3a.rd b/ld/testsuite/ld-x86-64/pr22393-3a.rd
index 0050f1bdad2..b17e09b06db 100644
--- a/ld/testsuite/ld-x86-64/pr22393-3a.rd
+++ b/ld/testsuite/ld-x86-64/pr22393-3a.rd
@@ -1,7 +1,7 @@
 #source: pr22393-1.s
 #ld: -shared -z separate-code
 #readelf: -l --wide
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl*
+#target: *-*-linux-gnu *-*-gnu*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-x86-64/pr22393-3b.rd b/ld/testsuite/ld-x86-64/pr22393-3b.rd
index 0050f1bdad2..b17e09b06db 100644
--- a/ld/testsuite/ld-x86-64/pr22393-3b.rd
+++ b/ld/testsuite/ld-x86-64/pr22393-3b.rd
@@ -1,7 +1,7 @@
 #source: pr22393-1.s
 #ld: -shared -z separate-code
 #readelf: -l --wide
-#target: *-*-linux-gnu *-*-gnu* *-*-nacl*
+#target: *-*-linux-gnu *-*-gnu*
 
 #failif
 #...
diff --git a/ld/testsuite/ld-x86-64/split-by-file-nacl.rd b/ld/testsuite/ld-x86-64/split-by-file-nacl.rd
deleted file mode 100644
index 4e3e74a2e75..00000000000
--- a/ld/testsuite/ld-x86-64/split-by-file-nacl.rd
+++ /dev/null
@@ -1,15 +0,0 @@
-There are 9 section headers, starting at offset .*:
-
-Section Headers:
-  \[Nr\] Name              Type            Address          Off    Size   ES Flg Lk Inf Al
-  \[ 0\]                   NULL            0000000000000000 000000 000000 00      0   0  0
-  \[ 1\] .text             PROGBITS        0000000000000000 000040 000000 00  AX  0   0  1
-  \[ 2\] .foo              PROGBITS        0000000000000000 000040 000003 00 AXl  0   0  1
-  \[ 3\] .data             PROGBITS        0000000000000000 000043 000000 00  WA  0   0  1
-  \[ 4\] .bss              NOBITS          0000000000000000 000043 000000 00  WA  0   0  1
-  \[ 5\] .foo.0            PROGBITS        0000000000000003 000043 000003 00 AXl  0   0  1
-  \[ 6\] .symtab           SYMTAB          0000000000000000 [0-9a-f]+ [0-9a-f]+ 18      7   [0-9]  8
-  \[ 7\] .strtab           STRTAB          0000000000000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
-  \[ 8\] .shstrtab         STRTAB          0000000000000000 [0-9a-f]+ 000038 00      0   0  1
-Key to Flags:
-#pass
diff --git a/ld/testsuite/ld-x86-64/tlsbin-nacl.rd b/ld/testsuite/ld-x86-64/tlsbin-nacl.rd
deleted file mode 100644
index 15f28acdbc6..00000000000
--- a/ld/testsuite/ld-x86-64/tlsbin-nacl.rd
+++ /dev/null
@@ -1,147 +0,0 @@
-#source: tlsbinpic.s
-#source: tlsbin.s
-#as: --64
-#ld: -shared -melf_x86_64_nacl --no-ld-generated-unwind-info
-#readelf: -WSsrl
-#target: x86_64-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
- +\[[ 0-9]+\] .plt +.*
- +\[[ 0-9]+\] .text +PROGBITS +0+21000 [0-9a-f]+ 0+231 00 +AX +0 +0 +4096
- +\[[ 0-9]+\] .interp +.*
- +\[[ 0-9]+\] .hash +.*
- +\[[ 0-9]+\] .dynsym +.*
- +\[[ 0-9]+\] .dynstr +.*
- +\[[ 0-9]+\] .rela.dyn +.*
- +\[[ 0-9]+\] .rela.plt +.*
- +\[[ 0-9]+\] .tdata +PROGBITS +0+10030348 [0-9a-f]+ 0+60 00 WAT +0 +0 +1
- +\[[ 0-9]+\] .tbss +NOBITS +0+100303a8 [0-9a-f]+ 0+40 00 WAT +0 +0 +1
- +\[[ 0-9]+\] .dynamic +DYNAMIC +0+100303a8 [0-9a-f]+ 0+140 10 +WA +6 +0 +8
- +\[[ 0-9]+\] .got +PROGBITS +0+100304e8 [0-9a-f]+ 0+20 08 +WA +0 +0 +8
- +\[[ 0-9]+\] .got.plt +PROGBITS +0+10030508 [0-9a-f]+ 0+20 08 +WA +0 +0 +8
- +\[[ 0-9]+\] .symtab +.*
- +\[[ 0-9]+\] .strtab +.*
- +\[[ 0-9]+\] .shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is EXEC \(Executable file\)
-Entry point 0x21139
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +PHDR.*
- +INTERP.*
-.*Requesting program interpreter.*
- +LOAD +0x0+10000 0x0+20000 0x0+20000 0x0+10000 0x0+10000 R E +0x10000
- +LOAD +0x0+ 0x0+10020000 0x0+10020000 0x0+348 0x0+348 R +0x10000
- +LOAD +0x0+348 0x0+10030348 0x0+10030348 0x0+1e0 0x0+1e0 RW +0x10000
- +DYNAMIC +0x0+3a8 0x0+100303a8 0x0+100303a8 0x0+140 0x0+140 RW +0x8
- +TLS +0x0+348 0x0+10030348 0x0+10030348 0x0+60 0x0+a0 R +0x1
-
- Section to Segment mapping:
- +Segment Sections...
- +00 *
- +01 +.interp *
- +02 +.plt .text *
- +03 +.interp .hash .dynsym .dynstr .rela.dyn .rela.plt *
- +04 +.tdata .dynamic .got .got.plt *
- +05 +.dynamic *
- +06 +.tdata .tbss *
-
-Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG5 \+ 0
-[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG2 \+ 0
-[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG6 \+ 0
-[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG1 \+ 0
-
-Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entry:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f ]+R_X86_64_JUMP_SLOT[0-9a-f ]+__tls_get_addr \+ 0
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
-.* NOTYPE +LOCAL +DEFAULT +UND *
-.* TLS +GLOBAL +DEFAULT +UND sG5
-.* TLS +GLOBAL +DEFAULT +UND sG2
-.* FUNC +GLOBAL +DEFAULT +UND __tls_get_addr
-.* TLS +GLOBAL +DEFAULT +UND sG6
-.* TLS +GLOBAL +DEFAULT +UND sG1
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
-.* NOTYPE +LOCAL +DEFAULT +UND *
-.* SECTION +LOCAL +DEFAULT +1 *
-.* SECTION +LOCAL +DEFAULT +2 *
-.* SECTION +LOCAL +DEFAULT +3 *
-.* SECTION +LOCAL +DEFAULT +4 *
-.* SECTION +LOCAL +DEFAULT +5 *
-.* SECTION +LOCAL +DEFAULT +6 *
-.* SECTION +LOCAL +DEFAULT +7 *
-.* SECTION +LOCAL +DEFAULT +8 *
-.* SECTION +LOCAL +DEFAULT +9 *
-.* SECTION +LOCAL +DEFAULT +10 *
-.* SECTION +LOCAL +DEFAULT +11 *
-.* SECTION +LOCAL +DEFAULT +12 *
-.* SECTION +LOCAL +DEFAULT +13 *
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbinpic.o
-.* TLS +LOCAL +DEFAULT +9 sl1
-.* TLS +LOCAL +DEFAULT +9 sl2
-.* TLS +LOCAL +DEFAULT +9 sl3
-.* TLS +LOCAL +DEFAULT +9 sl4
-.* TLS +LOCAL +DEFAULT +9 sl5
-.* TLS +LOCAL +DEFAULT +9 sl6
-.* TLS +LOCAL +DEFAULT +9 sl7
-.* TLS +LOCAL +DEFAULT +9 sl8
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o
-.* TLS +LOCAL +DEFAULT +10 bl1
-.* TLS +LOCAL +DEFAULT +10 bl2
-.* TLS +LOCAL +DEFAULT +10 bl3
-.* TLS +LOCAL +DEFAULT +10 bl4
-.* TLS +LOCAL +DEFAULT +10 bl5
-.* TLS +LOCAL +DEFAULT +10 bl6
-.* TLS +LOCAL +DEFAULT +10 bl7
-.* TLS +LOCAL +DEFAULT +10 bl8
-.* FILE +LOCAL +DEFAULT +ABS 
-.* OBJECT +LOCAL +DEFAULT +11 _DYNAMIC
-.* OBJECT +LOCAL +DEFAULT +13 _GLOBAL_OFFSET_TABLE_
-.* TLS +GLOBAL +DEFAULT +9 sg8
-.* TLS +GLOBAL +DEFAULT +10 bg8
-.* TLS +GLOBAL +DEFAULT +10 bg6
-.* TLS +GLOBAL +DEFAULT +UND sG5
-.* TLS +GLOBAL +DEFAULT +10 bg3
-.* TLS +GLOBAL +DEFAULT +9 sg3
-.* TLS +GLOBAL +HIDDEN +9 sh3
-.* TLS +GLOBAL +DEFAULT +UND sG2
-.* TLS +GLOBAL +DEFAULT +9 sg4
-.* TLS +GLOBAL +DEFAULT +9 sg5
-.* TLS +GLOBAL +DEFAULT +10 bg5
-.* FUNC +GLOBAL +DEFAULT +UND __tls_get_addr
-.* TLS +GLOBAL +HIDDEN +9 sh7
-.* TLS +GLOBAL +HIDDEN +9 sh8
-.* TLS +GLOBAL +DEFAULT +9 sg1
-.* FUNC +GLOBAL +DEFAULT +2 _start
-.* TLS +GLOBAL +HIDDEN +9 sh4
-.* TLS +GLOBAL +DEFAULT +10 bg7
-.* TLS +GLOBAL +HIDDEN +9 sh5
-.* NOTYPE +GLOBAL +DEFAULT +13 __bss_start
-.* TLS +GLOBAL +DEFAULT +UND sG6
-.* FUNC +GLOBAL +DEFAULT +2 fn2
-.* TLS +GLOBAL +DEFAULT +9 sg2
-.* TLS +GLOBAL +DEFAULT +UND sG1
-.* TLS +GLOBAL +HIDDEN +9 sh1
-.* TLS +GLOBAL +DEFAULT +9 sg6
-.* TLS +GLOBAL +DEFAULT +9 sg7
-.* NOTYPE +GLOBAL +DEFAULT +13 _edata
-.* NOTYPE +GLOBAL +DEFAULT +13 _end
-.* TLS +GLOBAL +HIDDEN +9 sh2
-.* TLS +GLOBAL +HIDDEN +9 sh6
-.* TLS +GLOBAL +DEFAULT +10 bg2
-.* TLS +GLOBAL +DEFAULT +10 bg1
-.* TLS +GLOBAL +DEFAULT +10 bg4
diff --git a/ld/testsuite/ld-x86-64/tlsbin2-nacl.rd b/ld/testsuite/ld-x86-64/tlsbin2-nacl.rd
deleted file mode 100644
index ffaf585de12..00000000000
--- a/ld/testsuite/ld-x86-64/tlsbin2-nacl.rd
+++ /dev/null
@@ -1,140 +0,0 @@
-#source: tlsbinpic2.s
-#source: tlsbin.s
-#as: --64
-#ld: -shared -melf_x86_64_nacl --no-ld-generated-unwind-info
-#readelf: -WSsrl
-#target: x86_64-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
- +\[[ 0-9]+\] .text +PROGBITS +0+20000 [0-9a-f]+ 0+233 00 +AX +0 +0 +4096
- +\[[ 0-9]+\] .interp +.*
- +\[[ 0-9]+\] .hash +.*
- +\[[ 0-9]+\] .dynsym +.*
- +\[[ 0-9]+\] .dynstr +.*
- +\[[ 0-9]+\] .rela.dyn +.*
- +\[[ 0-9]+\] .tdata +PROGBITS +0+10030348 [0-9a-f]+ 0+60 00 WAT +0 +0 +1
- +\[[ 0-9]+\] .tbss +NOBITS +0+100303a8 [0-9a-f]+ 0+40 00 WAT +0 +0 +1
- +\[[ 0-9]+\] .dynamic +DYNAMIC +0+100303a8 [0-9a-f]+ 0+100 10 +WA +5 +0 +8
- +\[[ 0-9]+\] .got +PROGBITS +0+100304a8 [0-9a-f]+ 0+28 08 +WA +0 +0 +8
- +\[[ 0-9]+\] .got.plt +PROGBITS +0+100304d0 [0-9a-f]+ 0+18 08 +WA +0 +0 +8
- +\[[ 0-9]+\] .symtab +.*
- +\[[ 0-9]+\] .strtab +.*
- +\[[ 0-9]+\] .shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is EXEC \(Executable file\)
-Entry point 0x2013b
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +PHDR.*
- +INTERP.*
-.*Requesting program interpreter.*
- +LOAD +0x0+10000 0x0+20000 0x0+20000 0x0+10000 0x0+10000 R E +0x10000
- +LOAD +0x0+ 0x0+10020000 0x0+10020000 0x0+348 0x0+348 R +0x10000
- +LOAD +0x0+348 0x0+10030348 0x0+10030348 0x0+1a0 0x0+1a0 RW +0x10000
- +DYNAMIC +0x0+3a8 0x0+100303a8 0x0+100303a8 0x0+100 0x0+100 RW +0x8
- +TLS +0x0+348 0x0+10030348 0x0+10030348 0x0+60 0x0+a0 R +0x1
-
- Section to Segment mapping:
- +Segment Sections...
- +00 *
- +01 +.interp *
- +02 +.text *
- +03 +.interp .hash .dynsym .dynstr .rela.dyn *
- +04 +.tdata .dynamic .got .got.plt *
- +05 +.dynamic *
- +06 +.tdata .tbss *
-
-Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 5 entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG5 \+ 0
-[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG2 \+ 0
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ __tls_get_addr \+ 0
-[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG6 \+ 0
-[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG1 \+ 0
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
-.* NOTYPE +LOCAL +DEFAULT +UND *
-.* TLS +GLOBAL +DEFAULT +UND sG5
-.* TLS +GLOBAL +DEFAULT +UND sG2
-.* FUNC +GLOBAL +DEFAULT +UND __tls_get_addr
-.* TLS +GLOBAL +DEFAULT +UND sG6
-.* TLS +GLOBAL +DEFAULT +UND sG1
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
-.* NOTYPE +LOCAL +DEFAULT +UND *
-.* SECTION +LOCAL +DEFAULT +1 *
-.* SECTION +LOCAL +DEFAULT +2 *
-.* SECTION +LOCAL +DEFAULT +3 *
-.* SECTION +LOCAL +DEFAULT +4 *
-.* SECTION +LOCAL +DEFAULT +5 *
-.* SECTION +LOCAL +DEFAULT +6 *
-.* SECTION +LOCAL +DEFAULT +7 *
-.* SECTION +LOCAL +DEFAULT +8 *
-.* SECTION +LOCAL +DEFAULT +9 *
-.* SECTION +LOCAL +DEFAULT +10 *
-.* SECTION +LOCAL +DEFAULT +11 *
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbinpic2.o
-.* TLS +LOCAL +DEFAULT +7 sl1
-.* TLS +LOCAL +DEFAULT +7 sl2
-.* TLS +LOCAL +DEFAULT +7 sl3
-.* TLS +LOCAL +DEFAULT +7 sl4
-.* TLS +LOCAL +DEFAULT +7 sl5
-.* TLS +LOCAL +DEFAULT +7 sl6
-.* TLS +LOCAL +DEFAULT +7 sl7
-.* TLS +LOCAL +DEFAULT +7 sl8
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o
-.* TLS +LOCAL +DEFAULT +8 bl1
-.* TLS +LOCAL +DEFAULT +8 bl2
-.* TLS +LOCAL +DEFAULT +8 bl3
-.* TLS +LOCAL +DEFAULT +8 bl4
-.* TLS +LOCAL +DEFAULT +8 bl5
-.* TLS +LOCAL +DEFAULT +8 bl6
-.* TLS +LOCAL +DEFAULT +8 bl7
-.* TLS +LOCAL +DEFAULT +8 bl8
-.* FILE +LOCAL +DEFAULT +ABS 
-.* OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
-.* OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_
-.* TLS +GLOBAL +DEFAULT +7 sg8
-.* TLS +GLOBAL +DEFAULT +8 bg8
-.* TLS +GLOBAL +DEFAULT +8 bg6
-.* TLS +GLOBAL +DEFAULT +UND sG5
-.* TLS +GLOBAL +DEFAULT +8 bg3
-.* TLS +GLOBAL +DEFAULT +7 sg3
-.* TLS +GLOBAL +HIDDEN +7 sh3
-.* TLS +GLOBAL +DEFAULT +UND sG2
-.* TLS +GLOBAL +DEFAULT +7 sg4
-.* TLS +GLOBAL +DEFAULT +7 sg5
-.* TLS +GLOBAL +DEFAULT +8 bg5
-.* FUNC +GLOBAL +DEFAULT +UND __tls_get_addr
-.* TLS +GLOBAL +HIDDEN +7 sh7
-.* TLS +GLOBAL +HIDDEN +7 sh8
-.* TLS +GLOBAL +DEFAULT +7 sg1
-.* FUNC +GLOBAL +DEFAULT +1 _start
-.* TLS +GLOBAL +HIDDEN +7 sh4
-.* TLS +GLOBAL +DEFAULT +8 bg7
-.* TLS +GLOBAL +HIDDEN +7 sh5
-.* NOTYPE +GLOBAL +DEFAULT +11 __bss_start
-.* TLS +GLOBAL +DEFAULT +UND sG6
-.* FUNC +GLOBAL +DEFAULT +1 fn2
-.* TLS +GLOBAL +DEFAULT +7 sg2
-.* TLS +GLOBAL +DEFAULT +UND sG1
-.* TLS +GLOBAL +HIDDEN +7 sh1
-.* TLS +GLOBAL +DEFAULT +7 sg6
-.* TLS +GLOBAL +DEFAULT +7 sg7
-.* NOTYPE +GLOBAL +DEFAULT +11 _edata
-.* NOTYPE +GLOBAL +DEFAULT +11 _end
-.* TLS +GLOBAL +HIDDEN +7 sh2
-.* TLS +GLOBAL +HIDDEN +7 sh6
-.* TLS +GLOBAL +DEFAULT +8 bg2
-.* TLS +GLOBAL +DEFAULT +8 bg1
-.* TLS +GLOBAL +DEFAULT +8 bg4
diff --git a/ld/testsuite/ld-x86-64/tlsbindesc-nacl.rd b/ld/testsuite/ld-x86-64/tlsbindesc-nacl.rd
deleted file mode 100644
index 670958afb8b..00000000000
--- a/ld/testsuite/ld-x86-64/tlsbindesc-nacl.rd
+++ /dev/null
@@ -1,138 +0,0 @@
-#source: tlsbindesc.s
-#source: tlsbin.s
-#as: --64
-#ld: -shared -melf_x86_64_nacl --no-ld-generated-unwind-info
-#readelf: -WSsrl
-#target: x86_64-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
- +\[[ 0-9]+\] .text +PROGBITS +0+20000 0+10000 0+1fd 00 +AX +0 +0 +4096
- +\[[ 0-9]+\] .interp +.*
- +\[[ 0-9]+\] .hash +.*
- +\[[ 0-9]+\] .dynsym +.*
- +\[[ 0-9]+\] .dynstr +.*
- +\[[ 0-9]+\] .rela.dyn +.*
- +\[[ 0-9]+\] .tdata +PROGBITS +0+10030300 0+300 0+60 00 WAT +0 +0 +1
- +\[[ 0-9]+\] .tbss +NOBITS +0+10030360 0+360 0+40 00 WAT +0 +0 +1
- +\[[ 0-9]+\] .dynamic +DYNAMIC +0+10030360 0+360 0+100 10 +WA +5 +0 +8
- +\[[ 0-9]+\] .got +PROGBITS +0+10030460 0+460 0+20 08 +WA +0 +0 +8
- +\[[ 0-9]+\] .got.plt +PROGBITS +0+10030480 0+480 0+18 08 +WA +0 +0 +8
- +\[[ 0-9]+\] .symtab +.*
- +\[[ 0-9]+\] .strtab +.*
- +\[[ 0-9]+\] .shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is EXEC \(Executable file\)
-Entry point 0x20105
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +PHDR.*
- +INTERP.*
-.*Requesting program interpreter.*
- +LOAD +0x0+10000 0x0+20000 0x0+20000 0x0+10000 0x0+10000 R E 0x10000
- +LOAD +0x0+ 0x0+10020000 0x0+10020000 0x0+300 0x0+300 R +0x10000
- +LOAD +0x0+300 0x0+10030300 0x0+10030300 0x0+198 0x0+198 RW +0x10000
- +DYNAMIC +0x0+360 0x0+10030360 0x0+10030360 0x0+100 0x0+100 RW +0x8
- +TLS +0x0+300 0x0+10030300 0x0+10030300 0x0+60 0x0+a0 R +0x1
-
- Section to Segment mapping:
- +Segment Sections...
- +00 *
- +01 +.interp *
- +02 +.text *
- +03 +.interp .hash .dynsym .dynstr .rela.dyn *
- +04 +.tdata .dynamic .got .got.plt *
- +05 +.dynamic *
- +06 +.tdata .tbss *
-
-Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+10030460 +0+100000012 R_X86_64_TPOFF64 +0+ sG5 \+ 0
-0+10030468 +0+200000012 R_X86_64_TPOFF64 +0+ sG2 \+ 0
-0+10030470 +0+300000012 R_X86_64_TPOFF64 +0+ sG6 \+ 0
-0+10030478 +0+400000012 R_X86_64_TPOFF64 +0+ sG1 \+ 0
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 *
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbindesc.o
- +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +7 sl1
- +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +7 sl2
- +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +7 sl3
- +[0-9]+: 0+2c +0 +TLS +LOCAL +DEFAULT +7 sl4
- +[0-9]+: 0+30 +0 +TLS +LOCAL +DEFAULT +7 sl5
- +[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +7 sl6
- +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +7 sl7
- +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +7 sl8
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o
- +[0-9]+: 0+80 +0 +TLS +LOCAL +DEFAULT +8 bl1
- +[0-9]+: 0+84 +0 +TLS +LOCAL +DEFAULT +8 bl2
- +[0-9]+: 0+88 +0 +TLS +LOCAL +DEFAULT +8 bl3
- +[0-9]+: 0+8c +0 +TLS +LOCAL +DEFAULT +8 bl4
- +[0-9]+: 0+90 +0 +TLS +LOCAL +DEFAULT +8 bl5
- +[0-9]+: 0+94 +0 +TLS +LOCAL +DEFAULT +8 bl6
- +[0-9]+: 0+98 +0 +TLS +LOCAL +DEFAULT +8 bl7
- +[0-9]+: 0+9c +0 +TLS +LOCAL +DEFAULT +8 bl8
-.* FILE +LOCAL +DEFAULT +ABS 
- +[0-9]+: 0+a0 +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_
- +[0-9]+: 0+10030360 +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
- +[0-9]+: 0+10030480 +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +7 sg8
- +[0-9]+: 0+7c +0 +TLS +GLOBAL +DEFAULT +8 bg8
- +[0-9]+: 0+74 +0 +TLS +GLOBAL +DEFAULT +8 bg6
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
- +[0-9]+: 0+68 +0 +TLS +GLOBAL +DEFAULT +8 bg3
- +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +7 sg3
- +[0-9]+: 0+48 +0 +TLS +GLOBAL +HIDDEN +7 sh3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
- +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +7 sg4
- +[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +7 sg5
- +[0-9]+: 0+70 +0 +TLS +GLOBAL +DEFAULT +8 bg5
- +[0-9]+: 0+58 +0 +TLS +GLOBAL +HIDDEN +7 sh7
- +[0-9]+: 0+5c +0 +TLS +GLOBAL +HIDDEN +7 sh8
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +7 sg1
- +[0-9]+: 0+20105 +0 +FUNC +GLOBAL +DEFAULT +1 _start
- +[0-9]+: 0+4c +0 +TLS +GLOBAL +HIDDEN +7 sh4
- +[0-9]+: 0+78 +0 +TLS +GLOBAL +DEFAULT +8 bg7
- +[0-9]+: 0+50 +0 +TLS +GLOBAL +HIDDEN +7 sh5
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 __bss_start
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
- +[0-9]+: 0+20000 +0 +FUNC +GLOBAL +DEFAULT +1 fn2
- +[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +7 sg2
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
- +[0-9]+: 0+40 +0 +TLS +GLOBAL +HIDDEN +7 sh1
- +[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +7 sg6
- +[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +7 sg7
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _edata
- +[0-9]+: [0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +11 _end
- +[0-9]+: 0+44 +0 +TLS +GLOBAL +HIDDEN +7 sh2
- +[0-9]+: 0+54 +0 +TLS +GLOBAL +HIDDEN +7 sh6
- +[0-9]+: 0+64 +0 +TLS +GLOBAL +DEFAULT +8 bg2
- +[0-9]+: 0+60 +0 +TLS +GLOBAL +DEFAULT +8 bg1
- +[0-9]+: 0+6c +0 +TLS +GLOBAL +DEFAULT +8 bg4
diff --git a/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd b/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd
deleted file mode 100644
index f744f0e4c42..00000000000
--- a/ld/testsuite/ld-x86-64/tlsdesc-nacl.pd
+++ /dev/null
@@ -1,40 +0,0 @@
-#source: tlsdesc.s
-#source: tlspic2.s
-#as: --64
-#ld: -shared -melf_x86_64_nacl --no-ld-generated-unwind-info
-#objdump: -drj.plt
-#target: x86_64-*-nacl*
-
-.*: +file format elf64-x86-64-nacl
-
-Disassembly of section .plt:
-
-[0-9a-f]+ <.plt>:
- +[0-9a-f]+:	ff 35 .. .. .. ..    	pushq  0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x8>
- +[0-9a-f]+:	4c 8b 1d .. .. .. .. 	mov    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x10>
- +[0-9a-f]+:	41 83 e3 e0          	and    \$0xffffffe0,%r11d
- +[0-9a-f]+:	4d 01 fb             	add    %r15,%r11
- +[0-9a-f]+:	41 ff e3             	jmpq   \*%r11
- +[0-9a-f]+:	66 0f 1f 84 00 00 00 	nopw   0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	00 00 *
- +[0-9a-f]+:	66 66 66 66 66 66 2e 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	0f 1f 84 00 00 00 00 *
- +[0-9a-f]+:	00 *
- +[0-9a-f]+:	66 66 66 66 66 66 2e 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	0f 1f 84 00 00 00 00 *
- +[0-9a-f]+:	00 *
- +[0-9a-f]+:	66 90                	xchg   %ax,%ax
- +[0-9a-f]+:	ff 35 .. .. .. ..    	pushq  0x[0-9a-f]+\(%rip\) +# [0-9a-f]+ <_GLOBAL_OFFSET_TABLE_\+0x8>
- +[0-9a-f]+:	4c 8b 1d .. .. .. .. 	mov    0x[0-9a-f]+\(%rip\),%r11 +# [0-9a-f]+ <.*>
- +[0-9a-f]+:	41 83 e3 e0          	and    \$0xffffffe0,%r11d
- +[0-9a-f]+:	4d 01 fb             	add    %r15,%r11
- +[0-9a-f]+:	41 ff e3             	jmpq   \*%r11
- +[0-9a-f]+:	66 0f 1f 84 00 00 00 	nopw   0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	00 00 *
- +[0-9a-f]+:	66 66 66 66 66 66 2e 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	0f 1f 84 00 00 00 00 *
- +[0-9a-f]+:	00 *
- +[0-9a-f]+:	66 66 66 66 66 66 2e 	data16 data16 data16 data16 data16 nopw %cs:0x0\(%rax,%rax,1\)
- +[0-9a-f]+:	0f 1f 84 00 00 00 00 *
- +[0-9a-f]+:	00 *
- +[0-9a-f]+:	66 90                	xchg   %ax,%ax
diff --git a/ld/testsuite/ld-x86-64/tlsdesc-nacl.rd b/ld/testsuite/ld-x86-64/tlsdesc-nacl.rd
deleted file mode 100644
index 1a7c693cdb7..00000000000
--- a/ld/testsuite/ld-x86-64/tlsdesc-nacl.rd
+++ /dev/null
@@ -1,154 +0,0 @@
-#source: tlsdesc.s
-#source: tlspic2.s
-#as: --64
-#ld: -shared -melf_x86_64_nacl --no-ld-generated-unwind-info
-#readelf: -WSsrld
-#target: x86_64-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
- +\[[ 0-9]+\] .plt +PROGBITS +0+ [0-9a-f]+ +0+80 +40 +AX +0 +0 +32
- +\[[ 0-9]+\] .text +PROGBITS +0+1000 [0-9a-f]+ +0+153 00 +AX +0 +0 4096
- +\[[ 0-9]+\] .hash +.*
- +\[[ 0-9]+\] .dynsym +.*
- +\[[ 0-9]+\] .dynstr +.*
- +\[[ 0-9]+\] .rela.dyn +.*
- +\[[ 0-9]+\] .rela.plt +.*
- +\[[ 0-9]+\] .tdata +PROGBITS +0+100103e8 [0-9a-f]+ +0+60 00 WAT +0 +0 +1
- +\[[ 0-9]+\] .tbss +NOBITS +0+10010448 [0-9a-f]+ 0+20 00 WAT +0 +0 +1
- +\[[ 0-9]+\] .dynamic +DYNAMIC +0+10010448 [0-9a-f]+ 0+150 10 +WA +5 +0 +8
- +\[[ 0-9]+\] .got +PROGBITS +0+10010598 [0-9a-f]+ 0+48 08 +WA +0 +0 +8
- +\[[ 0-9]+\] .got.plt +PROGBITS +0+100105e0 [0-9a-f]+ 0+68 08 +WA +0 +0 +8
- +\[[ 0-9]+\] .symtab +.*
- +\[[ 0-9]+\] .strtab +.*
- +\[[ 0-9]+\] .shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is DYN \(Shared object file\)
-Entry point 0x1000
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD +0x[0-9a-f]+ 0x0+ 0x0+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x10000
- +LOAD +0x[0-9a-f]+ 0x0+10000000 0x0+10000000 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x10000
- +LOAD +0x[0-9a-f]+ 0x0+100103e8 0x0+100103e8 0x0+260 0x0+260 RW +0x10000
- +DYNAMIC +0x[0-9a-f]+ 0x0+10010448 0x0+10010448 0x0+150 0x0+150 RW +0x8
- +TLS +0x[0-9a-f]+ 0x0+100103e8 0x0+100103e8 0x0+60 0x0+80 R +0x1
-
- Section to Segment mapping:
- +Segment Sections...
- +00 +.plt .text *
- +01 +.hash .dynsym .dynstr .rela.dyn .rela.plt *
- +02 +.tdata .dynamic .got .got.plt *
- +03 +.dynamic *
- +04 +.tdata .tbss *
-
-Dynamic section at offset 0x[0-9a-f]+ contains 16 entries:
- +Tag +Type +Name/Value
- 0x[0-9a-f]+ +\(HASH\).*
- 0x[0-9a-f]+ +\(STRTAB\).*
- 0x[0-9a-f]+ +\(SYMTAB\).*
- 0x[0-9a-f]+ +\(STRSZ\).*
- 0x[0-9a-f]+ +\(SYMENT\).*
- 0x[0-9a-f]+ +\(PLTGOT\).*
- 0x[0-9a-f]+ +\(PLTRELSZ\).*
- 0x[0-9a-f]+ +\(PLTREL\).*
- 0x[0-9a-f]+ +\(JMPREL\).*
- 0x[0-9a-f]+ +\(TLSDESC_PLT\) +0x40
- 0x[0-9a-f]+ +\(TLSDESC_GOT\) +0x100105d8
- 0x[0-9a-f]+ +\(RELA\).*
- 0x[0-9a-f]+ +\(RELASZ\).*
- 0x[0-9a-f]+ +\(RELAENT\).*
- 0x[0-9a-f]+ +\(FLAGS\).*
- 0x[0-9a-f]+ +\(NULL\).*
-
-Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 8 entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+10010598 +[0-9a-f]+ R_X86_64_TPOFF64 +24
-0+100105a0 +[0-9a-f]+ R_X86_64_TPOFF64 +30
-0+100105a8 +[0-9a-f]+ R_X86_64_TPOFF64 +64
-0+100105b8 +[0-9a-f]+ R_X86_64_TPOFF64 +50
-0+100105c0 +[0-9a-f]+ R_X86_64_TPOFF64 +70
-0+100105d0 +[0-9a-f]+ R_X86_64_TPOFF64 +44
-0+100105b0 +[0-9a-f]+ R_X86_64_TPOFF64 +0+10 sg5 \+ 0
-0+100105c8 +[0-9a-f]+ R_X86_64_TPOFF64 +0+4 sg2 \+ 0
-
-Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 5 entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+10010628 +[0-9a-f]+ R_X86_64_TLSDESC +0+ sg1 \+ 0
-0+100105f8 +[0-9a-f]+ R_X86_64_TLSDESC +20
-0+10010638 +[0-9a-f]+ R_X86_64_TLSDESC +40
-0+10010608 +[0-9a-f]+ R_X86_64_TLSDESC +60
-0+10010618 +[0-9a-f]+ R_X86_64_TLSDESC +0
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +8 sg8
- +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +8 sg3
- +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +8 sg4
- +[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +8 sg5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +8 sg1
- +[0-9]+: 0+1000 +0 +FUNC +GLOBAL +DEFAULT +2 fn1
- +[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +8 sg2
- +[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +8 sg6
- +[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +8 sg7
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 *
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsdesc.o
- +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +8 sl1
- +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +8 sl2
- +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +8 sl3
- +[0-9]+: 0+2c +0 +TLS +LOCAL +DEFAULT +8 sl4
- +[0-9]+: 0+30 +0 +TLS +LOCAL +DEFAULT +8 sl5
- +[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +8 sl6
- +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +8 sl7
- +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +8 sl8
-.* FILE +LOCAL +DEFAULT +ABS 
- +[0-9]+: 0+60 +0 +TLS +LOCAL +DEFAULT +9 sH1
- +[0-9]+: 0+ +0 +TLS +LOCAL +DEFAULT +8 _TLS_MODULE_BASE_
- +[0-9]+: 0+10010448 +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
- +[0-9]+: 0+48 +0 +TLS +LOCAL +DEFAULT +8 sh3
- +[0-9]+: 0+64 +0 +TLS +LOCAL +DEFAULT +9 sH2
- +[0-9]+: 0+78 +0 +TLS +LOCAL +DEFAULT +9 sH7
- +[0-9]+: 0+58 +0 +TLS +LOCAL +DEFAULT +8 sh7
- +[0-9]+: 0+5c +0 +TLS +LOCAL +DEFAULT +8 sh8
- +[0-9]+: 0+6c +0 +TLS +LOCAL +DEFAULT +9 sH4
- +[0-9]+: 0+4c +0 +TLS +LOCAL +DEFAULT +8 sh4
- +[0-9]+: 0+68 +0 +TLS +LOCAL +DEFAULT +9 sH3
- +[0-9]+: 0+50 +0 +TLS +LOCAL +DEFAULT +8 sh5
- +[0-9]+: 0+70 +0 +TLS +LOCAL +DEFAULT +9 sH5
- +[0-9]+: 0+74 +0 +TLS +LOCAL +DEFAULT +9 sH6
- +[0-9]+: 0+7c +0 +TLS +LOCAL +DEFAULT +9 sH8
- +[0-9]+: 0+40 +0 +TLS +LOCAL +DEFAULT +8 sh1
- +[0-9]+: 0+100105e0 +0 +OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+44 +0 +TLS +LOCAL +DEFAULT +8 sh2
- +[0-9]+: 0+54 +0 +TLS +LOCAL +DEFAULT +8 sh6
- +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +8 sg8
- +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +8 sg3
- +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +8 sg4
- +[0-9]+: 0+10 +0 +TLS +GLOBAL +DEFAULT +8 sg5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +8 sg1
- +[0-9]+: 0+1000 +0 +FUNC +GLOBAL +DEFAULT +2 fn1
- +[0-9]+: 0+4 +0 +TLS +GLOBAL +DEFAULT +8 sg2
- +[0-9]+: 0+14 +0 +TLS +GLOBAL +DEFAULT +8 sg6
- +[0-9]+: 0+18 +0 +TLS +GLOBAL +DEFAULT +8 sg7
diff --git a/ld/testsuite/ld-x86-64/tlsgd10.dd b/ld/testsuite/ld-x86-64/tlsgd10.dd
index 6c3ca5cffd6..7a69f61773a 100644
--- a/ld/testsuite/ld-x86-64/tlsgd10.dd
+++ b/ld/testsuite/ld-x86-64/tlsgd10.dd
@@ -2,7 +2,7 @@
 #as: --64
 #ld: -melf_x86_64 tmpdir/tlsgd10
 #objdump: -drwj.text
-#target: x86_64-*-linux* x86_64-*-nacl*
+#target: x86_64-*-linux*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/tlsgd5.dd b/ld/testsuite/ld-x86-64/tlsgd5.dd
index c2e2621c0af..5aa2bd9a0b5 100644
--- a/ld/testsuite/ld-x86-64/tlsgd5.dd
+++ b/ld/testsuite/ld-x86-64/tlsgd5.dd
@@ -2,7 +2,7 @@
 #as: --64
 #ld: -melf_x86_64 tmpdir/tlsgd5
 #objdump: -drw
-#target: x86_64-*-linux* x86_64-*-nacl*
+#target: x86_64-*-linux*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/tlsgd8.dd b/ld/testsuite/ld-x86-64/tlsgd8.dd
index 2bb1132ce1b..f9cac0b2168 100644
--- a/ld/testsuite/ld-x86-64/tlsgd8.dd
+++ b/ld/testsuite/ld-x86-64/tlsgd8.dd
@@ -2,7 +2,7 @@
 #as: --64
 #ld: -melf_x86_64 tmpdir/tlsgd8
 #objdump: -drwj.text
-#target: x86_64-*-linux* x86_64-*-nacl*
+#target: x86_64-*-linux*
 
 .*: +file format .*
 
diff --git a/ld/testsuite/ld-x86-64/tlsgdesc-nacl.rd b/ld/testsuite/ld-x86-64/tlsgdesc-nacl.rd
deleted file mode 100644
index b0421d91037..00000000000
--- a/ld/testsuite/ld-x86-64/tlsgdesc-nacl.rd
+++ /dev/null
@@ -1,97 +0,0 @@
-#source: tlsgdesc.s
-#as: --64
-#ld: -shared -melf64_x86_64_nacl --no-ld-generated-unwind-info
-#readelf: -WSsrl
-#target: x86_64-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[[ 0-9]+\] \.plt +.*
- +\[[ 0-9]+\] \.text +.*
- +\[[ 0-9]+\] \.hash +.*
- +\[[ 0-9]+\] \.dynsym +.*
- +\[[ 0-9]+\] \.dynstr +.*
- +\[[ 0-9]+\] \.rela.dyn +.*
- +\[[ 0-9]+\] \.rela.plt +.*
- +\[[ 0-9]+\] \.dynamic +.*
- +\[[ 0-9]+\] \.got +.*
- +\[[ 0-9]+\] \.got.plt +.*
- +\[[ 0-9]+\] \.symtab +.*
- +\[[ 0-9]+\] \.strtab +.*
- +\[[ 0-9]+\] \.shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is DYN \(Shared object file\)
-Entry point 0x[0-9a-f]+
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD.*
- +LOAD.*
- +LOAD.*
- +DYNAMIC.*
-
- Section to Segment mapping:
- +Segment Sections...
- +00 +.plt .text *
- +01 +.hash .dynsym .dynstr .rela.dyn .rela.plt *
- +02 +.dynamic .got .got.plt *
- +03 +.dynamic *
-
-Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 8 entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f]+ +0+100000012 R_X86_64_TPOFF64 +0+ sG3 \+ 0
-[0-9a-f]+ +0+200000012 R_X86_64_TPOFF64 +0+ sG5 \+ 0
-[0-9a-f]+ +0+300000010 R_X86_64_DTPMOD64 +0+ sG2 \+ 0
-[0-9a-f]+ +0+300000011 R_X86_64_DTPOFF64 +0+ sG2 \+ 0
-[0-9a-f]+ +0+400000012 R_X86_64_TPOFF64 +0+ sG4 \+ 0
-[0-9a-f]+ +0+600000012 R_X86_64_TPOFF64 +0+ sG6 \+ 0
-[0-9a-f]+ +0+800000010 R_X86_64_DTPMOD64 +0+ sG1 \+ 0
-[0-9a-f]+ +0+800000011 R_X86_64_DTPOFF64 +0+ sG1 \+ 0
-
-Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 3 entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f]+ +0+500000007 R_X86_64_JUMP_SLOT +0+ __tls_get_addr \+ 0
-[0-9a-f]+ +0+800000024 R_X86_64_TLSDESC +0+ sG1 \+ 0
-[0-9a-f]+ +0+300000024 R_X86_64_TLSDESC +0+ sG2 \+ 0
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
- +[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +2 fc1
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +1 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +2 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +3 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +4 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +5 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
- +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +8 _DYNAMIC
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +10 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG5
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG2
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG4
- +[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG6
- +[0-9]+: [0-9a-f]+ +0 +FUNC +GLOBAL +DEFAULT +2 fc1
- +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG1
diff --git a/ld/testsuite/ld-x86-64/tlspic-nacl.rd b/ld/testsuite/ld-x86-64/tlspic-nacl.rd
deleted file mode 100644
index f4f87723827..00000000000
--- a/ld/testsuite/ld-x86-64/tlspic-nacl.rd
+++ /dev/null
@@ -1,138 +0,0 @@
-#source: tlspic1.s
-#source: tlspic2.s
-#as: --64
-#ld: -shared -melf_x86_64_nacl --no-ld-generated-unwind-info
-#readelf: -WSsrl
-#target: x86_64-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
- +\[[ 0-9]+\] .plt +.*
- +\[[ 0-9]+\] .text +PROGBITS +0+1000 [0-9a-f]+ 0+31a 00 +AX +0 +0 4096
- +\[[ 0-9]+\] .hash +.*
- +\[[ 0-9]+\] .dynsym +.*
- +\[[ 0-9]+\] .dynstr +.*
- +\[[ 0-9]+\] .rela.dyn +.*
- +\[[ 0-9]+\] .rela.plt +.*
- +\[[ 0-9]+\] .tdata +PROGBITS +0+10010440 [0-9a-f]+ 0+60 00 WAT +0 +0 +1
- +\[[ 0-9]+\] .tbss +NOBITS +0+100104a0 [0-9a-f]+ 0+20 00 WAT +0 +0 +1
- +\[[ 0-9]+\] .dynamic +DYNAMIC +0+100104a0 [0-9a-f]+ 0+130 10 +WA +5 +0 +8
- +\[[ 0-9]+\] .got +PROGBITS +0+100105d0 [0-9a-f]+ 0+90 08 +WA +0 +0 +8
- +\[[ 0-9]+\] .got.plt +PROGBITS +0+10010660 [0-9a-f]+ 0+20 08 +WA +0 +0 +8
- +\[[ 0-9]+\] .symtab +.*
- +\[[ 0-9]+\] .strtab +.*
- +\[[ 0-9]+\] .shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is DYN \(Shared object file\)
-Entry point 0x1000
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD +0x0+10000 0x0+ 0x0+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x10000
- +LOAD +0x0+ 0x0+10000000 0x0+10000000 0x0+440 0x0+440 R +0x10000
- +LOAD +0x0+440 0x0+10010440 0x0+10010440 0x0+240 0x0+240 RW +0x10000
- +DYNAMIC +0x0+4a0 0x0+100104a0 0x0+100104a0 0x0+130 0x0+130 RW +0x8
- +TLS +0x0+440 0x0+10010440 0x0+10010440 0x0+60 0x0+80 R +0x1
-
- Section to Segment mapping:
- +Segment Sections...
- +00 +.plt .text *
- +01 +.hash .dynsym .dynstr .rela.dyn .rela.plt *
- +02 +.tdata .dynamic .got .got.plt *
- +03 +.dynamic *
- +04 +.tdata .tbss *
-
-Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f ]+R_X86_64_DTPMOD64 +0
-[0-9a-f ]+R_X86_64_TPOFF64 +24
-[0-9a-f ]+R_X86_64_TPOFF64 +30
-[0-9a-f ]+R_X86_64_DTPMOD64 +0
-[0-9a-f ]+R_X86_64_DTPMOD64 +0
-[0-9a-f ]+R_X86_64_TPOFF64 +64
-[0-9a-f ]+R_X86_64_TPOFF64 +50
-[0-9a-f ]+R_X86_64_TPOFF64 +70
-[0-9a-f ]+R_X86_64_DTPMOD64 +0
-[0-9a-f ]+R_X86_64_TPOFF64 +44
-[0-9a-f ]+R_X86_64_TPOFF64 +0+10 sg5 \+ 0
-[0-9a-f ]+R_X86_64_DTPMOD64 +0+ sg1 \+ 0
-[0-9a-f ]+R_X86_64_DTPOFF64 +0+ sg1 \+ 0
-[0-9a-f ]+R_X86_64_TPOFF64 +0+4 sg2 \+ 0
-
-Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entry:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f ]+R_X86_64_JUMP_SLOT +0+ __tls_get_addr \+ 0
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
-.* NOTYPE +LOCAL +DEFAULT +UND *
-.* TLS +GLOBAL +DEFAULT +8 sg8
-.* TLS +GLOBAL +DEFAULT +8 sg3
-.* TLS +GLOBAL +DEFAULT +8 sg4
-.* TLS +GLOBAL +DEFAULT +8 sg5
-.* NOTYPE +GLOBAL +DEFAULT +UND __tls_get_addr
-.* TLS +GLOBAL +DEFAULT +8 sg1
-.* FUNC +GLOBAL +DEFAULT +2 fn1
-.* TLS +GLOBAL +DEFAULT +8 sg2
-.* TLS +GLOBAL +DEFAULT +8 sg6
-.* TLS +GLOBAL +DEFAULT +8 sg7
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
-.* NOTYPE +LOCAL +DEFAULT +UND *
-.* SECTION +LOCAL +DEFAULT +1 *
-.* SECTION +LOCAL +DEFAULT +2 *
-.* SECTION +LOCAL +DEFAULT +3 *
-.* SECTION +LOCAL +DEFAULT +4 *
-.* SECTION +LOCAL +DEFAULT +5 *
-.* SECTION +LOCAL +DEFAULT +6 *
-.* SECTION +LOCAL +DEFAULT +7 *
-.* SECTION +LOCAL +DEFAULT +8 *
-.* SECTION +LOCAL +DEFAULT +9 *
-.* SECTION +LOCAL +DEFAULT +10 *
-.* SECTION +LOCAL +DEFAULT +11 *
-.* SECTION +LOCAL +DEFAULT +12 *
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlspic1.o
-.* TLS +LOCAL +DEFAULT +8 sl1
-.* TLS +LOCAL +DEFAULT +8 sl2
-.* TLS +LOCAL +DEFAULT +8 sl3
-.* TLS +LOCAL +DEFAULT +8 sl4
-.* TLS +LOCAL +DEFAULT +8 sl5
-.* TLS +LOCAL +DEFAULT +8 sl6
-.* TLS +LOCAL +DEFAULT +8 sl7
-.* TLS +LOCAL +DEFAULT +8 sl8
-.* FILE +LOCAL +DEFAULT +ABS 
-.* TLS +LOCAL +DEFAULT +9 sH1
-.* OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
-.* TLS +LOCAL +DEFAULT +8 sh3
-.* TLS +LOCAL +DEFAULT +9 sH2
-.* TLS +LOCAL +DEFAULT +9 sH7
-.* TLS +LOCAL +DEFAULT +8 sh7
-.* TLS +LOCAL +DEFAULT +8 sh8
-.* TLS +LOCAL +DEFAULT +9 sH4
-.* TLS +LOCAL +DEFAULT +8 sh4
-.* TLS +LOCAL +DEFAULT +9 sH3
-.* TLS +LOCAL +DEFAULT +8 sh5
-.* TLS +LOCAL +DEFAULT +9 sH5
-.* TLS +LOCAL +DEFAULT +9 sH6
-.* TLS +LOCAL +DEFAULT +9 sH8
-.* TLS +LOCAL +DEFAULT +8 sh1
-.* OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_
-.* TLS +LOCAL +DEFAULT +8 sh2
-.* TLS +LOCAL +DEFAULT +8 sh6
-.* TLS +GLOBAL +DEFAULT +8 sg8
-.* TLS +GLOBAL +DEFAULT +8 sg3
-.* TLS +GLOBAL +DEFAULT +8 sg4
-.* TLS +GLOBAL +DEFAULT +8 sg5
-.* NOTYPE +GLOBAL +DEFAULT +UND __tls_get_addr
-.* TLS +GLOBAL +DEFAULT +8 sg1
-.* FUNC +GLOBAL +DEFAULT +2 fn1
-.* TLS +GLOBAL +DEFAULT +8 sg2
-.* TLS +GLOBAL +DEFAULT +8 sg6
-.* TLS +GLOBAL +DEFAULT +8 sg7
diff --git a/ld/testsuite/ld-x86-64/tlspic2-nacl.rd b/ld/testsuite/ld-x86-64/tlspic2-nacl.rd
deleted file mode 100644
index d6082d6d3cc..00000000000
--- a/ld/testsuite/ld-x86-64/tlspic2-nacl.rd
+++ /dev/null
@@ -1,139 +0,0 @@
-#source: tlspic3.s
-#source: tlspic2.s
-#as: --64
-#ld: -shared -melf_x86_64_nacl --no-ld-generated-unwind-info
-#readelf: -WSsrl
-#target: x86_64-*-nacl*
-
-There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
-
-Section Headers:
- +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
- +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
- +\[[ 0-9]+\] .plt +.*
- +\[[ 0-9]+\] .text +PROGBITS +0+1000 [0-9a-f]+ 0+31a 00 +AX +0 +0 4096
- +\[[ 0-9]+\] .hash +.*
- +\[[ 0-9]+\] .dynsym +.*
- +\[[ 0-9]+\] .dynstr +.*
- +\[[ 0-9]+\] .rela.dyn +.*
- +\[[ 0-9]+\] .rela.plt +.*
- +\[[ 0-9]+\] .tdata +PROGBITS +0+10010458 [0-9a-f]+ 0+60 00 WAT +0 +0 +1
- +\[[ 0-9]+\] .tbss +NOBITS +0+100104b8 [0-9a-f]+ 0+20 00 WAT +0 +0 +1
- +\[[ 0-9]+\] .dynamic +DYNAMIC +0+100104b8 [0-9a-f]+ 0+130 10 +WA +5 +0 +8
- +\[[ 0-9]+\] .got +PROGBITS +0+100105e8 [0-9a-f]+ 0+98 08 +WA +0 +0 +8
- +\[[ 0-9]+\] .got.plt +PROGBITS +0+10010680 [0-9a-f]+ 0+20 08 +WA +0 +0 +8
- +\[[ 0-9]+\] .symtab +.*
- +\[[ 0-9]+\] .strtab +.*
- +\[[ 0-9]+\] .shstrtab +.*
-Key to Flags:
-#...
-
-Elf file type is DYN \(Shared object file\)
-Entry point 0x1000
-There are [0-9]+ program headers, starting at offset [0-9]+
-
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD +0x0+10000 0x0+ 0x0+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x10000
- +LOAD +0x0+ 0x0+10000000 0x0+10000000 0x0+458 0x0+458 R +0x10000
- +LOAD +0x0+458 0x0+10010458 0x0+10010458 0x0+248 0x0+248 RW +0x10000
- +DYNAMIC +0x0+4b8 0x0+100104b8 0x0+100104b8 0x0+130 0x0+130 RW +0x8
- +TLS +0x0+458 0x0+10010458 0x0+10010458 0x0+60 0x0+80 R +0x1
-
- Section to Segment mapping:
- +Segment Sections...
- +00 +.plt .text *
- +01 +.hash .dynsym .dynstr .rela.dyn .rela.plt *
- +02 +.tdata .dynamic .got .got.plt *
- +03 +.dynamic *
- +04 +.tdata .tbss *
-
-Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 15 entries:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f ]+R_X86_64_DTPMOD64 +0
-[0-9a-f ]+R_X86_64_TPOFF64 +24
-[0-9a-f ]+R_X86_64_TPOFF64 +30
-[0-9a-f ]+R_X86_64_DTPMOD64 +0
-[0-9a-f ]+R_X86_64_DTPMOD64 +0
-[0-9a-f ]+R_X86_64_TPOFF64 +64
-[0-9a-f ]+R_X86_64_TPOFF64 +50
-[0-9a-f ]+R_X86_64_TPOFF64 +70
-[0-9a-f ]+R_X86_64_DTPMOD64 +0
-[0-9a-f ]+R_X86_64_TPOFF64 +44
-[0-9a-f ]+R_X86_64_TPOFF64 +0+10 sg5 \+ 0
-[0-9a-f ]+R_X86_64_GLOB_DAT +0+ __tls_get_addr \+ 0
-[0-9a-f ]+R_X86_64_DTPMOD64 +0+ sg1 \+ 0
-[0-9a-f ]+R_X86_64_DTPOFF64 +0+ sg1 \+ 0
-[0-9a-f ]+R_X86_64_TPOFF64 +0+4 sg2 \+ 0
-
-Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entry:
- +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f ]+R_X86_64_JUMP_SLOT +0+ __tls_get_addr \+ 0
-
-Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
-.* NOTYPE +LOCAL +DEFAULT +UND *
-.* TLS +GLOBAL +DEFAULT +8 sg8
-.* TLS +GLOBAL +DEFAULT +8 sg3
-.* TLS +GLOBAL +DEFAULT +8 sg4
-.* TLS +GLOBAL +DEFAULT +8 sg5
-.* NOTYPE +GLOBAL +DEFAULT +UND __tls_get_addr
-.* TLS +GLOBAL +DEFAULT +8 sg1
-.* FUNC +GLOBAL +DEFAULT +2 fn1
-.* TLS +GLOBAL +DEFAULT +8 sg2
-.* TLS +GLOBAL +DEFAULT +8 sg6
-.* TLS +GLOBAL +DEFAULT +8 sg7
-
-Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
-.* NOTYPE +LOCAL +DEFAULT +UND *
-.* SECTION +LOCAL +DEFAULT +1 *
-.* SECTION +LOCAL +DEFAULT +2 *
-.* SECTION +LOCAL +DEFAULT +3 *
-.* SECTION +LOCAL +DEFAULT +4 *
-.* SECTION +LOCAL +DEFAULT +5 *
-.* SECTION +LOCAL +DEFAULT +6 *
-.* SECTION +LOCAL +DEFAULT +7 *
-.* SECTION +LOCAL +DEFAULT +8 *
-.* SECTION +LOCAL +DEFAULT +9 *
-.* SECTION +LOCAL +DEFAULT +10 *
-.* SECTION +LOCAL +DEFAULT +11 *
-.* SECTION +LOCAL +DEFAULT +12 *
-.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlspic3.o
-.* TLS +LOCAL +DEFAULT +8 sl1
-.* TLS +LOCAL +DEFAULT +8 sl2
-.* TLS +LOCAL +DEFAULT +8 sl3
-.* TLS +LOCAL +DEFAULT +8 sl4
-.* TLS +LOCAL +DEFAULT +8 sl5
-.* TLS +LOCAL +DEFAULT +8 sl6
-.* TLS +LOCAL +DEFAULT +8 sl7
-.* TLS +LOCAL +DEFAULT +8 sl8
-.* FILE +LOCAL +DEFAULT +ABS 
-.* TLS +LOCAL +DEFAULT +9 sH1
-.* OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
-.* TLS +LOCAL +DEFAULT +8 sh3
-.* TLS +LOCAL +DEFAULT +9 sH2
-.* TLS +LOCAL +DEFAULT +9 sH7
-.* TLS +LOCAL +DEFAULT +8 sh7
-.* TLS +LOCAL +DEFAULT +8 sh8
-.* TLS +LOCAL +DEFAULT +9 sH4
-.* TLS +LOCAL +DEFAULT +8 sh4
-.* TLS +LOCAL +DEFAULT +9 sH3
-.* TLS +LOCAL +DEFAULT +8 sh5
-.* TLS +LOCAL +DEFAULT +9 sH5
-.* TLS +LOCAL +DEFAULT +9 sH6
-.* TLS +LOCAL +DEFAULT +9 sH8
-.* TLS +LOCAL +DEFAULT +8 sh1
-.* OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_
-.* TLS +LOCAL +DEFAULT +8 sh2
-.* TLS +LOCAL +DEFAULT +8 sh6
-.* TLS +GLOBAL +DEFAULT +8 sg8
-.* TLS +GLOBAL +DEFAULT +8 sg3
-.* TLS +GLOBAL +DEFAULT +8 sg4
-.* TLS +GLOBAL +DEFAULT +8 sg5
-.* NOTYPE +GLOBAL +DEFAULT +UND __tls_get_addr
-.* TLS +GLOBAL +DEFAULT +8 sg1
-.* FUNC +GLOBAL +DEFAULT +2 fn1
-.* TLS +GLOBAL +DEFAULT +8 sg2
-.* TLS +GLOBAL +DEFAULT +8 sg6
-.* TLS +GLOBAL +DEFAULT +8 sg7
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 7e6a2c9804a..e687c42a695 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -22,18 +22,11 @@
 # Test x86_64 linking; all types of relocs.  This tests the assembler and
 # tools like objdump as well as the linker.
 
-if { !([istarget "x86_64-*-elf*"]
-       || [istarget "x86_64-*-nacl*"]
-       || [istarget "x86_64-*-linux*"]) } {
+if { !([istarget "x86_64-*-elf*"] || [istarget "x86_64-*-linux*"]) } {
     return
 }
 
-if [istarget "*-*-nacl*"] {
-    set emul "elf_x86_64_nacl"
-} else {
-    set emul "elf_x86_64"
-}
-
+set emul "elf_x86_64"
 set saved_ASFLAGS "$ASFLAGS"
 set ASFLAGS "$ASFLAGS -mx86-used-note=no"
 
@@ -230,38 +223,6 @@ set x86_64tests {
      "--64" { dummy.s } {} "pr20550"}
 }
 
-# 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*"] {
-    set emul elf_x86_64_nacl
-
-    set lhs {elf(32)?_(i386|x86_64)[[:>:]]}
-    set rhs {&_nacl}
-
-    # Change all the -melf_x86_64 to -melf_x86_64_nacl so linking can succeed.
-    regsub -all -- $lhs $x86_64tests $rhs x86_64tests
-
-    set zlhs {-z noseparate-code -z max-page-size=0x200000}
-    set zrhs {}
-
-    # Remove -z max-page-size=0x200000 -z noseparate-code since they
-    # generate different addresses for nacl targets.
-    regsub -all -- $zlhs $x86_64tests $zrhs x86_64tests
-
-    # Same, applied to all the run_dump_test cases.
-    set options_regsub(ld) [list $lhs $rhs]
-
-    # The section/segment layout differs too much for the vanilla
-    # readelf output files to match.  So massage the cases so that
-    # they refer to a foo-nacl.rd file instead of a foo.rd file.
-    regsub -all -- {([a-z0-9]+)\.rd} $x86_64tests {\1-nacl.rd} x86_64tests
-
-    # Likewise for PLTs.
-    regsub -all -- {([a-z0-9]+)\.pd} $x86_64tests {\1-nacl.pd} x86_64tests
-} else {
-    set emul elf_x86_64
-}
-
 run_ld_link_tests $x86_64tests
 
 set test_name "Mixed x86_64 and i386 input test 1"
@@ -335,7 +296,6 @@ run_dump_test "gotplt1"
 run_dump_test "pie1"
 run_dump_test "pie2"
 run_dump_test "pie3"
-run_dump_test "pie3-nacl"
 run_dump_test "pic1"
 run_dump_test "largecomm-1a"
 run_dump_test "largecomm-1b"
@@ -412,7 +372,6 @@ run_dump_test "property-x86-cet5b-x32"
 run_dump_test "property-x86-cet6"
 run_dump_test "property-x86-cet6-x32"
 run_dump_test "pr21884"
-run_dump_test "pr21884-nacl"
 run_dump_test "pr22071"
 run_dump_test "pr22115-1a"
 run_dump_test "pr22115-1a-x32"
@@ -473,7 +432,7 @@ run_dump_test "pr25416-3"
 run_dump_test "pr25416-4"
 run_dump_test "pr26018"
 
-if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
+if ![istarget "x86_64-*-linux*"] {
     return
 }
 
@@ -512,7 +471,6 @@ run_dump_test "ilp32-1"
 run_dump_test "ilp32-2"
 run_dump_test "ilp32-3"
 run_dump_test "ilp32-4"
-run_dump_test "ilp32-4-nacl"
 run_dump_test "ilp32-5"
 run_dump_test "ilp32-6"
 run_dump_test "ilp32-7"
@@ -564,10 +522,6 @@ run_dump_test "load1a"
 run_dump_test "load1b"
 run_dump_test "load1c"
 run_dump_test "load1d"
-run_dump_test "load1a-nacl"
-run_dump_test "load1b-nacl"
-run_dump_test "load1c-nacl"
-run_dump_test "load1d-nacl"
 run_dump_test "load2"
 run_dump_test "call1a"
 run_dump_test "call1b"
@@ -591,7 +545,6 @@ run_dump_test "ifunc-textrel-2b"
 run_dump_test "pr18815"
 run_dump_test "pr19013"
 run_dump_test "pr19013-x32"
-run_dump_test "pr19013-nacl"
 run_dump_test "pr19162"
 run_dump_test "pr19175"
 run_dump_test "pr18591"
@@ -610,7 +563,6 @@ run_dump_test "pr19636-2a"
 run_dump_test "pr19636-2b"
 run_dump_test "pr19636-2c"
 run_dump_test "pr19636-2d"
-run_dump_test "pr19636-2d-nacl"
 run_dump_test "pr19636-2e"
 run_dump_test "pr19636-2f"
 run_dump_test "pr19636-2g"
-- 
2.30.2