Clean up the XML files for ARM

[thirdparty/binutils-gdb.git] / gdb / features / Makefile

diff --git a/gdb/features/Makefile b/gdb/features/Makefile
index 07cd2cb2ba2ce8b3ad15b987459ac1487610709d..f24b13ecea035b82bed3cb6a5c9d529e48400652 100644 (file)
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2016 Free Software Foundation, Inc.
 
 # This file is part of GDB.
 
@@ -44,15 +44,18 @@
 #   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 \
        i386/i386-avx i386/i386-avx-linux \
        i386/i386-mpx i386/i386-mpx-linux \
+       i386/i386-avx-mpx i386/i386-avx-mpx-linux \
        i386/i386-avx512 i386/i386-avx512-linux \
        i386/amd64-avx i386/amd64-avx-linux \
        i386/amd64-mpx i386/amd64-mpx-linux \
+       i386/amd64-avx-mpx i386/amd64-avx-mpx-linux \
        i386/amd64-avx512 i386/amd64-avx512-linux \
        i386/x32 i386/x32-linux \
        i386/x32-avx i386/x32-avx-linux \
@@ -68,7 +71,8 @@ WHICH = aarch64 \
        s390-linux32 s390-linux64 s390x-linux64 \
        s390-linux32v1 s390-linux64v1 s390x-linux64v1 \
        s390-linux32v2 s390-linux64v2 s390x-linux64v2 \
-       s390-te-linux64 s390x-te-linux64 \
+       s390-te-linux64 s390x-te-linux64 s390-vx-linux64 s390x-vx-linux64 \
+       s390-tevx-linux64 s390x-tevx-linux64 \
        tic6x-c64xp tic6x-c64x tic6x-c62x \
        tic6x-c64xp-linux tic6x-c64x-linux tic6x-c62x-linux
 
@@ -82,7 +86,9 @@ i386/amd64-linux-expedite = rbp,rsp,rip
 i386/i386-avx-expedite = ebp,esp,eip
 i386/i386-avx-linux-expedite = ebp,esp,eip
 i386/i386-mpx-expedite = ebp,esp,eip
+i386/i386-avx-mpx-expedite = ebp,esp,eip
 i386/i386-mpx-linux-expedite = ebp,esp,eip
+i386/i386-avx-mpx-linux-expedite = ebp,esp,eip
 i386/i386-avx512-expedite = ebp,esp,eip
 i386/i386-avx512-linux-expedite = ebp,esp,eip
 i386/i386-mmx-expedite = ebp,esp,eip
@@ -90,7 +96,9 @@ i386/i386-mmx-linux-expedite = ebp,esp,eip
 i386/amd64-avx-expedite = rbp,rsp,rip
 i386/amd64-avx-linux-expedite = rbp,rsp,rip
 i386/amd64-mpx-expedite = rbp,rsp,rip
+i386/amd64-avx-mpx-expedite = rbp,rsp,rip
 i386/amd64-mpx-linux-expedite = rbp,rsp,rip
+i386/amd64-avx-mpx-linux-expedite = rbp,rsp,rip
 i386/amd64-avx512-expedite = rbp,rsp,rip
 i386/amd64-avx512-linux-expedite = rbp,rsp,rip
 i386/x32-expedite = rbp,rsp,rip
@@ -115,10 +123,14 @@ s390-linux64-expedite = r14l,r15l,pswa
 s390-linux64v1-expedite = r14l,r15l,pswa
 s390-linux64v2-expedite = r14l,r15l,pswa
 s390-te-linux64-expedite = r14l,r15l,pswa
+s390-vx-linux64-expedite = r14l,r15l,pswa
+s390-tevx-linux64-expedite = r14l,r15l,pswa
 s390x-linux64-expedite = r14,r15,pswa
 s390x-linux64v1-expedite = r14,r15,pswa
 s390x-linux64v2-expedite = r14,r15,pswa
 s390x-te-linux64-expedite = r14,r15,pswa
