21 files changed, 10 insertions, 9 deletions
diff --git a/gdb/features/Makefile b/gdb/features/Makefile
index 4efb1a5..f24b13e 100644
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -44,7 +44,8 @@
 #   make GDB=/path/to/gdb XMLTOC="xml files" cfiles
 
 WHICH = aarch64 \
-	arm-with-iwmmxt arm-with-vfpv2 arm-with-vfpv3 arm-with-neon \
+	arm/arm-with-iwmmxt arm/arm-with-vfpv2 arm/arm-with-vfpv3 \
+	arm/arm-with-neon \
 	i386/i386 i386/i386-linux \
 	i386/i386-mmx i386/i386-mmx-linux \
 	i386/amd64 i386/amd64-linux \
@@ -150,13 +151,13 @@ XMLTOC = \
 	aarch64.xml \
 	arc-v2.xml \
 	arc-arcompact.xml \
-	arm-with-iwmmxt.xml \
-	arm-with-m-fpa-layout.xml \
-	arm-with-m-vfp-d16.xml \
-	arm-with-m.xml \
-	arm-with-neon.xml \
-	arm-with-vfpv2.xml \
-	arm-with-vfpv3.xml \
+	arm/arm-with-iwmmxt.xml \
+	arm/arm-with-m-fpa-layout.xml \
+	arm/arm-with-m-vfp-d16.xml \
+	arm/arm-with-m.xml \
+	arm/arm-with-neon.xml \
+	arm/arm-with-vfpv2.xml \
+	arm/arm-with-vfpv3.xml \
 	i386/amd64-avx-linux.xml \
 	i386/amd64-avx.xml \
 	i386/amd64-avx512-linux.xml \
@@ -270,7 +271,7 @@ cfiles: $(CFILES)
 	sh ../../move-if-change $@.tmp $@
 
 # Other dependencies.
-$(outdir)/arm-with-iwmmxt.dat: arm-core.xml xscale-iwmmxt.xml
+$(outdir)/arm/arm-with-iwmmxt.dat: arm/arm-core.xml arm/xscale-iwmmxt.xml
 $(outdir)/i386/i386.dat: i386/32bit-core.xml i386/32bit-sse.xml
 $(outdir)/i386/i386-linux.dat: i386/32bit-core.xml i386/32bit-sse.xml \
 			       i386/32bit-linux.xml
