drop XC16x bits

Commit 04f096fb9e25 ("Move the xc16x target to the obsolete list") moved
the architecture from the "obsolete but still available" to the
"obsolete / support removed" list in config.bfd, making the architecture
impossible to enable (except maybe via "enable everything" options").

Note that I didn't touch */po/*.po{,t} on the assumption that these
would be updated by some (half)automatic means.

21 files changed, 3 insertions, 543 deletions

diff --git a/ld/Makefile.am b/ld/Makefile.am
index a3cd789184..d31021c13e 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -271,9 +271,6 @@ ALL_EMULATION_SOURCES = \
 	eelf32tilepro.c \
 	eelf32vax.c \
 	eelf32visium.c \
-	eelf32xc16x.c \
-	eelf32xc16xl.c \
-	eelf32xc16xs.c \
 	eelf32xstormy16.c \
 	eelf32xtensa.c \
 	eelf32z80.c \
@@ -765,9 +762,6 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32tilepro.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32vax.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32visium.Pc@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xc16x.Pc@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xc16xl.Pc@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xc16xs.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xstormy16.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xtensa.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32z80.Pc@am__quote@
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 58fdbe88b2..ee0c98f65b 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -768,9 +768,6 @@ ALL_EMULATION_SOURCES = \
 	eelf32tilepro.c \
 	eelf32vax.c \
 	eelf32visium.c \
-	eelf32xc16x.c \
-	eelf32xc16xl.c \
-	eelf32xc16xs.c \
 	eelf32xstormy16.c \
 	eelf32xtensa.c \
 	eelf32z80.c \
@@ -1407,9 +1404,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32tilepro.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32vax.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32visium.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xc16x.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xc16xl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xc16xs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xstormy16.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xtensa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32z80.Po@am__quote@
@@ -2434,9 +2428,6 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32tilepro.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32vax.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32visium.Pc@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xc16x.Pc@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xc16xl.Pc@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xc16xs.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xstormy16.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xtensa.Pc@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32z80.Pc@am__quote@
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 66b8155045..7af33b2248 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -1021,9 +1021,6 @@ x86_64-*-mingw*)	targ_emul=i386pep ;
 			targ_extra_emuls=i386pe
 			targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o"
 			;;
-xc16x-*-elf)		targ_emul=elf32xc16x
-			targ_extra_emuls="elf32xc16xl elf32xc16xs"
-			;;
 xgate-*-*)		targ_emul=xgateelf
 			targ_extra_ofiles=ldelfgen.o
 			;;
diff --git a/ld/emulparams/elf32xc16x.sh b/ld/emulparams/elf32xc16x.sh
deleted file mode 100644
index 1f89529be6..0000000000
--- a/ld/emulparams/elf32xc16x.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_NAME=elf32xc16x
-TEMPLATE_NAME=elf
-OUTPUT_FORMAT="elf32-xc16x"
-TEXT_START_ADDR=0x00400
-ARCH=xc16x
-MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-ENTRY=_start
-EMBEDDED=yes
diff --git a/ld/emulparams/elf32xc16xl.sh b/ld/emulparams/elf32xc16xl.sh
deleted file mode 100644
index 98ee128ce3..0000000000
--- a/ld/emulparams/elf32xc16xl.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_NAME=elf32xc16xl
-TEMPLATE_NAME=elf
-OUTPUT_FORMAT="elf32-xc16x"
-TEXT_START_ADDR=0xc00300
-ARCH=xc16x:xc16xl
-MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-ENTRY=_start
-EMBEDDED=yes
diff --git a/ld/emulparams/elf32xc16xs.sh b/ld/emulparams/elf32xc16xs.sh
deleted file mode 100644
index 9c6628f964..0000000000
--- a/ld/emulparams/elf32xc16xs.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-SCRIPT_NAME=elf32xc16xs
-TEMPLATE_NAME=elf
-OUTPUT_FORMAT="elf32-xc16x"
-TEXT_START_ADDR=0xc00300
-ARCH=xc16x:xc16xs
-MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-ENTRY=_start
-EMBEDDED=yes
diff --git a/ld/po/BLD-POTFILES.in b/ld/po/BLD-POTFILES.in
index f2703a396a..7264447814 100644
--- a/ld/po/BLD-POTFILES.in
+++ b/ld/po/BLD-POTFILES.in
@@ -160,9 +160,6 @@ eelf32tilegx_be.c
 eelf32tilepro.c
 eelf32vax.c
 eelf32visium.c
