public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
* [PATCH 1/3] gdb/features: remove rx.xml from XMLTOC list
@ 2020-06-17  2:27 Simon Marchi
  2020-06-17  2:27 ` [PATCH 2/3] gdb, gdbserver: remove ARM regdat files Simon Marchi
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Simon Marchi @ 2020-06-17  2:27 UTC (permalink / raw)
  To: gdb-patches; +Cc: Simon Marchi

When trying to run `make` in the features directory, in a clean repo, we
get:

    Makefile:254: warning: overriding recipe for target 'rx.c'
    Makefile:250: warning: ignoring old recipe for target 'rx.c'
    make: Nothing to be done for 'all'.

The warnings come from the fact that `rx.xml` is present in two lists,
causing two `rx.c` targets to be defined.  It is ok for it to be in the
FEATURES_XMLFILES list, as this architecture uses the "feature-based"
target-descriptions.  It shouldn't be in the XMLTOC list, as this is for
architectures that define complete/static target descriptions as XML
files.

gdb/ChangeLog:

	* features/Makefile (XMLTOC): Remove rx.xml.
---
 gdb/features/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gdb/features/Makefile b/gdb/features/Makefile
index cc65baa6eda..2a409dde39a 100644
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -155,7 +155,6 @@ XMLTOC = \
 	rs6000/powerpc-vsx64.xml \
 	rs6000/powerpc-vsx64l.xml \
 	rs6000/rs6000.xml \
-	rx.xml \
 	s390-linux32.xml \
 	s390-linux32v1.xml \
 	s390-linux32v2.xml \
-- 
2.27.0


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 2/3] gdb, gdbserver: remove ARM regdat files
  2020-06-17  2:27 [PATCH 1/3] gdb/features: remove rx.xml from XMLTOC list Simon Marchi
@ 2020-06-17  2:27 ` Simon Marchi
  2020-06-17  8:06   ` Alan Hayward
  2020-06-17  2:27 ` [PATCH 3/3] gdb/regformats: remove unused regformats/reg-*.dat Simon Marchi
  2020-06-17 15:56 ` [PATCH 1/3] gdb/features: remove rx.xml from XMLTOC list Tom Tromey
  2 siblings, 1 reply; 8+ messages in thread
From: Simon Marchi @ 2020-06-17  2:27 UTC (permalink / raw)
  To: gdb-patches; +Cc: Simon Marchi

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.
---
 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/Makefile.in                  |  3 --
 6 files changed, 1 insertion(+), 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/features/Makefile b/gdb/features/Makefile
index 2a409dde39a..f2dd279eb69 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 f529c2c493c..00000000000
--- 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 2e6cb85cf4b..00000000000
--- 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 aa71f85bcb2..00000000000
--- 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 6fec4fd8f5d..00000000000
--- 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/Makefile.in b/gdbserver/Makefile.in
index 7321ba12c2e..9d7687be534 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) $< $@
 
-- 
2.27.0


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 3/3] gdb/regformats: remove unused regformats/reg-*.dat
  2020-06-17  2:27 [PATCH 1/3] gdb/features: remove rx.xml from XMLTOC list Simon Marchi
  2020-06-17  2:27 ` [PATCH 2/3] gdb, gdbserver: remove ARM regdat files Simon Marchi
