diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2d7a978..1f72a24 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,18 @@
 2017-10-16  Yao Qi  <yao.qi@linaro.org>
 
+	* features/Makefile (XMLTOC): Remove tic6x-*.xml.
+	* features/tic6x-c62x.c: Remove.
+	* features/tic6x-c64x-linux.c: Remove.
+	* features/tic6x-c64x.c: Remove.
+	* features/tic6x-c64xp-linux.c: Remove.
+	* features/tic6x-c64xp.c: Remove.
+	* tic6x-linux-tdep.c (_initialize_tic6x_linux_tdep): Don't call
+	initialize_tdesc_tic6x_*_linux functions.
+	* tic6x-tdep.c (_initialize_tic6x_tdep): Don't call
+	initialize_tdesc_tic6x_* functions.
+
+2017-10-16  Yao Qi  <yao.qi@linaro.org>
+
 	* features/Makefile (WHICH): Remove tic6x-c64xp, tic6x-c64x
 	tic6x-c62x.
 	* regformats/tic6x-c62x.dat: Remove.
diff --git a/gdb/features/Makefile b/gdb/features/Makefile
index a2d39aa..2d8e3fe 100644
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -188,13 +188,7 @@ XMLTOC = \
 	s390x-tevx-linux64.xml \
 	s390x-vx-linux64.xml \
 	s390-gs-linux64.xml \
-	s390x-gs-linux64.xml \
-	tic6x-c62x-linux.xml \
-	tic6x-c62x.xml \
-	tic6x-c64x-linux.xml \
-	tic6x-c64x.xml \
-	tic6x-c64xp-linux.xml \
-	tic6x-c64xp.xml
+	s390x-gs-linux64.xml
 
 TDESC_CFILES = $(patsubst %.xml,%.c,$(XMLTOC))
 GDB = false
