Move localplt baselines to sysdeps directories.

diff --git a/ChangeLog b/ChangeLog
index 5f26926569e654f832ec86cbf92ba8952f49cfc1..cb1dfaf108e84c656398b62d78efa205d3b81889 100644 (file)
--- 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 90541991d204cc8422740511f1e8725fdf48b37c..b99937624c019788c08f2f496d03736920bd6050 100644 (file)
--- 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 258ba615dc1a5c117adf514b03ea3f655641ee07..a262261692e9a1306c6abf6811f6bd61e3647ec4 100644 (file)
--- 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 6ec068f05e242487f46921638b26b15cdf2ed793..43f27203d3ff676e9b8a9b83959954c857903179 100644 (file)
--- 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 e430cdc2b962a1f07ce5c44800a84450206ac581..f1d53daddffde73e87f01e48914e17c2a7dea9d3 100644 (file)
--- 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 6a933872cdc75bd0bf6d2eb2cbac7a85dadfe04f..988ae041d26c88ca47db2e81efecb8b6307c2e20 100644 (file)
--- 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 5ef5cacb5fda70d56ca259978c2f414c24eaa10b..f3d4c1dbc72a9a84f7a44172a98fb68ce23e68c8 100644 (file)
--- 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
similarity index 100%
rename from ports/data/localplt-alpha-linux-gnu.data
rename to 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
similarity index 100%
rename from ports/data/localplt-arm-linux-gnueabi.data
rename to 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
similarity index 100%
rename from ports/data/localplt-ia64-linux-gnu.data
rename to 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
similarity index 100%
rename from ports/data/localplt-m68k-linux-gnu.data
rename to 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
similarity index 100%
rename from ports/data/localplt-powerpcsoft-linux-gnu.data
rename to ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/localplt.data

diff --git a/scripts/data/localplt-generic.data b/sysdeps/generic/localplt.data
similarity index 100%
rename from scripts/data/localplt-generic.data
rename to sysdeps/generic/localplt.data

diff --git a/scripts/data/localplt-i386-linux-gnu.data b/sysdeps/unix/sysv/linux/i386/nptl/localplt.data
similarity index 100%
rename from scripts/data/localplt-i386-linux-gnu.data
rename to 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
similarity index 100%
rename from scripts/data/localplt-powerpc-linux-gnu.data
rename to 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
similarity index 100%
rename from scripts/data/localplt-powerpc64-linux-gnu.data
rename to 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
similarity index 100%
rename from scripts/data/localplt-s390-linux-gnu.data
rename to 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
similarity index 100%
rename from scripts/data/localplt-s390x-linux-gnu.data
rename to 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
similarity index 100%
rename from scripts/data/localplt-sparc-linux-gnu.data
rename to 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
similarity index 100%
rename from scripts/data/localplt-sparc64-linux-gnu.data
rename to sysdeps/unix/sysv/linux/sparc/sparc64/nptl/localplt.data