GNU C Library master sources branch hjl/ifunc/test updated. glibc-2.16-ports-merge-423-ga4db001

[hjl at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, hjl/ifunc/test has been updated
       via  a4db001ee8bd6e34789d2cb107c2b6c38513c20b (commit)
      from  0349e3949ca90540d23d472acb1542c41e5de595 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a4db001ee8bd6e34789d2cb107c2b6c38513c20b

commit a4db001ee8bd6e34789d2cb107c2b6c38513c20b
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Sun Sep 23 15:25:57 2012 -0700

    Filter out ifunc tests if multi-arch isn't enabled

diff --git a/ChangeLog.test-ifunc b/ChangeLog.test-ifunc
index 543909c..e930fc6 100644
--- a/ChangeLog.test-ifunc
+++ b/ChangeLog.test-ifunc
@@ -1,5 +1,14 @@
 2012-09-23  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* Rules (binaries-ifunc-tests): Cleared if multi-arch isn't
+	enabled.
+	(binaries-static-ifunc-tests): Likewise.
+	(binaries-static-ifunc-xtests): Likewise.
+	(tests): Filter out $(tests-ifunc) if multi-arch isn't enabled.
+	(xtests): Filter out $(xtests-ifunc) if multi-arch isn't enabled.
+
+2012-09-23  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* Makeconfig (link-libc-ifunc): Replace libc-test.o with
 	libc-func.o.
 	(link-libc-ifunc-tests): Likewise.
diff --git a/Rules b/Rules
index aebb987..e44fd26 100644
--- a/Rules
+++ b/Rules
@@ -108,7 +108,6 @@ binaries-all = $(binaries-all-notests) $(binaries-all-tests)
 binaries-static-notests = $(others-static)
 binaries-static-tests = $(tests-static) $(xtests-static)
 binaries-static = $(binaries-static-notests) $(binaries-static-tests)
-binaries-ifunc-tests = $(tests-ifunc) $(xtests-ifunc)
 ifeq (yesyes,$(have-fpie)$(build-shared))
 binaries-pie = $(others-pie) $(tests-pie) $(xtests-pie)
 else
@@ -124,10 +123,19 @@ binaries-static =
 binaries-pie =
 endif
 
+ifeq ($(multi-arch),yes)
+binaries-ifunc-tests = $(tests-ifunc) $(xtests-ifunc)
 binaries-static-ifunc-tests = $(filter $(binaries-ifunc-tests), \
 				       $(binaries-static-tests))
 binaries-shared-ifunc-tests = $(filter-out $(binaries-static-ifunc-tests), \
 					   $(binaries-ifunc-tests))
+else
+binaries-ifunc-tests =
+binaries-static-ifunc-tests =
+binaries-shared-ifunc-tests =
+tests := $(filter-out $(tests-ifunc), $(tests))
+xtests := $(filter-out $(xtests-ifunc), $(xtests))
+endif
 
 binaries-shared-tests = $(filter-out $(binaries-pie) $(binaries-static) \
 					$(binaries-ifunc-tests), \

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog.test-ifunc |    9 +++++++++
 Rules                |   10 +++++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources