2007-08-06 Roland McGrath <roland@redhat.com>
authorroland <roland>
Tue, 7 Aug 2007 05:35:58 +0000 (05:35 +0000)
committerroland <roland>
Tue, 7 Aug 2007 05:35:58 +0000 (05:35 +0000)
* scripts/data/localplt-x86_64-linux-gnu.data: File renamed to ...
* scripts/data/localplt-generic.data: ... here.
* elf/Makefile (check-data): Get generic file if no other.
($(objpfx)check-localplt.out): Make target unconditional.

elf/Makefile
scripts/data/localplt-generic.data [new file with mode: 0644]
scripts/data/localplt-x86_64-linux-gnu.data [deleted file]

index 1c5b169..d1b3c5a 100644 (file)
@@ -837,28 +837,26 @@ $(objpfx)tst-dlmodcount: $(libdl)
 $(objpfx)tst-dlmodcount.out: $(test-modules)
 
 check-data := $(firstword $(wildcard \
-               $(foreach M,$(config-machine) $(base-machine),\
-                         ../scripts/data/localplt-$M-$(config-os).data)))
-ifneq (,$(check-data))
+               $(patsubst %,../scripts/data/localplt-%.data,\
+                          $(addsuffix -$(config-os),\
+                                      $(config-machine) $(base-machine))\
+                          generic)))
 tests: $(objpfx)check-localplt.out
 
 ifeq ($(have-thread-library),yes)
 thread-dso := $(filter-out %_nonshared.a, $(shared-thread-library))
 endif
 
-$(objpfx)check-localplt.out: $(objpfx)check-localplt $(common-objpfx)libc.so \
-                            $(common-objpfx)math/libm.so $(thread-dso) \
-                            $(common-objpfx)rt/librt.so \
-                            $(common-objpfx)dlfcn/libdl.so \
+$(objpfx)check-localplt.out: $(objpfx)check-localplt \
+                            $(common-objpfx)libc.so \
+                            $(common-objpfx)math/libm.so $(thread-dso) \
+                            $(common-objpfx)rt/librt.so \
+                            $(common-objpfx)dlfcn/libdl.so \
                             $(check-data)
-       $(objpfx)check-localplt $(common-objpfx)libc.so \
-                               $(common-objpfx)math/libm.so $(thread-dso) \
-                               $(common-objpfx)rt/librt.so \
-                               $(common-objpfx)dlfcn/libdl.so | \
+       $(dir $<)$(notdir $<) $(filter-out $< $(check-data),$^) | \
          LC_ALL=C sort | \
          diff -u $(check-data) - > $@
 endif
-endif
 
 $(objpfx)tst-dlopenrpathmod.so: $(libdl)
 $(objpfx)tst-dlopenrpath: $(objpfx)tst-dlopenrpathmod.so $(libdl)
diff --git a/scripts/data/localplt-generic.data b/scripts/data/localplt-generic.data
new file mode 100644 (file)
index 0000000..2219aa9
--- /dev/null
@@ -0,0 +1,6 @@
+libc.so: calloc
+libc.so: free
+libc.so: malloc
+libc.so: memalign
+libc.so: realloc
+libm.so: matherr
diff --git a/scripts/data/localplt-x86_64-linux-gnu.data b/scripts/data/localplt-x86_64-linux-gnu.data
deleted file mode 100644 (file)
index 2219aa9..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-libc.so: calloc
-libc.so: free
-libc.so: malloc
-libc.so: memalign
-libc.so: realloc
-libm.so: matherr