From 5334ef3907e2fbb98aef6839df23e41dccfaf701 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Wed, 15 Nov 2017 12:03:03 +0000 Subject: [PATCH] Remove features/nios2-linux.c tdesc_nios2_linux is not used at all. Remove features/nios2-linux.c, and don't generate it anymore. gdb: 2017-11-15 Yao Qi * features/Makefile (XMLTOC): Remove nios2-linux.xml. * features/nios2-linux.c: Remove. * nios2-linux-tdep.c (_initialize_nios2_linux_tdep): Don't call initialize_tdesc_nios2_linux. --- gdb/ChangeLog | 7 ++++ gdb/features/Makefile | 1 - gdb/features/nios2-linux.c | 71 -------------------------------------- gdb/nios2-linux-tdep.c | 4 --- 4 files changed, 7 insertions(+), 76 deletions(-) delete mode 100644 gdb/features/nios2-linux.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fe24318d204..cc2e876db9e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2017-11-15 Yao Qi + + * features/Makefile (XMLTOC): Remove nios2-linux.xml. + * features/nios2-linux.c: Remove. + * nios2-linux-tdep.c (_initialize_nios2_linux_tdep): Don't call + initialize_tdesc_nios2_linux. + 2017-11-15 Yao Qi * m68hc11-tdep.c (M68HC11_NUM_REGS): Change it to diff --git a/gdb/features/Makefile b/gdb/features/Makefile index 2d8e3fea368..b41d56106b8 100644 --- a/gdb/features/Makefile +++ b/gdb/features/Makefile @@ -136,7 +136,6 @@ XMLTOC = \ mips64-dsp-linux.xml \ mips64-linux.xml \ nds32.xml \ - nios2-linux.xml \ nios2.xml \ rs6000/powerpc-32.xml \ rs6000/powerpc-32l.xml \ diff --git a/gdb/features/nios2-linux.c b/gdb/features/nios2-linux.c deleted file mode 100644 index 03685676b5e..00000000000 --- a/gdb/features/nios2-linux.c +++ /dev/null @@ -1,71 +0,0 @@ -/* THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi:set ro: - Original: nios2-linux.xml */ - -#include "defs.h" -#include "osabi.h" -#include "target-descriptions.h" - -struct target_desc *tdesc_nios2_linux; -static void -initialize_tdesc_nios2_linux (void) -{ - struct target_desc *result = allocate_target_description (); - set_tdesc_architecture (result, bfd_scan_arch ("nios2")); - - set_tdesc_osabi (result, osabi_from_tdesc_string ("GNU/Linux")); - - struct tdesc_feature *feature; - - feature = tdesc_create_feature (result, "org.gnu.gdb.nios2.cpu"); - tdesc_create_reg (feature, "zero", 0, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "at", 1, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r2", 2, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r3", 3, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r4", 4, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r5", 5, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r6", 6, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r7", 7, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r8", 8, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r9", 9, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r10", 10, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r11", 11, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r12", 12, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r13", 13, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r14", 14, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r15", 15, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r16", 16, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r17", 17, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r18", 18, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r19", 19, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r20", 20, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r21", 21, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r22", 22, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "r23", 23, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "et", 24, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "bt", 25, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "gp", 26, 1, NULL, 32, "data_ptr"); - tdesc_create_reg (feature, "sp", 27, 1, NULL, 32, "data_ptr"); - tdesc_create_reg (feature, "fp", 28, 1, NULL, 32, "data_ptr"); - tdesc_create_reg (feature, "ea", 29, 1, NULL, 32, "code_ptr"); - tdesc_create_reg (feature, "sstatus", 30, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "ra", 31, 1, NULL, 32, "code_ptr"); - tdesc_create_reg (feature, "pc", 32, 1, NULL, 32, "code_ptr"); - tdesc_create_reg (feature, "status", 33, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "estatus", 34, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "bstatus", 35, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "ienable", 36, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "ipending", 37, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "cpuid", 38, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "ctl6", 39, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "exception", 40, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "pteaddr", 41, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "tlbacc", 42, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "tlbmisc", 43, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "eccinj", 44, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "badaddr", 45, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "config", 46, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "mpubase", 47, 1, NULL, 32, "uint32"); - tdesc_create_reg (feature, "mpuacc", 48, 1, NULL, 32, "uint32"); - - tdesc_nios2_linux = result; -} diff --git a/gdb/nios2-linux-tdep.c b/gdb/nios2-linux-tdep.c index 8cada5472a1..2c996a98f70 100644 --- a/gdb/nios2-linux-tdep.c +++ b/gdb/nios2-linux-tdep.c @@ -30,8 +30,6 @@ #include "glibc-tdep.h" #include "nios2-tdep.h" -#include "features/nios2-linux.c" - /* Core file and register set support. */ /* Map from the normal register enumeration order to the order that @@ -249,6 +247,4 @@ _initialize_nios2_linux_tdep (void) arch_info = arch_info->next) gdbarch_register_osabi (bfd_arch_nios2, arch_info->mach, GDB_OSABI_LINUX, nios2_linux_init_abi); - - initialize_tdesc_nios2_linux (); } -- 2.30.2