diff --git a/gdb/features/arm-core.xml b/gdb/features/arm/arm-core.xml
index f7f1a1d..f7f1a1d 100644
--- a/gdb/features/arm-core.xml
+++ b/gdb/features/arm/arm-core.xml
diff --git a/gdb/features/arm-fpa.xml b/gdb/features/arm/arm-fpa.xml
index 0b97bc1..0b97bc1 100644
--- a/gdb/features/arm-fpa.xml
+++ b/gdb/features/arm/arm-fpa.xml
diff --git a/gdb/features/arm-m-profile.xml b/gdb/features/arm/arm-m-profile.xml
index 7631ac6..7631ac6 100644
--- a/gdb/features/arm-m-profile.xml
+++ b/gdb/features/arm/arm-m-profile.xml
diff --git a/gdb/features/arm-vfpv2.xml b/gdb/features/arm/arm-vfpv2.xml
index 0d9a4e2..0d9a4e2 100644
--- a/gdb/features/arm-vfpv2.xml
+++ b/gdb/features/arm/arm-vfpv2.xml
diff --git a/gdb/features/arm-vfpv3.xml b/gdb/features/arm/arm-vfpv3.xml
index 3ab77f9..3ab77f9 100644
--- a/gdb/features/arm-vfpv3.xml
+++ b/gdb/features/arm/arm-vfpv3.xml
diff --git a/gdb/features/arm-with-iwmmxt.c b/gdb/features/arm/arm-with-iwmmxt.c
index 1770e03..1770e03 100644
--- a/gdb/features/arm-with-iwmmxt.c
+++ b/gdb/features/arm/arm-with-iwmmxt.c
diff --git a/gdb/features/arm-with-iwmmxt.xml b/gdb/features/arm/arm-with-iwmmxt.xml
index 2856eb5..2856eb5 100644
--- a/gdb/features/arm-with-iwmmxt.xml
+++ b/gdb/features/arm/arm-with-iwmmxt.xml
diff --git a/gdb/features/arm-with-m-fpa-layout.c b/gdb/features/arm/arm-with-m-fpa-layout.c
index f720614..f720614 100644
--- a/gdb/features/arm-with-m-fpa-layout.c
+++ b/gdb/features/arm/arm-with-m-fpa-layout.c
diff --git a/gdb/features/arm-with-m-fpa-layout.xml b/gdb/features/arm/arm-with-m-fpa-layout.xml
index 76502de..76502de 100644
--- a/gdb/features/arm-with-m-fpa-layout.xml
+++ b/gdb/features/arm/arm-with-m-fpa-layout.xml
diff --git a/gdb/features/arm-with-m-vfp-d16.c b/gdb/features/arm/arm-with-m-vfp-d16.c
index 069baac..069baac 100644
--- a/gdb/features/arm-with-m-vfp-d16.c
+++ b/gdb/features/arm/arm-with-m-vfp-d16.c
diff --git a/gdb/features/arm-with-m-vfp-d16.xml b/gdb/features/arm/arm-with-m-vfp-d16.xml
index 581a28f..581a28f 100644
--- a/gdb/features/arm-with-m-vfp-d16.xml
+++ b/gdb/features/arm/arm-with-m-vfp-d16.xml
diff --git a/gdb/features/arm-with-m.c b/gdb/features/arm/arm-with-m.c
index 64d31bb..64d31bb 100644
--- a/gdb/features/arm-with-m.c
+++ b/gdb/features/arm/arm-with-m.c
diff --git a/gdb/features/arm-with-m.xml b/gdb/features/arm/arm-with-m.xml
index 2fad944..2fad944 100644
--- a/gdb/features/arm-with-m.xml
+++ b/gdb/features/arm/arm-with-m.xml
diff --git a/gdb/features/arm-with-neon.c b/gdb/features/arm/arm-with-neon.c
index d365c0f..d365c0f 100644
--- a/gdb/features/arm-with-neon.c
+++ b/gdb/features/arm/arm-with-neon.c
diff --git a/gdb/features/arm-with-neon.xml b/gdb/features/arm/arm-with-neon.xml
index 7045b02..7045b02 100644
--- a/gdb/features/arm-with-neon.xml
+++ b/gdb/features/arm/arm-with-neon.xml
diff --git a/gdb/features/arm-with-vfpv2.c b/gdb/features/arm/arm-with-vfpv2.c
index 0ebbfef..0ebbfef 100644
--- a/gdb/features/arm-with-vfpv2.c
+++ b/gdb/features/arm/arm-with-vfpv2.c
diff --git a/gdb/features/arm-with-vfpv2.xml b/gdb/features/arm/arm-with-vfpv2.xml
index f9dc84f..f9dc84f 100644
--- a/gdb/features/arm-with-vfpv2.xml
+++ b/gdb/features/arm/arm-with-vfpv2.xml
diff --git a/gdb/features/arm-with-vfpv3.c b/gdb/features/arm/arm-with-vfpv3.c
index e235dfa..e235dfa 100644
--- a/gdb/features/arm-with-vfpv3.c
+++ b/gdb/features/arm/arm-with-vfpv3.c
diff --git a/gdb/features/arm-with-vfpv3.xml b/gdb/features/arm/arm-with-vfpv3.xml
index 12ccb4a..12ccb4a 100644
--- a/gdb/features/arm-with-vfpv3.xml
+++ b/gdb/features/arm/arm-with-vfpv3.xml
diff --git a/gdb/features/xscale-iwmmxt.xml b/gdb/features/arm/xscale-iwmmxt.xml
index 8c840e4..8c840e4 100644
--- a/gdb/features/xscale-iwmmxt.xml
+++ b/gdb/features/arm/xscale-iwmmxt.xml