diff --git a/gdb/features/tic6x-c62x.c b/gdb/features/tic6x-c62x.c
deleted file mode 100644
index 7dbf615..0000000
--- a/gdb/features/tic6x-c62x.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
-  Original: tic6x-c62x.xml */
-
-#include "defs.h"
-#include "osabi.h"
-#include "target-descriptions.h"
-
-struct target_desc *tdesc_tic6x_c62x;
-static void
-initialize_tdesc_tic6x_c62x (void)
-{
-  struct target_desc *result = allocate_target_description ();
-  set_tdesc_architecture (result, bfd_scan_arch ("tic6x"));
-
-  struct tdesc_feature *feature;
-
-  feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.core");
-  tdesc_create_reg (feature, "A0", 0, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A1", 1, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A2", 2, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A3", 3, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A4", 4, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A5", 5, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A6", 6, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A7", 7, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A8", 8, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A9", 9, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A10", 10, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A11", 11, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A12", 12, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A13", 13, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A14", 14, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A15", 15, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B0", 16, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B1", 17, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B2", 18, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B3", 19, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B4", 20, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B5", 21, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B6", 22, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B7", 23, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B8", 24, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B9", 25, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B10", 26, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B11", 27, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B12", 28, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B13", 29, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B14", 30, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B15", 31, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "CSR", 32, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "PC", 33, 1, NULL, 32, "code_ptr");
-
-  tdesc_tic6x_c62x = result;
-}
diff --git a/gdb/features/tic6x-c64x-linux.c b/gdb/features/tic6x-c64x-linux.c
deleted file mode 100644
index b52048f..0000000
--- a/gdb/features/tic6x-c64x-linux.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
-  Original: tic6x-c64x-linux.xml */
-
-#include "defs.h"
-#include "osabi.h"
-#include "target-descriptions.h"
-
-struct target_desc *tdesc_tic6x_c64x_linux;
-static void
-initialize_tdesc_tic6x_c64x_linux (void)
-{
-  struct target_desc *result = allocate_target_description ();
-  set_tdesc_architecture (result, bfd_scan_arch ("tic6x"));
-
-  set_tdesc_osabi (result, osabi_from_tdesc_string ("GNU/Linux"));
-
-  struct tdesc_feature *feature;
-
-  feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.core");
-  tdesc_create_reg (feature, "A0", 0, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A1", 1, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A2", 2, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A3", 3, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A4", 4, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A5", 5, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A6", 6, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A7", 7, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A8", 8, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A9", 9, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A10", 10, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A11", 11, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A12", 12, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A13", 13, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A14", 14, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A15", 15, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B0", 16, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B1", 17, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B2", 18, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B3", 19, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B4", 20, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B5", 21, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B6", 22, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B7", 23, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B8", 24, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B9", 25, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B10", 26, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B11", 27, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B12", 28, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B13", 29, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B14", 30, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B15", 31, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "CSR", 32, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "PC", 33, 1, NULL, 32, "code_ptr");
-
-  feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.gp");
-  tdesc_create_reg (feature, "A16", 34, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A17", 35, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A18", 36, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A19", 37, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A20", 38, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A21", 39, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A22", 40, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A23", 41, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A24", 42, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A25", 43, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A26", 44, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A27", 45, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A28", 46, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A29", 47, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A30", 48, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A31", 49, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B16", 50, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B17", 51, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B18", 52, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B19", 53, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B20", 54, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B21", 55, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B22", 56, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B23", 57, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B24", 58, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B25", 59, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B26", 60, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B27", 61, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B28", 62, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B29", 63, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B30", 64, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B31", 65, 1, NULL, 32, "uint32");
-
-  tdesc_tic6x_c64x_linux = result;
-}
diff --git a/gdb/features/tic6x-c64x.c b/gdb/features/tic6x-c64x.c
deleted file mode 100644
index 618f802..0000000
--- a/gdb/features/tic6x-c64x.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
-  Original: tic6x-c64x.xml */
-
-#include "defs.h"
-#include "osabi.h"
-#include "target-descriptions.h"
-
-struct target_desc *tdesc_tic6x_c64x;
-static void
-initialize_tdesc_tic6x_c64x (void)
-{
-  struct target_desc *result = allocate_target_description ();
-  set_tdesc_architecture (result, bfd_scan_arch ("tic6x"));
-
-  struct tdesc_feature *feature;
-
-  feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.core");
-  tdesc_create_reg (feature, "A0", 0, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A1", 1, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A2", 2, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A3", 3, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A4", 4, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A5", 5, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A6", 6, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A7", 7, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A8", 8, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A9", 9, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A10", 10, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A11", 11, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A12", 12, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A13", 13, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A14", 14, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A15", 15, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B0", 16, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B1", 17, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B2", 18, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B3", 19, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B4", 20, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B5", 21, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B6", 22, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B7", 23, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B8", 24, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B9", 25, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B10", 26, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B11", 27, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B12", 28, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B13", 29, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B14", 30, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B15", 31, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "CSR", 32, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "PC", 33, 1, NULL, 32, "code_ptr");
-
-  feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.gp");
-  tdesc_create_reg (feature, "A16", 34, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A17", 35, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A18", 36, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A19", 37, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A20", 38, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A21", 39, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A22", 40, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A23", 41, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A24", 42, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A25", 43, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A26", 44, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A27", 45, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A28", 46, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A29", 47, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A30", 48, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A31", 49, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B16", 50, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B17", 51, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B18", 52, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B19", 53, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B20", 54, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B21", 55, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B22", 56, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B23", 57, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B24", 58, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B25", 59, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B26", 60, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B27", 61, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B28", 62, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B29", 63, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B30", 64, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B31", 65, 1, NULL, 32, "uint32");
-
-  tdesc_tic6x_c64x = result;
-}
diff --git a/gdb/features/tic6x-c64xp-linux.c b/gdb/features/tic6x-c64xp-linux.c
deleted file mode 100644
index ca8c505..0000000
--- a/gdb/features/tic6x-c64xp-linux.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
-  Original: tic6x-c64xp-linux.xml */
-
-#include "defs.h"
-#include "osabi.h"
-#include "target-descriptions.h"
-
-struct target_desc *tdesc_tic6x_c64xp_linux;
-static void
-initialize_tdesc_tic6x_c64xp_linux (void)
-{
-  struct target_desc *result = allocate_target_description ();
-  set_tdesc_architecture (result, bfd_scan_arch ("tic6x"));
-
-  set_tdesc_osabi (result, osabi_from_tdesc_string ("GNU/Linux"));
-
-  struct tdesc_feature *feature;
-
-  feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.core");
-  tdesc_create_reg (feature, "A0", 0, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A1", 1, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A2", 2, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A3", 3, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A4", 4, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A5", 5, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A6", 6, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A7", 7, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A8", 8, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A9", 9, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A10", 10, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A11", 11, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A12", 12, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A13", 13, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A14", 14, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A15", 15, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B0", 16, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B1", 17, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B2", 18, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B3", 19, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B4", 20, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B5", 21, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B6", 22, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B7", 23, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B8", 24, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B9", 25, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B10", 26, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B11", 27, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B12", 28, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B13", 29, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B14", 30, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B15", 31, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "CSR", 32, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "PC", 33, 1, NULL, 32, "code_ptr");
-
-  feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.gp");
-  tdesc_create_reg (feature, "A16", 34, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A17", 35, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A18", 36, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A19", 37, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A20", 38, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A21", 39, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A22", 40, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A23", 41, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A24", 42, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A25", 43, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A26", 44, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A27", 45, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A28", 46, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A29", 47, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A30", 48, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A31", 49, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B16", 50, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B17", 51, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B18", 52, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B19", 53, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B20", 54, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B21", 55, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B22", 56, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B23", 57, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B24", 58, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B25", 59, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B26", 60, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B27", 61, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B28", 62, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B29", 63, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B30", 64, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B31", 65, 1, NULL, 32, "uint32");
-
-  feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.c6xp");
-  tdesc_create_reg (feature, "TSR", 66, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "ILC", 67, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "RILC", 68, 1, NULL, 32, "uint32");
-
-  tdesc_tic6x_c64xp_linux = result;
-}
diff --git a/gdb/features/tic6x-c64xp.c b/gdb/features/tic6x-c64xp.c
deleted file mode 100644
index 4ca5125..0000000
--- a/gdb/features/tic6x-c64xp.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
-  Original: tic6x-c64xp.xml */
-
-#include "defs.h"
-#include "osabi.h"
-#include "target-descriptions.h"
-
-struct target_desc *tdesc_tic6x_c64xp;
-static void
-initialize_tdesc_tic6x_c64xp (void)
-{
-  struct target_desc *result = allocate_target_description ();
-  set_tdesc_architecture (result, bfd_scan_arch ("tic6x"));
-
-  struct tdesc_feature *feature;
-
-  feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.core");
-  tdesc_create_reg (feature, "A0", 0, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A1", 1, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A2", 2, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A3", 3, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A4", 4, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A5", 5, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A6", 6, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A7", 7, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A8", 8, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A9", 9, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A10", 10, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A11", 11, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A12", 12, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A13", 13, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A14", 14, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A15", 15, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B0", 16, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B1", 17, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B2", 18, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B3", 19, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B4", 20, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B5", 21, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B6", 22, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B7", 23, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B8", 24, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B9", 25, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B10", 26, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B11", 27, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B12", 28, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B13", 29, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B14", 30, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B15", 31, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "CSR", 32, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "PC", 33, 1, NULL, 32, "code_ptr");
-
-  feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.gp");
-  tdesc_create_reg (feature, "A16", 34, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A17", 35, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A18", 36, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A19", 37, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A20", 38, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A21", 39, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A22", 40, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A23", 41, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A24", 42, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A25", 43, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A26", 44, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A27", 45, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A28", 46, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A29", 47, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A30", 48, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "A31", 49, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B16", 50, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B17", 51, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B18", 52, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B19", 53, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B20", 54, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B21", 55, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B22", 56, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B23", 57, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B24", 58, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B25", 59, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B26", 60, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B27", 61, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B28", 62, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B29", 63, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B30", 64, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "B31", 65, 1, NULL, 32, "uint32");
-
-  feature = tdesc_create_feature (result, "org.gnu.gdb.tic6x.c6xp");
-  tdesc_create_reg (feature, "TSR", 66, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "ILC", 67, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "RILC", 68, 1, NULL, 32, "uint32");
-
-  tdesc_tic6x_c64xp = result;
-}
diff --git a/gdb/tic6x-linux-tdep.c b/gdb/tic6x-linux-tdep.c
index 1a03a29..5b5598b 100644
--- a/gdb/tic6x-linux-tdep.c
+++ b/gdb/tic6x-linux-tdep.c
@@ -27,10 +27,6 @@
 #include "elf-bfd.h"
 #include "elf/tic6x.h"
 
-#include "features/tic6x-c64xp-linux.c"
-#include "features/tic6x-c64x-linux.c"
-#include "features/tic6x-c62x-linux.c"
-
 /* The offset from rt_sigframe pointer to SP register.  */
 #define TIC6X_SP_RT_SIGFRAME 8
 /* Size of struct siginfo info.  */
@@ -212,8 +208,4 @@ _initialize_tic6x_linux_tdep (void)
 {
   gdbarch_register_osabi (bfd_arch_tic6x, 0, GDB_OSABI_LINUX,
 			  tic6x_uclinux_init_abi);
-
-  initialize_tdesc_tic6x_c64xp_linux ();
-  initialize_tdesc_tic6x_c64x_linux ();
-  initialize_tdesc_tic6x_c62x_linux ();
 }
diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c
index aff95b6..f477f38 100644
--- a/gdb/tic6x-tdep.c
+++ b/gdb/tic6x-tdep.c
@@ -49,10 +49,6 @@
 #include "target-descriptions.h"
 #include <algorithm>
 
-#include "features/tic6x-c64xp.c"
-#include "features/tic6x-c64x.c"
-#include "features/tic6x-c62x.c"
-
 #define TIC6X_OPCODE_SIZE 4
 #define TIC6X_FETCH_PACKET_SIZE 32
 
@@ -1339,8 +1335,4 @@ void
 _initialize_tic6x_tdep (void)
 {
   register_gdbarch_init (bfd_arch_tic6x, tic6x_gdbarch_init);
-
-  initialize_tdesc_tic6x_c64xp ();
-  initialize_tdesc_tic6x_c64x ();
-  initialize_tdesc_tic6x_c62x ();
 }
