Move localplt baselines to sysdeps directories.

20 files changed, 60 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 5f26926569..cb1dfaf108 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2012-07-20  Joseph Myers  <joseph@codesourcery.com>
+
+	* elf/Makefile (check-data): Remove.
+	(localplt.data): New vpath directive.
+	($(objpfx)check-localplt.out): Use localplt.data from vpath
+	instead of $(check-data).
+	* scripts/data/localplt-generic.data: Move to ...
+	* sysdeps/generic/localplt.data: ... here.
+	* scripts/data/localplt-i386-linux-gnu.data: Move to ...
+	* sysdeps/unix/sysv/linux/i386/nptl/localplt.data: ... here.
+	* scripts/data/localplt-powerpc-linux-gnu.data: Move to ...
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/localplt.data:
+	... here.
+	* scripts/data/localplt-powerpc64-linux-gnu.data: Move to ...
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/localplt.data:
+	... here.
+	* scripts/data/localplt-s390-linux-gnu.data: Move to ...
+	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data:
+	... here.
+	* scripts/data/localplt-s390x-linux-gnu.data: Move to ...
+	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/localplt.data:
+	... here.
+	* scripts/data/localplt-sparc-linux-gnu.data: Move to ...
+	* sysdeps/unix/sysv/linux/sparc/sparc32/nptl/localplt.data:
+	... here.
+	* scripts/data/localplt-sparc64-linux-gnu.data: Move to ...
+	* sysdeps/unix/sysv/linux/sparc/sparc64/nptl/localplt.data:
+	... here.
+
 2012-07-19 Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	* sysdeps/powerpc/tls-macros.h: Split PowerPC definitions in
diff --git a/elf/Makefile b/elf/Makefile
index 90541991d2..b99937624c 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -947,15 +947,6 @@ $(all-built-dso:=.jmprel): %.jmprel: % Makefile
 	mv -f $@T $@
 common-generated += $(all-built-dso:$(common-objpfx)%=%.jmprel)
 
