abilist-pattern configurability

This patch creates implicit rules to match the abifiles if
abilist-pattern is defined in the architecture Makefile. This allows
machine specific Makefiles to define different abifiles names
(for instance *-le.abilist for powerpc64le).

diff --git a/ChangeLog b/ChangeLog
index f9f89fcc12525d2aefb82237d1754c34e680df21..d9fa673bc0fb1ce074348f3f34be62e6e80016f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-02-04  Roland McGrath  <roland@hack.frob.com>
+           Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
+
+       * sysdeps/powerpc/Makefile [$(config-machine) ends with 'le']
+       (abilist-pattern): New variable, set to %-le.abilist.
+
+       * Makerules (abilist-pattern): New variable.
+       (vpath): Use $(abilist-pattern) in place of %.abilist.
+       (check-abi-% pattern rule): Likewise.
+       (check-abi, update-abi): Likewise.
+
 2014-02-04  Eric Wong  <normalperson@yhbt.net>
 
        * sysdeps/x86_64/fpu/libm-test-ulps: Update.

diff --git a/Makerules b/Makerules
index b7e556ff5f18fcdf448dc71a514cc8ce467974ec..b46b09b369b4e1c5c7a99e523f22e9f4a3d0969f 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1175,6 +1175,14 @@ ifeq ($(build-shared),yes)
        LC_ALL=C $(OBJDUMP) --dynamic-syms $< > $@T
        mv -f $@T $@
 
+# A sysdeps/.../Makefile can set abilist-pattern to something like
+# %-foo.abilist to look for libc-foo.abilist instead of libc.abilist.
+# This makes sense if multiple ABIs can be most cleanly supported by a
+# configuration without using separate sysdeps directories for each.
+ifdef abilist-pattern
+vpath $(abilist-pattern) $(+sysdep_dirs)
+endif
+
 vpath %.abilist $(+sysdep_dirs)
 
 # The .PRECIOUS rule prevents the files built by an implicit rule whose
@@ -1184,18 +1192,42 @@ vpath %.abilist $(+sysdep_dirs)
 .PRECIOUS: %.symlist
 generated += $(extra-libs:=.symlist)
 
+ifdef abilist-pattern
+check-abi-%: $(common-objpfx)config.make $(abilist-pattern) $(objpfx)%.symlist
+       $(check-abi-pattern)
+check-abi-%: $(common-objpfx)config.make $(abilist-pattern) \
+            $(common-objpfx)%.symlist
+       $(check-abi-pattern)
+endif
 check-abi-%: $(common-objpfx)config.make %.abilist $(objpfx)%.symlist
        $(check-abi)
 check-abi-%: $(common-objpfx)config.make %.abilist $(common-objpfx)%.symlist
        $(check-abi)
+define check-abi-pattern
+       diff -p -U 0 $(filter $(abilist-pattern),$^) $(filter %.symlist,$^)
+endef
 define check-abi
        diff -p -U 0 $(filter %.abilist,$^) $(filter %.symlist,$^)
 endef
 
+ifdef abilist-pattern
+update-abi-%: $(objpfx)%.symlist $(abilist-pattern)
+       $(update-abi-pattern)
+update-abi-%: $(common-objpfx)%.symlist $(abilist-pattern)
+       $(update-abi-pattern)
+endif
 update-abi-%: $(objpfx)%.symlist %.abilist
        $(update-abi)
 update-abi-%: $(common-objpfx)%.symlist %.abilist
        $(update-abi)
+define update-abi-pattern
+@if cmp -s $^ 2> /dev/null; \
+ then \
+      echo '+++ $(filter $(abilist-pattern),$^) is unchanged'; \
+ else cp -f $^; \
+      echo '*** Now check $(filter $(abilist-pattern),$^) changes for correctness ***'; \
+ fi
+endef
 define update-abi
 @if cmp -s $^ 2> /dev/null; \
  then \

diff --git a/sysdeps/powerpc/Makefile b/sysdeps/powerpc/Makefile
index f75e62523c3a794f832932c7d37b13b4ecf93fed..b11edd77bd2c22d41a04a6dd63527a2ea8a3c50d 100644 (file)
--- a/sysdeps/powerpc/Makefile
+++ b/sysdeps/powerpc/Makefile
@@ -27,3 +27,7 @@ ifeq ($(subdir),misc)
 sysdep_headers += sys/platform/ppc.h
 tests += test-gettimebase
 endif
+
+ifneq (,$(filter %le,$(config-machine)))
+abilist-pattern = %-le.abilist
+endif