This is the mail archive of the libc-ports@sources.redhat.com mailing list for the libc-ports project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Move c++-types baselines to sysdeps directories


Similar to my localplt patch
<http://sourceware.org/ml/libc-alpha/2012-07/msg00273.html>, this
patch moves the c++-types baseline data to sysdeps directories
(including a couple of cases where the data had not moved to ports
when the rest of the support for an architecture did), eliminating
another case of special ABI names being used instead of the usual
sysdeps directory approach.  It makes the data required for a clean
test run, which is in line with the approach taken for ABI test
baselines (and this is really just another ABI test) and is the
simplest thing to implement with the vpath approach.

The only libc systems missing this data are SH and Hurd (Hurd is also
missing *.abilist for the main ABI tests).  Once this patch is in I
intend to add the data for MIPS in ports (the patch makes it easier to
have separate data for each of the three ABIs).  Data is also missing
in ports for HPPA (and am33).  In addition, this patch does not move
the data for Tile to its appropriate sysdeps locations; I'm leaving
that for the Tile maintainer, since as I recall there was an issue
with wanting to have separate 32-bit and 64-bit data which with the
previous system would have required setting up associated ABI names
(so it may be more than just moving files; a new file may be needed as
well).

Tested x86 and x86_64.

2012-07-16  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.

ports/ChangeLog.alpha:
2012-07-16  Joseph Myers  <joseph@codesourcery.com>

	* sysdeps/unix/sysv/linux/alpha/nptl/c++-types.data: Move from
	../scripts/data/c++-types-alpha-linux-gnu.data.

ports/ChangeLog.arm:
2012-07-16  Joseph Myers  <joseph@codesourcery.com>

	* data/c++-types-arm-linux-gnueabi.data: Move to ...
	* sysdeps/unix/sysv/linux/arm/nptl/c++-types.data: ... here.

ports/ChangeLog.ia64:
2012-07-16  Joseph Myers  <joseph@codesourcery.com>

	* sysdeps/unix/sysv/linux/ia64/nptl/c++-types.data: Move from
	../scripts/data/c++-types-ia64-linux-gnu.data.

ports/ChangeLog.m68k:
2012-07-16  Joseph Myers  <joseph@codesourcery.com>

	* data/c++-types-m68k-linux-gnu.data: Move to ...
	* sysdeps/unix/sysv/linux/m68k/nptl/c++-types.data: ... here.

ports/ChangeLog.powerpc:
2012-07-16  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.

diff --git a/Makefile b/Makefile
index 89588c1..b0d3edb 100644
--- 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/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/ports/data/c++-types-arm-linux-gnueabi.data b/ports/sysdeps/unix/sysv/linux/arm/nptl/c++-types.data
similarity index 100%
rename from ports/data/c++-types-arm-linux-gnueabi.data
rename to ports/sysdeps/unix/sysv/linux/arm/nptl/c++-types.data
diff --git a/scripts/data/c++-types-ia64-linux-gnu.data b/ports/sysdeps/unix/sysv/linux/ia64/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-ia64-linux-gnu.data
rename to ports/sysdeps/unix/sysv/linux/ia64/nptl/c++-types.data
diff --git a/ports/data/c++-types-m68k-linux-gnu.data b/ports/sysdeps/unix/sysv/linux/m68k/nptl/c++-types.data
similarity index 100%
rename from ports/data/c++-types-m68k-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/scripts/data/c++-types-i386-linux-gnu.data b/sysdeps/unix/sysv/linux/i386/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-i386-linux-gnu.data
rename to sysdeps/unix/sysv/linux/i386/nptl/c++-types.data
diff --git a/scripts/data/c++-types-powerpc-linux-gnu.data b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-powerpc-linux-gnu.data
rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/c++-types.data
diff --git a/scripts/data/c++-types-powerpc64-linux-gnu.data b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-powerpc64-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-s390x-linux-gnu.data b/sysdeps/unix/sysv/linux/s390/s390-64/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-s390x-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-x86_64-linux-gnu.data b/sysdeps/unix/sysv/linux/x86_64/64/nptl/c++-types.data
similarity index 100%
rename from scripts/data/c++-types-x86_64-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

-- 
Joseph S. Myers
joseph@codesourcery.com


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]