@ 2020-06-17  2:27 ` Simon Marchi
  2020-06-17 16:01   ` Tom Tromey
  2020-06-17 15:56 ` [PATCH 1/3] gdb/features: remove rx.xml from XMLTOC list Tom Tromey
  2 siblings, 1 reply; 8+ messages in thread
From: Simon Marchi @ 2020-06-17  2:27 UTC (permalink / raw)
  To: gdb-patches; +Cc: Simon Marchi

I believe that the .dat files starting with `reg-` are the manually
written ones, the other being generated from xml files from the features
directory.

This patch removes the manually-written files that are no longer needed.
They are unused since the recent series that removed a bunch of
gdbserver ports.

gdb/ChangeLog:

	* regformats/reg-arm.dat: Remove.
	* regformats/reg-bfin.dat: Remove.
	* regformats/reg-cris.dat: Remove.
	* regformats/reg-crisv32.dat: Remove.
	* regformats/reg-m32r.dat: Remove.
	* regformats/reg-tilegx.dat: Remove.
	* regformats/reg-tilegx32.dat: Remove.
---
 gdb/regformats/reg-arm.dat      | 29 --------------
 gdb/regformats/reg-bfin.dat     | 56 ---------------------------
 gdb/regformats/reg-cris.dat     | 35 -----------------
 gdb/regformats/reg-crisv32.dat  | 54 --------------------------
 gdb/regformats/reg-m32r.dat     | 27 -------------
 gdb/regformats/reg-tilegx.dat   | 67 ---------------------------------
 gdb/regformats/reg-tilegx32.dat | 67 ---------------------------------
 7 files changed, 335 deletions(-)
 delete mode 100644 gdb/regformats/reg-arm.dat
 delete mode 100644 gdb/regformats/reg-bfin.dat
 delete mode 100644 gdb/regformats/reg-cris.dat
 delete mode 100644 gdb/regformats/reg-crisv32.dat
 delete mode 100644 gdb/regformats/reg-m32r.dat
 delete mode 100644 gdb/regformats/reg-tilegx.dat
 delete mode 100644 gdb/regformats/reg-tilegx32.dat

diff --git a/gdb/regformats/reg-arm.dat b/gdb/regformats/reg-arm.dat
deleted file mode 100644
index 7d995fbecaf..00000000000
--- a/gdb/regformats/reg-arm.dat
+++ /dev/null
@@ -1,29 +0,0 @@
-name:arm
-xmlarch:arm
-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
-96:f0
-96:f1
-96:f2
-96:f3
-96:f4
-96:f5
-96:f6
-96:f7
-32:fps
-32:cpsr
diff --git a/gdb/regformats/reg-bfin.dat b/gdb/regformats/reg-bfin.dat
deleted file mode 100644
index 9db4a8d68d5..00000000000
--- a/gdb/regformats/reg-bfin.dat
+++ /dev/null
@@ -1,56 +0,0 @@
-name:bfin
-expedite:pc,sp,fp
-32:r0
-32:r1
-32:r2
-32:r3
-32:r4
-32:r5
-32:r6
-32:r7
-32:p0
-32:p1
-32:p2
-32:p3
-32:p4
-32:p5
-32:sp
-32:fp
-32:i0
-32:i1
-32:i2
-32:i3
-32:m0
-32:m1
-32:m2
-32:m3
-32:b0
-32:b1
-32:b2
-32:b3
-32:l0
-32:l1
-32:l2
-32:l3
-32:a0x
-32:a0w
-32:a1x
-32:a1w
-32:astat
-32:rets
-32:lc0
-32:lt0
-32:lb0
-32:lc1
-32:lt1
-32:lb1
-32:cycles
-32:cycles2
-32:usp
-32:seqstat
-32:syscfg
-32:reti
-32:retx
-32:retn
-32:rete
-32:pc
diff --git a/gdb/regformats/reg-cris.dat b/gdb/regformats/reg-cris.dat
deleted file mode 100644
index c63be5323a2..00000000000
--- a/gdb/regformats/reg-cris.dat
+++ /dev/null
@@ -1,35 +0,0 @@
-name:cris
-expedite:r8,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:r13
-32:sp
-32:pc
-
-8:p0
-8:vr
-0:p2
-0:p3
-16:p4
-16:ccr
-0:p6
-32:mof
-32:p8
-32:ibr
-32:irp
-32:srp
-32:bar
-32:dccr
-32:brp
-32:usp
diff --git a/gdb/regformats/reg-crisv32.dat b/gdb/regformats/reg-crisv32.dat
deleted file mode 100644
index 9cd93fe7712..00000000000
--- a/gdb/regformats/reg-crisv32.dat
+++ /dev/null
@@ -1,54 +0,0 @@
-name:crisv32
-expedite:r8,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:r13
-32:sp
-32:acr
-
-8:bz
-8:vr
-32:pid
-8:srs
-16:wz
-32:exs
-32:eda
-32:mof
-32:dz
-32:ebp
-32:erp
-32:srp
-32:nrp
-32:ccs
-32:usp
-32:spc
-
-32:pc
-
-32:s0
-32:s1
-32:s2
-32:s3
-32:s4
-32:s5
-32:s6
-32:s7
-32:s8
-32:s9
-32:s10
-32:s11
-32:s12
-32:s13
-32:s14
-32:s15
diff --git a/gdb/regformats/reg-m32r.dat b/gdb/regformats/reg-m32r.dat
deleted file mode 100644
index 01bfb9416f6..00000000000
--- a/gdb/regformats/reg-m32r.dat
+++ /dev/null
@@ -1,27 +0,0 @@
-name:m32r
-expedite:pc,lr,sp
-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:fp
-32:lr
-32:sp
-32:psw
-32:cbr
-32:spi
-32:spu
-32:bpc
-32:pc
-32:accl
-32:acch
-32:evb
diff --git a/gdb/regformats/reg-tilegx.dat b/gdb/regformats/reg-tilegx.dat
deleted file mode 100644
index 588252f384e..00000000000
--- a/gdb/regformats/reg-tilegx.dat
+++ /dev/null
@@ -1,67 +0,0 @@
-name:tilegx
-expedite:sp,lr,pc
-64:r0
-64:r1
-64:r2
-64:r3
-64:r4
-64:r5
-64:r6
-64:r7
-64:r8
-64:r9
-64:r10
-64:r11
-64:r12
-64:r13
-64:r14
-64:r15
-64:r16
-64:r17
-64:r18
-64:r19
-64:r20
-64:r21
-64:r22
-64:r23
-64:r24
-64:r25
-64:r26
-64:r27
-64:r28
-64:r29
-64:r30
-64:r31
-64:r32
-64:r33
-64:r34
-64:r35
-64:r36
-64:r37
-64:r38
-64:r39
-64:r40
-64:r41
-64:r42
-64:r43
-64:r44
-64:r45
-64:r46
-64:r47
-64:r48
-64:r49
-64:r50
-64:r51
-64:r52
-64:tp
-64:sp
-64:lr
-64:sn
-64:io0
-64:io1
-64:us0
-64:us1
-64:us2
-64:us3
-64:zero
-64:pc
diff --git a/gdb/regformats/reg-tilegx32.dat b/gdb/regformats/reg-tilegx32.dat
deleted file mode 100644
index d8bfe2a4b1f..00000000000
--- a/gdb/regformats/reg-tilegx32.dat
+++ /dev/null
@@ -1,67 +0,0 @@
-name:tilegx32
-expedite:sp,lr,pc
-64:r0
-64:r1
-64:r2
-64:r3
-64:r4
-64:r5
-64:r6
-64:r7
-64:r8
-64:r9
-64:r10
-64:r11
-64:r12
-64:r13
-64:r14
-64:r15
-64:r16
-64:r17
-64:r18
-64:r19
-64:r20
-64:r21
-64:r22
-64:r23
-64:r24
-64:r25
-64:r26
-64:r27
-64:r28
-64:r29
-64:r30
-64:r31
-64:r32
-64:r33
-64:r34
-64:r35
-64:r36
-64:r37
-64:r38
-64:r39
-64:r40
-64:r41
-64:r42
-64:r43
-64:r44
-64:r45
-64:r46
-64:r47
-64:r48
-64:r49
-64:r50
-64:r51
-64:r52
-64:tp
-64:sp
-64:lr
-64:sn
-64:io0
-64:io1
-64:us0
-64:us1
-64:us2
-64:us3
-64:zero
-32:pc
-- 
2.27.0


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/3] gdb, gdbserver: remove ARM regdat files
  2020-06-17  2:27 ` [PATCH 2/3] gdb, gdbserver: remove ARM regdat files Simon Marchi
