From 7d458ea516b58c98214406859d57965879019215 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 17 Jun 2020 14:42:53 -0400 Subject: gdb, gdbserver: remove ARM regdat files This patch removes the leftover regformats .dat files for the arm architecture. There are no longer relevant, since the arm architecture has been converted to use feature-based target-descriptions. These .dat files are used by GDBserver ports that still use static target descriptions. These .dat files are generated from corresponding .xml files in the features directory. And since the corresponding .xml files for these arm .dat files don't exist anymore, it is impossible to re-generated them. If you delete these .dat files and type "make" in the features directory, you'll get: make: *** No rule to make target '../regformats/arm/arm-with-iwmmxt.dat', needed by 'all'. Stop. So it removes the entries in the `WHICH` variable of gdb/features/Makefile. Finally, it removes the rule in gdbserver/Makefile to generate .cc files from `../gdb/regformats/arm/%.dat`. gdb/ChangeLog: * features/Makefile (WHICH): Remove arm files. * regformats/arm/arm-with-iwmmxt.dat: Remove. * regformats/arm/arm-with-neon.dat: Remove. * regformats/arm/arm-with-vfpv2.dat: Remove. * regformats/arm/arm-with-vfpv3.dat: Remove. gdbserver/ChangeLog: * Makefile.in (%-generated.cc: ../gdb/regformats/arm/%.dat): Remove. Change-Id: I3b7d989c50e2cb92235c1f7c7071a26839d84c78 --- gdb/ChangeLog | 8 +++++ gdb/features/Makefile | 4 +-- gdb/regformats/arm/arm-with-iwmmxt.dat | 53 ---------------------------- gdb/regformats/arm/arm-with-neon.dat | 64 ---------------------------------- gdb/regformats/arm/arm-with-vfpv2.dat | 48 ------------------------- gdb/regformats/arm/arm-with-vfpv3.dat | 64 ---------------------------------- gdbserver/ChangeLog | 5 +++ gdbserver/Makefile.in | 3 -- 8 files changed, 14 insertions(+), 235 deletions(-) delete mode 100644 gdb/regformats/arm/arm-with-iwmmxt.dat delete mode 100644 gdb/regformats/arm/arm-with-neon.dat delete mode 100644 gdb/regformats/arm/arm-with-vfpv2.dat delete mode 100644 gdb/regformats/arm/arm-with-vfpv3.dat diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 049ad21..c44e34e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2020-06-17 Simon Marchi + * features/Makefile (WHICH): Remove arm files. + * regformats/arm/arm-with-iwmmxt.dat: Remove. + * regformats/arm/arm-with-neon.dat: Remove. + * regformats/arm/arm-with-vfpv2.dat: Remove. + * regformats/arm/arm-with-vfpv3.dat: Remove. + +2020-06-17 Simon Marchi + * features/Makefile (XMLTOC): Remove rx.xml. 2020-06-17 Pedro Alves diff --git a/gdb/features/Makefile b/gdb/features/Makefile index 2a409dd..f2dd279 100644 --- a/gdb/features/Makefile +++ b/gdb/features/Makefile @@ -44,9 +44,7 @@ # make GDB=/path/to/gdb XMLTOC="xml files" FEATURE_XMLFILES="xml files" cfiles # List of .dat files to create in ../regformats/ -WHICH = arm/arm-with-iwmmxt arm/arm-with-vfpv2 arm/arm-with-vfpv3 \ - arm/arm-with-neon \ - mips-linux mips-dsp-linux \ +WHICH = mips-linux mips-dsp-linux \ microblaze-with-stack-protect \ mips64-linux mips64-dsp-linux \ nios2-linux \ diff --git a/gdb/regformats/arm/arm-with-iwmmxt.dat b/gdb/regformats/arm/arm-with-iwmmxt.dat deleted file mode 100644 index f529c2c..0000000 --- a/gdb/regformats/arm/arm-with-iwmmxt.dat +++ /dev/null @@ -1,53 +0,0 @@ -# THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi :set ro: -# Generated from: arm/arm-with-iwmmxt.xml -name:arm_with_iwmmxt -xmltarget:arm-with-iwmmxt.xml -expedite:r11,sp,pc -32:r0 -32:r1 -32:r2 -32:r3 -32:r4 -32:r5 -32:r6 -32:r7 -32:r8 -32:r9 -32:r10 -32:r11 -32:r12 -32:sp -32:lr -32:pc -0: -0: -0: -0: -0: -0: -0: -0: -0: -32:cpsr -64:wR0 -64:wR1 -64:wR2 -64:wR3 -64:wR4 -64:wR5 -64:wR6 -64:wR7 -64:wR8 -64:wR9 -64:wR10 -64:wR11 -64:wR12 -64:wR13 -64:wR14 -64:wR15 -32:wCSSF -32:wCASF -32:wCGR0 -32:wCGR1 -32:wCGR2 -32:wCGR3 diff --git a/gdb/regformats/arm/arm-with-neon.dat b/gdb/regformats/arm/arm-with-neon.dat deleted file mode 100644 index 2e6cb85..0000000 --- a/gdb/regformats/arm/arm-with-neon.dat +++ /dev/null @@ -1,64 +0,0 @@ -# THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi :set ro: -# Generated from: arm/arm-with-neon.xml -name:arm_with_neon -xmltarget:arm-with-neon.xml -expedite:r11,sp,pc -32:r0 -32:r1 -32:r2 -32:r3 -32:r4 -32:r5 -32:r6 -32:r7 -32:r8 -32:r9 -32:r10 -32:r11 -32:r12 -32:sp -32:lr -32:pc -0: -0: -0: -0: -0: -0: -0: -0: -0: -32:cpsr -64:d0 -64:d1 -64:d2 -64:d3 -64:d4 -64:d5 -64:d6 -64:d7 -64:d8 -64:d9 -64:d10 -64:d11 -64:d12 -64:d13 -64:d14 -64:d15 -64:d16 -64:d17 -64:d18 -64:d19 -64:d20 -64:d21 -64:d22 -64:d23 -64:d24 -64:d25 -64:d26 -64:d27 -64:d28 -64:d29 -64:d30 -64:d31 -32:fpscr diff --git a/gdb/regformats/arm/arm-with-vfpv2.dat b/gdb/regformats/arm/arm-with-vfpv2.dat deleted file mode 100644 index aa71f85..0000000 --- a/gdb/regformats/arm/arm-with-vfpv2.dat +++ /dev/null @@ -1,48 +0,0 @@ -# THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi :set ro: -# Generated from: arm/arm-with-vfpv2.xml -name:arm_with_vfpv2 -xmltarget:arm-with-vfpv2.xml -expedite:r11,sp,pc -32:r0 -32:r1 -32:r2 -32:r3 -32:r4 -32:r5 -32:r6 -32:r7 -32:r8 -32:r9 -32:r10 -32:r11 -32:r12 -32:sp -32:lr -32:pc -0: -0: -0: -0: -0: -0: -0: -0: -0: -32:cpsr -64:d0 -64:d1 -64:d2 -64:d3 -64:d4 -64:d5 -64:d6 -64:d7 -64:d8 -64:d9 -64:d10 -64:d11 -64:d12 -64:d13 -64:d14 -64:d15 -32:fpscr diff --git a/gdb/regformats/arm/arm-with-vfpv3.dat b/gdb/regformats/arm/arm-with-vfpv3.dat deleted file mode 100644 index 6fec4fd..0000000 --- a/gdb/regformats/arm/arm-with-vfpv3.dat +++ /dev/null @@ -1,64 +0,0 @@ -# THIS FILE IS GENERATED. -*- buffer-read-only: t -*- vi :set ro: -# Generated from: arm/arm-with-vfpv3.xml -name:arm_with_vfpv3 -xmltarget:arm-with-vfpv3.xml -expedite:r11,sp,pc -32:r0 -32:r1 -32:r2 -32:r3 -32:r4 -32:r5 -32:r6 -32:r7 -32:r8 -32:r9 -32:r10 -32:r11 -32:r12 -32:sp -32:lr -32:pc -0: -0: -0: -0: -0: -0: -0: -0: -0: -32:cpsr -64:d0 -64:d1 -64:d2 -64:d3 -64:d4 -64:d5 -64:d6 -64:d7 -64:d8 -64:d9 -64:d10 -64:d11 -64:d12 -64:d13 -64:d14 -64:d15 -64:d16 -64:d17 -64:d18 -64:d19 -64:d20 -64:d21 -64:d22 -64:d23 -64:d24 -64:d25 -64:d26 -64:d27 -64:d28 -64:d29 -64:d30 -64:d31 -32:fpscr diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 3eef544..4114da9 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2020-06-17 Simon Marchi + + * Makefile.in (%-generated.cc: ../gdb/regformats/arm/%.dat): + Remove. + 2020-06-12 Simon Marchi * Makefile.in (SFILES): Remove win32-arm-low.cc, wincecompat.cc. diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index 7321ba1..9d7687b 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -555,9 +555,6 @@ target/%.o: ../gdb/target/%.c %-generated.cc: ../gdb/regformats/%.dat $(regdat_sh) $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@ -%-generated.cc: ../gdb/regformats/arm/%.dat $(regdat_sh) - $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@ - %-generated.cc: ../gdb/regformats/rs6000/%.dat $(regdat_sh) $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@ -- cgit v1.1