Move c++-types baselines to sysdeps directories.

diff --git a/ChangeLog b/ChangeLog
index 899c149..0102d47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,39 @@
 2012-07-17  Joseph Myers  <joseph@codesourcery.com>
 
+       * Makefile [CXX] (check-data): Remove.
+       [CXX] (c++-types.data): New vpath directive.
+       [CXX] ($(objpfx)c++-types-check.out): Use c++-types.data from
+       vpath.  Do not allow for C++ type data being missing.
+       * scripts/data/c++-types-alpha-linux-gnu.data: Move to
+       ports/sysdeps/unix/sysv/linux/alpha/nptl/c++-types.data.
+       * scripts/data/c++-types-ia64-linux-gnu.data: Move to
+       ports/sysdeps/unix/sysv/linux/ia64/nptl/c++-types.data.
+       * scripts/data/c++-types-i386-linux-gnu.data: Move to ...
+       * sysdeps/unix/sysv/linux/i386/nptl/c++-types.data: ... here.
+       * scripts/data/c++-types-powerpc-linux-gnu.data: Move to ...
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/c++-types.data:
+       ... here.
+       * scripts/data/c++-types-powerpc64-linux-gnu.data: Move to ...
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/c++-types.data:
+       ... here.
+       * scripts/data/c++-types-s390-linux-gnu.data: Move to ...
+       * sysdeps/unix/sysv/linux/s390/s390-32/nptl/c++-types.data:
+       ... here.
+       * scripts/data/c++-types-s390x-linux-gnu.data: Move to ...
+       * sysdeps/unix/sysv/linux/s390/s390-64/nptl/c++-types.data:
+       ... here.
+       * scripts/data/c++-types-sparc-linux-gnu.data: Move to ...
+       * sysdeps/unix/sysv/linux/sparc/sparc32/nptl/c++-types.data:
+       ... here.
+       * scripts/data/c++-types-sparc64-linux-gnu.data: Move to ...
+       * sysdeps/unix/sysv/linux/sparc/sparc64/nptl/c++-types.data:
+       ... here.
+       * scripts/data/c++-types-x32-linux-gnu.data: Move to ...
+       * sysdeps/unix/sysv/linux/x86_64/x32/nptl/c++-types.data:
+       ... here.
+       * scripts/data/c++-types-x86_64-linux-gnu.data: Move to ...
+       * sysdeps/unix/sysv/linux/x86_64/64/nptl/c++-types.data: ... here.
+
        * elf/tls-macros.h (TLS_LE): Move architecture-specific
        definitions to architecture-specific files.
        (TLS_IE): Likewise.

diff --git a/Makefile b/Makefile
index 89588c1..b0d3edb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -272,21 +272,11 @@ tests-clean:
 
 tests: $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out
 ifneq ($(CXX),no)
-check-data := $(firstword $(wildcard \
-               $(foreach D,$(add-ons) scripts,\
-                         $(patsubst %,$D/data/c++-types-%.data,\
-                                    $(abi-name) \
-                                    $(addsuffix -$(config-os),\
-                                                $(config-machine) \
-                                                $(base-machine))))))
-ifneq (,$(check-data))
-$(objpfx)c++-types-check.out: $(check-data) scripts/check-c++-types.sh
+
+vpath c++-types.data $(+sysdep_dirs)
+
+$(objpfx)c++-types-check.out: c++-types.data scripts/check-c++-types.sh
        scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu99 -Wstrict-prototypes,$(CFLAGS)) $(CPPFLAGS) > $@
-else
-$(objpfx)c++-types-check.out:
-       @echo 'WARNING C++ tests not run; create a c++-types-XXX file'
-       @echo "not run" > $@
-endif
 endif
 
 $(objpfx)check-local-headers.out: scripts/check-local-headers.sh

diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 062b4f2..258ba61 100644 (file)
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,3 +1,8 @@
+2012-07-17  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/alpha/nptl/c++-types.data: Move from
+       ../scripts/data/c++-types-alpha-linux-gnu.data.
+
 2012-06-15  Richard Henderson  <rth@twiddle.net>
 
        * sysdeps/alpha/soft-fp/sfp-machine.h (FP_TRAPPING_EXCEPTIONS): New.

diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 881682b..b105355 100644 (file)
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,8 @@
+2012-07-17  Joseph Myers  <joseph@codesourcery.com>
+
+       * data/c++-types-arm-linux-gnueabi.data: Move to ...
+       * sysdeps/unix/sysv/linux/arm/nptl/c++-types.data: ... here.
+
 2012-07-12  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/arm/kernel-features.h

diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
index c9e9ea7..e430cdc 100644 (file)
--- a/ports/ChangeLog.ia64
+++ b/ports/ChangeLog.ia64
@@ -1,3 +1,8 @@
+2012-07-17  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/ia64/nptl/c++-types.data: Move from
+       ../scripts/data/c++-types-ia64-linux-gnu.data.
+
 2012-05-30  Mike Frysinger  <vapier@gentoo.org>
 
        * sysdeps/unix/sysv/linux/ia64/syscalls.list: Remove

diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 838a44e..6a93387 100644 (file)
--- a/ports/ChangeLog.m68k
+++ b/ports/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2012-07-17  Joseph Myers  <joseph@codesourcery.com>
+
+       * data/c++-types-m68k-linux-gnu.data: Move to ...
+       * sysdeps/unix/sysv/linux/m68k/nptl/c++-types.data: ... here.
+
 2012-07-16  Andreas Schwab  <schwab@linux-m68k.org>
 
        * sysdeps/unix/sysv/linux/m68k/m680x0/Makefile: New file.

diff --git a/ports/ChangeLog.powerpc b/ports/ChangeLog.powerpc
index 7141bb2..5ef5cac 100644 (file)
--- a/ports/ChangeLog.powerpc
+++ b/ports/ChangeLog.powerpc
@@ -1,3 +1,9 @@
+2012-07-17  Joseph Myers  <joseph@codesourcery.com>
+
+       * data/c++-types-powerpcsoft-linux-gnu.data: Move to ...
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/c++-types.data:
+       ... here.
+
 2012-07-03  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platforms): Add

diff --git a/scripts/data/c++-types-alpha-linux-gnu.data b/ports/sysdeps/unix/sysv/linux/alpha/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-alpha-linux-gnu.data
rename to ports/sysdeps/unix/sysv/linux/alpha/nptl/c++-types.data

diff --git a/scripts/data/c++-types-powerpc-linux-gnu.data b/ports/sysdeps/unix/sysv/linux/arm/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-powerpc-linux-gnu.data
rename to ports/sysdeps/unix/sysv/linux/arm/nptl/c++-types.data

diff --git a/scripts/data/c++-types-x86_64-linux-gnu.data b/ports/sysdeps/unix/sysv/linux/ia64/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-x86_64-linux-gnu.data
rename to ports/sysdeps/unix/sysv/linux/ia64/nptl/c++-types.data

diff --git a/scripts/data/c++-types-i386-linux-gnu.data b/ports/sysdeps/unix/sysv/linux/m68k/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-i386-linux-gnu.data
rename to ports/sysdeps/unix/sysv/linux/m68k/nptl/c++-types.data

diff --git a/ports/data/c++-types-powerpcsoft-linux-gnu.data b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/c++-types.data
similarity index 100%
rename from ports/data/c++-types-powerpcsoft-linux-gnu.data
rename to ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/c++-types.data

diff --git a/ports/data/c++-types-m68k-linux-gnu.data b/sysdeps/unix/sysv/linux/i386/nptl/c++-types.data
similarity index 100%
rename from ports/data/c++-types-m68k-linux-gnu.data
rename to sysdeps/unix/sysv/linux/i386/nptl/c++-types.data

diff --git a/ports/data/c++-types-arm-linux-gnueabi.data b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/c++-types.data
similarity index 100%
rename from ports/data/c++-types-arm-linux-gnueabi.data
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/c++-types.data

diff --git a/scripts/data/c++-types-s390x-linux-gnu.data b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-s390x-linux-gnu.data
rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/c++-types.data

diff --git a/scripts/data/c++-types-s390-linux-gnu.data b/sysdeps/unix/sysv/linux/s390/s390-32/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-s390-linux-gnu.data
rename to sysdeps/unix/sysv/linux/s390/s390-32/nptl/c++-types.data

diff --git a/scripts/data/c++-types-powerpc64-linux-gnu.data b/sysdeps/unix/sysv/linux/s390/s390-64/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-powerpc64-linux-gnu.data
rename to sysdeps/unix/sysv/linux/s390/s390-64/nptl/c++-types.data

diff --git a/scripts/data/c++-types-sparc-linux-gnu.data b/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-sparc-linux-gnu.data
rename to sysdeps/unix/sysv/linux/sparc/sparc32/nptl/c++-types.data

diff --git a/scripts/data/c++-types-sparc64-linux-gnu.data b/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-sparc64-linux-gnu.data
rename to sysdeps/unix/sysv/linux/sparc/sparc64/nptl/c++-types.data

diff --git a/scripts/data/c++-types-ia64-linux-gnu.data b/sysdeps/unix/sysv/linux/x86_64/64/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-ia64-linux-gnu.data
rename to sysdeps/unix/sysv/linux/x86_64/64/nptl/c++-types.data

diff --git a/scripts/data/c++-types-x32-linux-gnu.data b/sysdeps/unix/sysv/linux/x86_64/x32/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-x32-linux-gnu.data
rename to sysdeps/unix/sysv/linux/x86_64/x32/nptl/c++-types.data