@ 2020-06-17  8:06   ` Alan Hayward
  2020-06-17 18:44     ` Simon Marchi
  0 siblings, 1 reply; 8+ messages in thread
From: Alan Hayward @ 2020-06-17  8:06 UTC (permalink / raw)
  To: Simon Marchi; +Cc: gdb-patches, nd



> On 17 Jun 2020, at 03:27, Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> wrote:
> 
> 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.

I should have removed these when I was removing the corresponding Arm .xml files.
Thanks for cleaning these up.

> 
> 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.
> ---
> 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/Makefile.in                  |  3 --
> 6 files changed, 1 insertion(+), 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
> 

Patch looks good to me.


> diff --git a/gdb/features/Makefile b/gdb/features/Makefile
> index 2a409dde39a..f2dd279eb69 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 f529c2c493c..00000000000
> --- 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 2e6cb85cf4b..00000000000
> --- 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 aa71f85bcb2..00000000000
> --- 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 6fec4fd8f5d..00000000000
> --- 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/Makefile.in b/gdbserver/Makefile.in
> index 7321ba12c2e..9d7687be534 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) $< $@
> 
> -- 
> 2.27.0
> 


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/3] gdb/features: remove rx.xml from XMLTOC list
  2020-06-17  2:27 [PATCH 1/3] gdb/features: remove rx.xml from XMLTOC list Simon Marchi
  2020-06-17  2:27 ` [PATCH 2/3] gdb, gdbserver: remove ARM regdat files Simon Marchi
  2020-06-17  2:27 ` [PATCH 3/3] gdb/regformats: remove unused regformats/reg-*.dat Simon Marchi