+s390x-vx-linux64-expedite = r14,r15,pswa
+s390x-tevx-linux64-expedite = r14,r15,pswa
 tic6x-c64xp-expedite = A15,PC
 tic6x-c64x-expedite = A15,PC
 tic6x-c62x-expedite = A15,PC
@@ -137,13 +149,15 @@ OUTPUTS = $(patsubst %,$(outdir)/%.dat,$(WHICH))
 # to make on the command line.
 XMLTOC = \
        aarch64.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 \
+       arc-v2.xml \
+       arc-arcompact.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 \
@@ -151,6 +165,8 @@ XMLTOC = \
        i386/amd64-linux.xml \
        i386/amd64-mpx-linux.xml \
        i386/amd64-mpx.xml \
+       i386/amd64-avx-mpx-linux.xml \
+       i386/amd64-avx-mpx.xml \
        i386/amd64.xml \
        i386/i386-avx-linux.xml \
        i386/i386-avx.xml \
@@ -161,6 +177,8 @@ XMLTOC = \
        i386/i386-mmx.xml \
        i386/i386-mpx-linux.xml \
        i386/i386-mpx.xml \
+       i386/i386-avx-mpx-linux.xml \
+       i386/i386-avx-mpx.xml \
        i386/i386.xml \
        i386/x32-avx-linux.xml \
        i386/x32-avx.xml \
@@ -174,6 +192,7 @@ XMLTOC = \
        mips-linux.xml \
        mips64-dsp-linux.xml \
        mips64-linux.xml \
+       nds32.xml \
        nios2-linux.xml \
        nios2.xml \
        rs6000/powerpc-32.xml \
@@ -252,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
@@ -266,6 +285,10 @@ $(outdir)/i386/i386-mpx.dat: i386/32bit-core.xml i386/32bit-avx.xml \
                               i386/32bit-mpx.xml
 $(outdir)/i386/i386-mpx-linux.dat: i386/32bit-core.xml         i386/32bit-avx.xml \
                               i386/32bit-linux.xml i386/32bit-mpx.xml
+$(outdir)/i386/i386-mpx-linux.dat: i386/32bit-core.xml \
+                              i386/32bit-linux.xml i386/32bit-mpx.xml
+$(outdir)/i386/i386-avx-mpx-linux.dat: i386/32bit-core.xml \
+                              i386/32bit-linux.xml i386/32bit-mpx.xml
 $(outdir)/i386/i386-avx512.dat: i386/32bit-core.xml i386/32bit-avx.xml \
                               i386/32bit-mpx.xml i386/32bit-avx512.xml
 $(outdir)/i386/i386-avx512-linux.dat: i386/32bit-core.xml i386/32bit-avx.xml \
@@ -277,8 +300,12 @@ $(outdir)/i386/amd64-avx-linux.dat: i386/64bit-core.xml i386/64bit-avx.xml \
                                    i386/64bit-linux.xml
 $(outdir)/i386/amd64-mpx-linux.dat: i386/64bit-core.xml i386/64bit-avx.xml \
                               i386/64bit-linux.xml i386/64bit-mpx.xml
+$(outdir)/i386/amd64-avx-mpx-linux.dat: i386/64bit-core.xml \
+                              i386/64bit-linux.xml i386/64bit-mpx.xml
 $(outdir)/i386/amd64-mpx.dat: i386/64bit-core.xml i386/64bit-avx.xml \
                               i386/64bit-mpx.xml
+$(outdir)/i386/amd64-avx-mpx.dat: i386/64bit-core.xml \
+                              i386/64bit-mpx.xml
 $(outdir)/i386/amd64-avx512.dat: i386/64bit-core.xml i386/64bit-avx.xml \
                               i386/64bit-mpx.xml i386/64bit-avx512.xml
 $(outdir)/i386/amd64-avx512-linux.dat: i386/64bit-core.xml i386/64bit-avx.xml \