From: Joseph Myers Date: Fri, 20 Jul 2012 19:20:34 +0000 (+0000) Subject: Move localplt baselines to sysdeps directories. X-Git-Tag: glibc-2.17~818 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f48659e36e72c091f988d9ea5a2dd505960ab0f;p=thirdparty%2Fglibc.git Move localplt baselines to sysdeps directories. --- diff --git a/ChangeLog b/ChangeLog index 5f26926569e..cb1dfaf108e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +2012-07-20 Joseph Myers + + * 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 * sysdeps/powerpc/tls-macros.h: Split PowerPC definitions in diff --git a/elf/Makefile b/elf/Makefile index 90541991d20..b99937624c0 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 258ba615dc1..a262261692e 100644 --- a/ports/ChangeLog.alpha +++ b/ports/ChangeLog.alpha @@ -1,3 +1,8 @@ +2012-07-20 Joseph Myers + + * data/localplt-alpha-linux-gnu.data: Move to ... + * sysdeps/unix/sysv/linux/alpha/nptl/localplt.data: ... here. + 2012-07-17 Joseph Myers * sysdeps/unix/sysv/linux/alpha/nptl/c++-types.data: Move from diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 6ec068f05e2..43f27203d3f 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,3 +1,8 @@ +2012-07-20 Joseph Myers + + * data/localplt-arm-linux-gnueabi.data: Move to ... + * sysdeps/unix/sysv/linux/arm/nptl/localplt.data: ... here. + 2012-07-17 Joseph Myers * sysdeps/arm/configure.in: Remove TLS check. diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64 index e430cdc2b96..f1d53daddff 100644 --- a/ports/ChangeLog.ia64 +++ b/ports/ChangeLog.ia64 @@ -1,3 +1,8 @@ +2012-07-20 Joseph Myers + + * data/localplt-ia64-linux-gnu.data: Move to ... + * sysdeps/unix/sysv/linux/ia64/nptl/localplt.data: ... here. + 2012-07-17 Joseph Myers * sysdeps/unix/sysv/linux/ia64/nptl/c++-types.data: Move from diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k index 6a933872cdc..988ae041d26 100644 --- a/ports/ChangeLog.m68k +++ b/ports/ChangeLog.m68k @@ -1,3 +1,8 @@ +2012-07-20 Joseph Myers + + * data/localplt-m68k-linux-gnu.data: Move to ... + * sysdeps/unix/sysv/linux/m68k/nptl/localplt.data: ... here. + 2012-07-17 Joseph Myers * data/c++-types-m68k-linux-gnu.data: Move to ... diff --git a/ports/ChangeLog.powerpc b/ports/ChangeLog.powerpc index 5ef5cacb5fd..f3d4c1dbc72 100644 --- a/ports/ChangeLog.powerpc +++ b/ports/ChangeLog.powerpc @@ -1,3 +1,9 @@ +2012-07-20 Joseph Myers + + * data/localplt-powerpcsoft-linux-gnu.data: Move to ... + * sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/localplt.data: + ... here. + 2012-07-17 Joseph Myers * 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