-check-data := $(firstword $(wildcard \
-		$(foreach D,$(add-ons) scripts,\
-			  $(patsubst %,$(..)$D/data/localplt-%.data,\
-				     $(abi-name) \
-				     $(addsuffix -$(config-os),\
-						 $(config-machine) \
-						 $(base-machine)) \
-			   generic))))
-
 tests: $(objpfx)check-localplt.out
 
 localplt-built-dso := $(addprefix $(common-objpfx),\
@@ -970,12 +961,14 @@ ifeq ($(have-thread-library),yes)
 localplt-built-dso += $(filter-out %_nonshared.a, $(shared-thread-library))
 endif
 
+vpath localplt.data $(+sysdep_dirs)
+
 $(objpfx)check-localplt.out: $(..)scripts/check-localplt.awk \
 			     $(..)scripts/localplt.awk \
 			     $(localplt-built-dso:=.jmprel) \
-			     $(check-data)
-	LC_ALL=C $(AWK) -f $(filter-out $< $(check-data),$^) | \
-	  LC_ALL=C $(AWK) -f $< $(check-data) - \
+			     localplt.data
+	LC_ALL=C $(AWK) -f $(filter-out $< %localplt.data,$^) | \
+	  LC_ALL=C $(AWK) -f $< $(filter %localplt.data,$^) - \
 	  > $@
 endif
 
diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 258ba615dc..a262261692 100644
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,3 +1,8 @@
+2012-07-20  Joseph Myers  <joseph@codesourcery.com>
+
+	* data/localplt-alpha-linux-gnu.data: Move to ...
+	* sysdeps/unix/sysv/linux/alpha/nptl/localplt.data: ... here.
+
 2012-07-17  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/alpha/nptl/c++-types.data: Move from
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 6ec068f05e..43f27203d3 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,8 @@
+2012-07-20  Joseph Myers  <joseph@codesourcery.com>
+
+	* data/localplt-arm-linux-gnueabi.data: Move to ...
+	* sysdeps/unix/sysv/linux/arm/nptl/localplt.data: ... here.
+
 2012-07-17  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/arm/configure.in: Remove TLS check.
diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
index e430cdc2b9..f1d53daddf 100644
--- a/ports/ChangeLog.ia64
+++ b/ports/ChangeLog.ia64
@@ -1,3 +1,8 @@
+2012-07-20  Joseph Myers  <joseph@codesourcery.com>
+
+	* data/localplt-ia64-linux-gnu.data: Move to ...
+	* sysdeps/unix/sysv/linux/ia64/nptl/localplt.data: ... here.
+
 2012-07-17  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/ia64/nptl/c++-types.data: Move from
diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index 6a933872cd..988ae041d2 100644
--- a/ports/ChangeLog.m68k
+++ b/ports/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2012-07-20  Joseph Myers  <joseph@codesourcery.com>
+
+	* data/localplt-m68k-linux-gnu.data: Move to ...
+	* sysdeps/unix/sysv/linux/m68k/nptl/localplt.data: ... here.
+
 2012-07-17  Joseph Myers  <joseph@codesourcery.com>
 
 	* data/c++-types-m68k-linux-gnu.data: Move to ...
diff --git a/ports/ChangeLog.powerpc b/ports/ChangeLog.powerpc
index 5ef5cacb5f..f3d4c1dbc7 100644
--- a/ports/ChangeLog.powerpc
+++ b/ports/ChangeLog.powerpc
@@ -1,3 +1,9 @@
+2012-07-20  Joseph Myers  <joseph@codesourcery.com>
+
+	* data/localplt-powerpcsoft-linux-gnu.data: Move to ...
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/localplt.data:
+	... here.
+
 2012-07-17  Joseph Myers  <joseph@codesourcery.com>
 
 	* data/c++-types-powerpcsoft-linux-gnu.data: Move to ...
diff --git a/ports/data/localplt-alpha-linux-gnu.data b/ports/sysdeps/unix/sysv/linux/alpha/nptl/localplt.data
index 00700d1e02..00700d1e02 100644
--- a/ports/data/localplt-alpha-linux-gnu.data
+++ b/ports/sysdeps/unix/sysv/linux/alpha/nptl/localplt.data
diff --git a/ports/data/localplt-arm-linux-gnueabi.data b/ports/sysdeps/unix/sysv/linux/arm/nptl/localplt.data
index 109522e37e..109522e37e 100644
--- a/ports/data/localplt-arm-linux-gnueabi.data
+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/localplt.data
diff --git a/ports/data/localplt-ia64-linux-gnu.data b/ports/sysdeps/unix/sysv/linux/ia64/nptl/localplt.data
index ba488163bb..ba488163bb 100644
--- a/ports/data/localplt-ia64-linux-gnu.data
+++ b/ports/sysdeps/unix/sysv/linux/ia64/nptl/localplt.data
diff --git a/ports/data/localplt-m68k-linux-gnu.data b/ports/sysdeps/unix/sysv/linux/m68k/nptl/localplt.data
index d266b8f74b..d266b8f74b 100644
--- a/ports/data/localplt-m68k-linux-gnu.data
+++ b/ports/sysdeps/unix/sysv/linux/m68k/nptl/localplt.data
diff --git a/ports/data/localplt-powerpcsoft-linux-gnu.data b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/localplt.data
index 0743b08a39..0743b08a39 100644
--- a/ports/data/localplt-powerpcsoft-linux-gnu.data
+++ b/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/localplt.data
diff --git a/scripts/data/localplt-generic.data b/sysdeps/generic/localplt.data
index d2965199f3..d2965199f3 100644
--- a/scripts/data/localplt-generic.data
+++ b/sysdeps/generic/localplt.data
diff --git a/scripts/data/localplt-i386-linux-gnu.data b/sysdeps/unix/sysv/linux/i386/nptl/localplt.data
index 8fb56b6086..8fb56b6086 100644
--- a/scripts/data/localplt-i386-linux-gnu.data
+++ b/sysdeps/unix/sysv/linux/i386/nptl/localplt.data
diff --git a/scripts/data/localplt-powerpc-linux-gnu.data b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/localplt.data
index 8fb56b6086..8fb56b6086 100644
--- a/scripts/data/localplt-powerpc-linux-gnu.data
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/localplt.data
diff --git a/scripts/data/localplt-powerpc64-linux-gnu.data b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/localplt.data
index 2219aa9048..2219aa9048 100644
--- a/scripts/data/localplt-powerpc64-linux-gnu.data
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/localplt.data
diff --git a/scripts/data/localplt-s390-linux-gnu.data b/sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data
index 8fb56b6086..8fb56b6086 100644
--- a/scripts/data/localplt-s390-linux-gnu.data
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/nptl/localplt.data
diff --git a/scripts/data/localplt-s390x-linux-gnu.data b/sysdeps/unix/sysv/linux/s390/s390-64/nptl/localplt.data
index 8fb56b6086..8fb56b6086 100644
--- a/scripts/data/localplt-s390x-linux-gnu.data
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/nptl/localplt.data
diff --git a/scripts/data/localplt-sparc-linux-gnu.data b/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/localplt.data
index 15ba18b96d..15ba18b96d 100644
--- a/scripts/data/localplt-sparc-linux-gnu.data
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/localplt.data
diff --git a/scripts/data/localplt-sparc64-linux-gnu.data b/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/localplt.data
index 6f1769c026..6f1769c026 100644
--- a/scripts/data/localplt-sparc64-linux-gnu.data
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/localplt.data