GNU C Library master sources branch master updated. glibc-2.17-521-g01dc6df

[siddhesh@sourceware.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, master has been updated
       via  01dc6df938832fe923ac394812553c0fc8a0f113 (commit)
      from  8da491f585f6112630688d0632407f5460136ffe (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=01dc6df938832fe923ac394812553c0fc8a0f113

commit 01dc6df938832fe923ac394812553c0fc8a0f113
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date:   Thu Apr 11 09:37:50 2013 +0530

    Don't use run-via-rtld-prefix for anything other than tests
    
    run-via-rtld-prefix checks whether the program to be run is a static
    test and skips if it is.  This is fine, except that it assumes that
    the program to be run is the second $^, which is true only for tests.
    
    This change creates an rtld-prefix, which is simply the dynamic linker
    prefix with the necessary arguments and uses that in the non-test
    targets.

diff --git a/ChangeLog b/ChangeLog
index 5d8b297..6aaff9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-04-11  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
+	* Makeconfig (rtld-prefix): Define built linker prefix.
+	* Rules (run-bench): Use it.
+	* math/Makefile (run-regen-ulps): Likewise.
+
 	* Rules (bench): Remove eval.
 
 2013-04-10  Siddhesh Poyarekar  <siddhesh@redhat.com>
diff --git a/Makeconfig b/Makeconfig
index 70deb1e..a3d3e70 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -604,6 +604,9 @@ endif
 # How to run a program we just linked with our library.
 # The program binary is assumed to be $(word 2,$^).
 built-program-file = $(dir $(word 2,$^))$(notdir $(word 2,$^))
+rtld-prefix = $(elf-objpfx)$(rtld-installed-name)			      \
+	      --library-path						      \
+	      $(rpath-link)$(patsubst %,:%,$(sysdep-library-path))
 ifeq (yes,$(build-shared))
 comma = ,
 sysdep-library-path = \
@@ -617,9 +620,7 @@ $(subst $(empty) ,:,$(strip $(patsubst -Wl$(comma)-rpath-link=%, %,\
 # empty.
 run-via-rtld-prefix =							      \
   $(if $(strip $(filter $(notdir $(built-program-file)),		      \
-			$(tests-static) $(xtests-static))),,		      \
-       $(elf-objpfx)$(rtld-installed-name)				      \
-	 --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)))
+			$(tests-static) $(xtests-static))),, $(rtld-prefix))
 else
 run-via-rtld-prefix =
 endif
diff --git a/Rules b/Rules
index e8e1117..a75d25b 100644
--- a/Rules
+++ b/Rules
@@ -194,7 +194,7 @@ binaries-bench := $(addprefix $(objpfx)bench-,$(bench))
 
 run-bench = $(test-wrapper-env) \
 	    GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
-	    $($*-ENV) $(run-via-rtld-prefix) $${run}
+	    $($*-ENV) $(rtld-prefix) $${run}
 
 bench: $(binaries-bench)
 	for run in $^; do \
diff --git a/math/Makefile b/math/Makefile
index ee5b582..9f0bf72 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -156,7 +156,7 @@ ifneq (no,$(PERL))
 
 run-regen-ulps = $(test-wrapper-env) \
 	    GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
-	    $($*-ENV) $(run-via-rtld-prefix) $${run}
+	    $($*-ENV) $(rtld-prefix) $${run}
 
 regen-ulps: $(addprefix $(objpfx),$(libm-tests))
 	rm -f $(objpfx)ULPs; rm -f $(objpfx)NewUlps; \

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

Summary of changes:
 ChangeLog     |    4 ++++
 Makeconfig    |    7 ++++---
 Rules         |    2 +-
 math/Makefile |    2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)


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