@ 2020-06-17 15:56 ` Tom Tromey
  2 siblings, 0 replies; 8+ messages in thread
From: Tom Tromey @ 2020-06-17 15:56 UTC (permalink / raw)
  To: Simon Marchi via Gdb-patches; +Cc: Simon Marchi

>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:

Simon> 	* features/Makefile (XMLTOC): Remove rx.xml.

Looks good.  Thanks.

Tom

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/3] gdb/regformats: remove unused regformats/reg-*.dat
  2020-06-17  2:27 ` [PATCH 3/3] gdb/regformats: remove unused regformats/reg-*.dat Simon Marchi
@ 2020-06-17 16:01   ` Tom Tromey
  2020-06-17 18:44     ` Simon Marchi
  0 siblings, 1 reply; 8+ messages in thread
From: Tom Tromey @ 2020-06-17 16:01 UTC (permalink / raw)
  To: Simon Marchi via Gdb-patches; +Cc: Simon Marchi

>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:

Simon> I believe that the .dat files starting with `reg-` are the manually
Simon> written ones, the other being generated from xml files from the features
Simon> directory.

I think so too.

Simon> This patch removes the manually-written files that are no longer needed.
Simon> They are unused since the recent series that removed a bunch of
Simon> gdbserver ports.

Looks reasonable to me.

Tom

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/3] gdb, gdbserver: remove ARM regdat files
  2020-06-17  8:06   ` Alan Hayward
@ 2020-06-17 18:44     ` Simon Marchi
  0 siblings, 0 replies; 8+ messages in thread
From: Simon Marchi @ 2020-06-17 18:44 UTC (permalink / raw)
  To: Alan Hayward; +Cc: gdb-patches, nd

On 2020-06-17 4:06 a.m., Alan Hayward wrote:
> 
> 
>> On 17 Jun 2020, at 03:27, Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> wrote:
>>
>> 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.
> 
> I should have removed these when I was removing the corresponding Arm .xml files.
> Thanks for cleaning these up.

They are easy to forget, I did forget them when removing the gdbserver ports recently...

>>
>> 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.
>> ---
>> 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/Makefile.in                  |  3 --
>> 6 files changed, 1 insertion(+), 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
>>
> 
> Patch looks good to me.

Thanks, I'll push it.

Simon

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/3] gdb/regformats: remove unused regformats/reg-*.dat
  2020-06-17 16:01   ` Tom Tromey
@ 2020-06-17 18:44     ` Simon Marchi
  0 siblings, 0 replies; 8+ messages in thread
From: Simon Marchi @ 2020-06-17 18:44 UTC (permalink / raw)
  To: Tom Tromey, Simon Marchi via Gdb-patches

On 2020-06-17 12:01 p.m., Tom Tromey wrote:
>>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:
> 
> Simon> I believe that the .dat files starting with `reg-` are the manually
> Simon> written ones, the other being generated from xml files from the features
> Simon> directory.
> 
> I think so too.
> 
> Simon> This patch removes the manually-written files that are no longer needed.
> Simon> They are unused since the recent series that removed a bunch of
> Simon> gdbserver ports.
> 
> Looks reasonable to me.
> 
> Tom
> 

Thanks for the review, I'll push the series.

Simon

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2020-06-17 18:44 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-17  2:27 [PATCH 1/3] gdb/features: remove rx.xml from XMLTOC list Simon Marchi
2020-06-17  2:27 ` [PATCH 2/3] gdb, gdbserver: remove ARM regdat files Simon Marchi
2020-06-17  8:06   ` Alan Hayward
2020-06-17 18:44     ` Simon Marchi
2020-06-17  2:27 ` [PATCH 3/3] gdb/regformats: remove unused regformats/reg-*.dat Simon Marchi
2020-06-17 16:01   ` Tom Tromey
2020-06-17 18:44     ` Simon Marchi
2020-06-17 15:56 ` [PATCH 1/3] gdb/features: remove rx.xml from XMLTOC list Tom Tromey

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).