2008-05-21 Roland McGrath <roland@redhat.com>
authorroland <roland>
Thu, 22 May 2008 00:03:43 +0000 (00:03 +0000)
committerroland <roland>
Thu, 22 May 2008 00:03:43 +0000 (00:03 +0000)
* Makefile (check-data): Use $(abi-name) before other guesses.
Look in $(add-ons) dirs before scripts/data/.
* elf/Makefile (check-data): Likewise.

Makefile
elf/Makefile

index 43c4f4d..437854e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1991-2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+# Copyright (C) 1991-2002,2003,2004,2005,2006,2008
+#      Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -246,8 +247,12 @@ tests-clean:
 tests: $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out
 ifneq ($(CXX),no)
 check-data := $(firstword $(wildcard \
-               $(foreach M,$(config-machine) $(base-machine),\
-                         scripts/data/c++-types-$M-$(config-os).data)))
+               $(foreach D,$(add-ons) scripts/data,\
+                         $(patsubst %,$D/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
        scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu99 -Wstrict-prototypes,$(CFLAGS)) $(CPPFLAGS) > $@
index 861485d..e509153 100644 (file)
@@ -841,10 +841,14 @@ $(objpfx)tst-dlmodcount: $(libdl)
 $(objpfx)tst-dlmodcount.out: $(test-modules)
 
 check-data := $(firstword $(wildcard \
-               $(patsubst %,../scripts/data/localplt-%.data,\
-                          $(addsuffix -$(config-os),\
-                                      $(config-machine) $(base-machine))\
-                          generic)))
+               $(foreach D,$(add-ons) scripts/data,\
+                         $(patsubst %,$(..)$D/localplt-%.data,\
+                                    $(abi-name) \
+                                    $(addsuffix -$(config-os),\
+                                                $(config-machine) \
+                                                $(base-machine)) \
+                          generic))))
+
 tests: $(objpfx)check-localplt.out
 
 ifeq ($(have-thread-library),yes)