-eelf32xc16x.c
-eelf32xc16xl.c
-eelf32xc16xs.c
 eelf32xstormy16.c
 eelf32xtensa.c
 eelf32z80.c
diff --git a/ld/scripttempl/elf32xc16x.sc b/ld/scripttempl/elf32xc16x.sc
deleted file mode 100644
index 37068565cd..0000000000
--- a/ld/scripttempl/elf32xc16x.sc
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (C) 2014-2022 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-cat <<EOF
-/* Copyright (C) 2014-2022 Free Software Foundation, Inc.
-
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(${ARCH})
-EOF
-
-test -n "${RELOCATING}" && cat <<EOF
-ENTRY ("_start")
-MEMORY
-{
-
-	vectarea : o =0x00000, l = 0x0300
-
-	introm    : o = 0x00400, l = 0x16000
-	/* The stack starts at the top of main ram.  */
-
-	dram   : o = 0x8000 , l = 0xffff
-	/* At the very top of the address space is the 8-bit area.  */
-
-	ldata  : o =0x4000 ,l = 0x0200
-}
-
-EOF
-
-cat <<EOF
-SECTIONS
-{
-.init :
-	{
-	  KEEP (*(SORT_NONE(.init)))
-	  ${RELOCATING+KEEP (*(SORT_NONE(.fini)))}
-	} ${RELOCATING+ >introm}
-
-.text :
-	{
-	  ${RELOCATING+*(.rodata)}
-	  ${RELOCATING+*(.text.*)}
-	  *(.text)
-	  ${RELOCATING+ _etext = . ; }
-	} ${RELOCATING+ > introm}
-.data :
-	{
-	  *(.data)
-	  ${RELOCATING+*(.data.*)}
-
-	  ${RELOCATING+ _edata = . ; }
-	} ${RELOCATING+ > dram}
-
-.bss :
-	{
-	  ${RELOCATING+ _bss_start = . ;}
-	  *(.bss)
-	  ${RELOCATING+*(COMMON)}
-	  ${RELOCATING+ _end = . ;  }
-	} ${RELOCATING+ > dram}
-
-.ldata :
-	{
-	  *(.ldata)
-	} ${RELOCATING+ > ldata}
-
-
-.vects :
-	{
-	  *(.vects)
-	} ${RELOCATING+ > vectarea}
-
-}
-EOF
diff --git a/ld/scripttempl/elf32xc16xl.sc b/ld/scripttempl/elf32xc16xl.sc
deleted file mode 100644
index 7f54aa3fb8..0000000000
--- a/ld/scripttempl/elf32xc16xl.sc
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (C) 2014-2022 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-cat <<EOF
-/* Copyright (C) 2014-2022 Free Software Foundation, Inc.
-
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(${ARCH})
-EOF
-
-test -n "${RELOCATING}" && cat <<EOF
-ENTRY ("_start")
-MEMORY
-{
-	vectarea : o =0xc00000, l = 0x0300
-
-	introm    : o = 0xc00300, l = 0x16000
-	/* The stack starts at the top of main ram.  */
-
-	dram   : o = 0x8000 , l = 0xffff
-	/* At the very top of the address space is the 8-bit area.  */
-
-	ldata	: o =0x4000 ,l = 0x0200
-}
-EOF
-
-cat <<EOF
-SECTIONS
-{
-/*.vects :
-	{
-	  *(.vects)
-	} ${RELOCATING+ > vectarea} */
-.init :
-	{
-	  KEEP (*(SORT_NONE(.init)))
-	  ${RELOCATING+KEEP (*(SORT_NONE(.fini)))}
-	} ${RELOCATING+ >introm}
-
-.text :
-	{
-	  ${RELOCATING+*(.rodata)}
-	  ${RELOCATING+*(.text.*)}
-	  *(.text)
-	  ${RELOCATING+ _etext = . ; }
-	} ${RELOCATING+ > introm}
-.data :
-	{
-	  *(.data)
-	  ${RELOCATING+*(.data.*)}
-
-	  ${RELOCATING+ _edata = . ; }
-	} ${RELOCATING+ > dram}
-
-.bss :
-	{
-	  ${RELOCATING+ _bss_start = . ;}
-	  *(.bss)
-	  ${RELOCATING+*(COMMON)}
-	  ${RELOCATING+ _end = . ;  }
-	} ${RELOCATING+ > dram}
-
-.ldata :
-	{
-	  *(.ldata)
-	} ${RELOCATING+ > ldata}
-
-.vects :
-	{
-	  *(.vects)
-	} ${RELOCATING+ > vectarea}
-}
-EOF
diff --git a/ld/scripttempl/elf32xc16xs.sc b/ld/scripttempl/elf32xc16xs.sc
deleted file mode 100644
index 58f14cf51e..0000000000
--- a/ld/scripttempl/elf32xc16xs.sc
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright (C) 2014-2022 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-cat <<EOF
-/* Copyright (C) 2014-2022 Free Software Foundation, Inc.
-
-   Copying and distribution of this script, with or without modification,
-   are permitted in any medium without royalty provided the copyright
-   notice and this notice are preserved.  */
-
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
-OUTPUT_ARCH(${ARCH})
-EOF
-
-test -n "${RELOCATING}" && cat <<EOF
-ENTRY ("_start")
-MEMORY
-{
-	vectarea : o =0xc00000, l = 0x0300
-
-	introm    : o = 0xc00300, l = 0x16000
-	/* The stack starts at the top of main ram.  */
-
-	dram   : o = 0x8000 , l = 0xffff
-	/* At the very top of the address space is the 8-bit area.  */
-
-	ldata	: o =0x4000 ,l = 0x0200
-}
-
-EOF
-
-cat <<EOF
-SECTIONS
-{
-/*.vects :
-	{
-	  *(.vects)
-	} ${RELOCATING+ > vectarea} */
-.init :
-	{
-	  KEEP (*(SORT_NONE(.init)))
-	  ${RELOCATING+KEEP (*(SORT_NONE(.fini)))}
-	} ${RELOCATING+ >introm}
-
-.text :
-	{
-	  ${RELOCATING+*(.rodata)}
-	  ${RELOCATING+*(.text.*)}
-	  *(.text)
-	  ${RELOCATING+ _etext = . ; }
-	} ${RELOCATING+ > introm}
-.data :
-	{
-	  *(.data)
-	  ${RELOCATING+*(.data.*)}
-
-	  ${RELOCATING+ _edata = . ; }
-	} ${RELOCATING+ > dram}
-
-.bss :
-	{
-	  ${RELOCATING+ _bss_start = . ;}
-	  *(.bss)
-	  ${RELOCATING+*(COMMON)}
-	  ${RELOCATING+ _end = . ;  }
-	} ${RELOCATING+ > dram}
-
-.ldata :
-	{
-	  *(.ldata)
-	} ${RELOCATING+ > ldata}
-
-.vects :
-	{
-	  *(.vects)
-	} ${RELOCATING+ > vectarea}
-}
-EOF
diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index c73c2a8154..473349dd0b 100644
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -99,7 +99,6 @@ if [is_elf64 tmpdir/symbol3w.a] {
 	 || [istarget h8300-*-*]
 	 || [istarget ip2k-*-*]
 	 || [istarget m68hc11-*]
-	 || [istarget "xc16x-*"]
 	 || [istarget "z80-*-*"] } {
 	set pr25490_2_exp "pr25490-2-16.rd"
 	set pr25490_3_exp "pr25490-3-16.rd"
diff --git a/ld/testsuite/ld-elf/pr22450.d b/ld/testsuite/ld-elf/pr22450.d
index 08905aabbd..f24da98795 100644
--- a/ld/testsuite/ld-elf/pr22450.d
+++ b/ld/testsuite/ld-elf/pr22450.d
@@ -1,9 +1,9 @@
 #source: pr22450.s
 #readelf: --notes --wide
 #ld: -r
-#xfail: avr-*-* crx-*-* h8300-*-* ip2k-*-* m68hc11-*-* xc16x-*-* z80-*-*
+#xfail: avr-*-* crx-*-* h8300-*-* ip2k-*-* m68hc11-*-* z80-*-*
 # Fails on H8300 because it does not generate the correct relocs for the size fields.
-# Fails on AVR, IP2K, M68HC11, XC16C because the assembler does not calculate the correct values for the differences of local symbols.
+# Fails on AVR, IP2K, and M68HC11 because the assembler does not calculate the correct values for the differences of local symbols.
 # Fails on CRX because readelf does not know how to apply CRX reloc number 20 (R_CRX_SWITCH32).
 
 #...
diff --git a/ld/testsuite/ld-elf/pr23658-1a.d b/ld/testsuite/ld-elf/pr23658-1a.d
index 0757cc40a2..10c6ef3973 100644
--- a/ld/testsuite/ld-elf/pr23658-1a.d
+++ b/ld/testsuite/ld-elf/pr23658-1a.d
@@ -10,7 +10,7 @@
 #xfail: [uses_genelf]
 #xfail: m68hc12-*
 # The following targets don't support --build-id.
-#xfail: cr16-* crx-* visium-* xc16x-*
+#xfail: cr16-* crx-* visium-*
 # The following targets place .note.gnu.build-id in unusual places.
 #xfail: pru-*
 
diff --git a/ld/testsuite/ld-xc16x/absrel.d b/ld/testsuite/ld-xc16x/absrel.d
deleted file mode 100644
index a6941c226a..0000000000
--- a/ld/testsuite/ld-xc16x/absrel.d
+++ /dev/null
@@ -1,28 +0,0 @@
-
-.*:     file format elf32-xc16x
-
-Disassembly of section .text:
-
-00000400 <_start>:
- 400:	e0 f5       	mov r5,#0xf
- 402:	e0 f6       	mov r6,#0xf
-
-00000404 <.12>:
- 404:	f2 f5 1c 04 	mov r5,0x41c
- 408:	e0 d6       	mov r6,#0xd
- 40a:	f2 f7 1c 04 	mov r7,0x41c
- 40e:	e0 d8       	mov r8,#0xd
-
-00000410 <.13>:
- 410:	f2 f5 1c 04 	mov r5,0x41c
- 414:	e0 f6       	mov r6,#0xf
- 416:	f2 f7 1c 04 	mov r7,0x41c
- 41a:	e0 f8       	mov r8,#0xf
-
-0000041c <.end>:
-.*:	ca 09 04 04 	calla- cc_nusr0,404 <.12>
-.*:	ca 19 04 04 	calla- cc_nusr1,404 <.12>
-.*:	ca 29 04 04 	calla- cc_usr0,404 <.12>
-.*:	ea 09 04 04 	jmpa- cc_nusr0,404 <.12>
-.*:	ea 19 04 04 	jmpa- cc_nusr1,404 <.12>
-.*:	ea 29 04 04 	jmpa- cc_usr0,404 <.12>
diff --git a/ld/testsuite/ld-xc16x/absrel.s b/ld/testsuite/ld-xc16x/absrel.s
deleted file mode 100644
index 3bfe70e12c..0000000000
--- a/ld/testsuite/ld-xc16x/absrel.s
+++ /dev/null
@@ -1,31 +0,0 @@
-	.global _start
-_start:
-	mov r5,#0xf
-	mov r6,#0xf
-
-.12:
-	mov r5,.end
-	mov r6,#0xd
-	mov r7,.end
-	mov r8,#0xd
-.13:
-	mov r5,.end
-	mov r6,#0xf
-	mov r7,.end
-	mov r8,#0xf
-.end:
-	;calla cc_UC,.13
-	;calla cc_usr1,.12
-
-	;calla+ cc_UGT,.12
-	calla- cc_nusr0,.12
-	calla- cc_nusr1,.12
-	calla- cc_usr0,.12
-
-	;jmpa cc_UGT,.end
-	;jmpa cc_nusr0,.end
-
-	;jmpa+ cc_UGT,.12
-	jmpa- cc_nusr0,.12
-	jmpa- cc_nusr1,.12
-	jmpa- cc_usr0,.12
diff --git a/ld/testsuite/ld-xc16x/offset.d b/ld/testsuite/ld-xc16x/offset.d
deleted file mode 100644
index a879c44326..0000000000
--- a/ld/testsuite/ld-xc16x/offset.d
+++ /dev/null
@@ -1,18 +0,0 @@
-
-.*:     file format elf32-xc16x
-
-Disassembly of section .text:
-
-00000400 <_start>:
- 400:	e0 f8       	mov r8,#0xf
- 402:	fa 00 08 04 	jmps #seg:0x0,#sof:0x408
- 406:	e0 f9       	mov r9,#0xf
-
-00000408 <.12>:
- 408:	e0 f5       	mov r5,#0xf
- 40a:	e0 f7       	mov r7,#0xf
- 40c:	da 00 10 04 	calls #seg:0x0,#sof:0x410
-
-00000410 <.13>:
- 410:	e0 f6       	mov r6,#0xf
- 412:	e0 f8       	mov r8,#0xf
diff --git a/ld/testsuite/ld-xc16x/offset.s b/ld/testsuite/ld-xc16x/offset.s
deleted file mode 100644
index b3aad190de..0000000000
--- a/ld/testsuite/ld-xc16x/offset.s
+++ /dev/null
@@ -1,13 +0,0 @@
-	.global _start
-_start:
-	mov r8,#0xf
-	jmps #seg:.12,#sof:.12
-	mov r9,#0xf
-.12:
-	mov r5,#0xf
-	mov r7,#0xf
-	calls #seg:.13,#sof:.13
-.13:
-	mov r6,#0xf
-	mov r8,#0xf
-	
\ No newline at end of file
diff --git a/ld/testsuite/ld-xc16x/pcreloc.d b/ld/testsuite/ld-xc16x/pcreloc.d
deleted file mode 100644
index 8f363b5f45..0000000000
--- a/ld/testsuite/ld-xc16x/pcreloc.d
+++ /dev/null
@@ -1,34 +0,0 @@
-
-.*:     file format elf32-xc16x
-
-Disassembly of section .text:
-
-00000400 <_start>:
- 400:	e0 f5       	mov r5,#0xf
- 402:	e0 f6       	mov r6,#0xf
- 404:	e0 f7       	mov r7,#0xf
- 406:	e0 f8       	mov r8,#0xf
- 408:	e0 f9       	mov r9,#0xf
- 40a:	e0 fa       	mov r10,#0xf
- 40c:	e0 fb       	mov r11,#0xf
- 40e:	e0 fc       	mov r12,#0xf
-
-00000410 <.12>:
- 410:	2d 07       	jmpr cc_Z,7
- 412:	3d fe       	jmpr cc_NZ,254
- 414:	8d fd       	jmpr cc_ULT,253
- 416:	8d 45       	jmpr cc_ULT,69
- 418:	9d 06       	jmpr cc_UGE,6
- 41a:	0d 05       	jmpr cc_UC,5
- 41c:	2d 04       	jmpr cc_Z,4
- 41e:	3d 03       	jmpr cc_NZ,3
-
-00000420 <.13>:
- 420:	fd 02       	jmpr cc_ULE,2
- 422:	dd 01       	jmpr cc_SGE,1
- 424:	bd 00       	jmpr cc_SLE,0
-
-00000426 <.end>:
- 426:	1d f4       	jmpr cc_NET,244
- 428:	bb fe       	callr 254
- 42a:	bb fd       	callr 253
diff --git a/ld/testsuite/ld-xc16x/pcreloc.s b/ld/testsuite/ld-xc16x/pcreloc.s
deleted file mode 100644
index ed77101dc5..0000000000
--- a/ld/testsuite/ld-xc16x/pcreloc.s
+++ /dev/null
@@ -1,27 +0,0 @@
-	.global _start
-_start:
-	mov r5,#0xf
-	mov r6,#0xf
-	mov r7,#0xf
-	mov r8,#0xf
-	mov r9,#0xf
-	mov r10,#0xf
-	mov r11,#0xf
-	mov r12,#0xf
-.12:
-	jmpr cc_Z,.13
-	jmpr cc_NZ,.12
-	jmpr cc_C,.12
-	jmpr cc_C,0x45
-	jmpr cc_NC,.end
-	jmpr cc_UC,.end
-	jmpr cc_EQ,.end
-	jmpr cc_NE,.end
-.13:
-	jmpr cc_ULE,.end
-	jmpr cc_SGE,.end
-	jmpr cc_SLE,.end
-.end:
-	jmpr cc_NET,.12
-	callr .end
-	callr .end
diff --git a/ld/testsuite/ld-xc16x/pcrelocl.d b/ld/testsuite/ld-xc16x/pcrelocl.d
deleted file mode 100644
index 48d9c8289e..0000000000
--- a/ld/testsuite/ld-xc16x/pcrelocl.d
+++ /dev/null
@@ -1,34 +0,0 @@
-
-.*:     file format elf32-xc16x
-
-Disassembly of section .text:
-
-00c00300 <_start>:
-  c00300:	e0 f5       	mov r5,#0xf
-  c00302:	e0 f6       	mov r6,#0xf
-  c00304:	e0 f7       	mov r7,#0xf
-  c00306:	e0 f8       	mov r8,#0xf
-  c00308:	e0 f9       	mov r9,#0xf
-  c0030a:	e0 fa       	mov r10,#0xf
-  c0030c:	e0 fb       	mov r11,#0xf
-  c0030e:	e0 fc       	mov r12,#0xf
-
-00c00310 <.12>:
-  c00310:	2d 07       	jmpr cc_Z,7
-  c00312:	3d fe       	jmpr cc_NZ,254
-  c00314:	8d fd       	jmpr cc_ULT,253
-  c00316:	8d 45       	jmpr cc_ULT,69
-  c00318:	9d 06       	jmpr cc_UGE,6
-  c0031a:	0d 05       	jmpr cc_UC,5
-  c0031c:	2d 04       	jmpr cc_Z,4
-  c0031e:	3d 03       	jmpr cc_NZ,3
-
-00c00320 <.13>:
-  c00320:	fd 02       	jmpr cc_ULE,2
-  c00322:	dd 01       	jmpr cc_SGE,1
-  c00324:	bd 00       	jmpr cc_SLE,0
-
-00c00326 <.end>:
-  c00326:	1d f4       	jmpr cc_NET,244
-  c00328:	bb fe       	callr 254
-  c0032a:	bb fd       	callr 253
diff --git a/ld/testsuite/ld-xc16x/xc16x.exp b/ld/testsuite/ld-xc16x/xc16x.exp
deleted file mode 100644
index 5ef612c80f..0000000000
--- a/ld/testsuite/ld-xc16x/xc16x.exp
+++ /dev/null
@@ -1,68 +0,0 @@
-# Expect script for ld-xstormy16 tests
-#   Copyright (C) 2003-2022 Free Software Foundation, Inc.
-#
-# This file is part of the GNU Binutils.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-# MA 02110-1301, USA.
-#
-
-# Test xc16x linking of pc-relative relocs.  This tests the assembler and
-# tools like objdump as well as the linker.
-
-if {!([istarget "xc16x*-*-*"]) } {
-    return
-}
-
-# Set up a list as described in ld-lib.exp
-
-set xc16x_tests {
-    {   
-	"xc16x pc-relative relocs linker test"
-	"" ""
-	""
-	{ "pcreloc.s" }
-	{ {objdump -Dz pcreloc.d} } 	
-	"pcreloc"
-    }
-}
-
-set xc16xabs_tests {
-    {   
-	"xc16x absolute relative address linker test"
-	"" ""
-	""
-	{ "absrel.s" }
-	{ {objdump -Dz absrel.d} } 	
-	"absrel"
-    }
-}
-
-set xc16xoffset_tests {
-    {   
-	"xc16x offset linker test"
-	"" ""
-	""
-	{ "offset.s" }
-	{ {objdump -Dz offset.d} } 	
-	"offset"
-    }
-}
-
- run_ld_link_tests $xc16x_tests
- run_ld_link_tests $xc16xabs_tests
- run_ld_link_tests $xc16xoffset_tests
-
-