From 773e305efc3f35d32cd325125510507d5429c35d Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Tue, 7 Aug 2007 05:36:32 +0000
Subject: * include/stdlib.h: Add libc_hidden_proto for strto*, __strto*_l.

	Remove __strto*_l inlines.
	* include/wchar.h: Add libc_hidden_proto for wcsto*, __wcsto*_l.
	* stdlib/strtod.c: Add libc_hidden_def.
	* stdlib/strtod_l.c: Likewise.
	* stdlib/strtold.c [__LONG_DOUBLE_MATH_OPTIONAL]: Add libc_hidden_proto
	for __new_strtold and __new_wcstold.
	* sysdeps/ieee754/ldbl-128ibm/strtold_l.c: Add libc_hidden_proto for
	__STRTOF, STRTOF.
	* stdlib/strtol.c: Add libc_hidden_def.
	* stdlib/strtol_l.c: Likewise.
	* sysdeps/wordsize-64/strtol.c: Add libc_hidden_ver for strtoll and
	strtoq.

	* scripts/data/localplt-powerpc-linux-gnu.data: New file.

	* 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 | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'elf/Makefile')

diff --git a/elf/Makefile b/elf/Makefile
index 1c5b16908a..d1b3c5a1f5 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -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)
-- 
cgit 1.4.1