This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Move localplt baselines to sysdeps directories


This patch moves the localplt baseline data to sysdeps directories,
much like the ABI test baselines were moved, so eliminating a case
where system selection uses special ABI names instead of the normal
sysdeps mechanism.  (I intend to move the C++ types test baselines as
well later.)  All the baselines go in the same directories as the ABI
baselines, except that there was only one m68k localplt baseline so I
moved that to sysdeps/unix/sysv/linux/m68k/nptl/ rather than creating
separate copies for m680x0 and coldfire (which have separate ABI test
baselines).

Tested x86 and x86_64.  Diffs here shown with git diff -M.  (Given
that this is purely moving files around, I don't think separate
validation for each architecture will be particularly valuable.)

2012-07-13  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.

ports/ChangeLog.alpha:
2012-07-13  Joseph Myers  <joseph@codesourcery.com>

	* data/localplt-alpha-linux-gnu.data: Move to ...
	* sysdeps/unix/sysv/linux/alpha/nptl/localplt.data: ... here.

ports/ChangeLog.arm:
2012-07-13  Joseph Myers  <joseph@codesourcery.com>

	* data/localplt-arm-linux-gnueabi.data: Move to ...
	* sysdeps/unix/sysv/linux/arm/nptl/localplt.data: ... here.

ports/ChangeLog.ia64:
2012-07-13  Joseph Myers  <joseph@codesourcery.com>

	* data/localplt-ia64-linux-gnu.data: Move to ...
	* sysdeps/unix/sysv/linux/ia64/nptl/localplt.data: ... here.

ports/ChangeLog.m68k:
2012-07-13  Joseph Myers  <joseph@codesourcery.com>

	* data/localplt-m68k-linux-gnu.data: Move to ...
	* sysdeps/unix/sysv/linux/m68k/nptl/localplt.data: ... here.

ports/ChangeLog.powerpc:
2012-07-13  Joseph Myers  <joseph@codesourcery.com>

	* data/localplt-powerpcsoft-linux-gnu.data: Move to ...
	* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/localplt.data:
	... here.

diff --git a/elf/Makefile b/elf/Makefile
index 9054199..b999376 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/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

-- 
Joseph S. Myers
joseph@codesourcery.com


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]