GNU C Library master sources branch master updated. glibc-2.16-ports-merge-502-gaba7598

[jsm28 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, master has been updated
       via  aba759841b71e7c84218111713303180a389062e (commit)
      from  88d4247f1950ddcc23130b2881183b6b4cc3f9a3 (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=aba759841b71e7c84218111713303180a389062e

commit aba759841b71e7c84218111713303180a389062e
Author: Jim Blandy <jimb@codesourcery.com>
Date:   Sun Oct 21 22:38:34 2012 +0000

    Use $(NM) not nm in tst-cancel-wrappers.

diff --git a/ChangeLog b/ChangeLog
index 3a0c652..6fbc12d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-21  Jim Blandy  <jimb@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+
+	* config.make.in (NM): New variable.
+
 2012-10-21  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Remove all
diff --git a/config.make.in b/config.make.in
index b6d1c94..c22acf4 100644
--- a/config.make.in
+++ b/config.make.in
@@ -111,6 +111,7 @@ CPPFLAGS-config = @CPPFLAGS@
 CPPUNDEFS = @CPPUNDEFS@
 ASFLAGS-config = @ASFLAGS_config@
 AR = @AR@
+NM = @NM@
 MAKEINFO = @MAKEINFO@
 AS = $(CC) -c
 MIG = @MIG@
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 317e02a..6154e61 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,11 @@
+2012-10-21  Jim Blandy  <jimb@codesourcery.com>
+	    Joseph Myers  <joseph@codesourcery.com>
+
+	* Makefile ($(objpfx)tst-cancel-wrappers.out): Pass $(NM) to
+	tst-cancel-wrappers.sh.
+	* tst-cancel-wrappers.sh: Use nm program given as first argument,
+	not hardcoded "nm".
+
 2012-10-17  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	* tst-cond25.c (do_test_wait): Don't check for return value from
diff --git a/nptl/Makefile b/nptl/Makefile
index 184057b..bc563f8 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -587,7 +587,8 @@ ifeq (no,$(cross-compiling))
 ifeq (yes,$(build-shared))
 tests: $(objpfx)tst-cancel-wrappers.out
 $(objpfx)tst-cancel-wrappers.out: tst-cancel-wrappers.sh
-	$(SHELL) $< $(common-objpfx)libc_pic.a \
+	$(SHELL) $< '$(NM)' \
+		    $(common-objpfx)libc_pic.a \
 		    $(common-objpfx)libc.a \
 		    $(objpfx)libpthread_pic.a \
 		    $(objpfx)libpthread.a > $@
diff --git a/nptl/tst-cancel-wrappers.sh b/nptl/tst-cancel-wrappers.sh
index dad2a67..b16ab2f 100644
--- a/nptl/tst-cancel-wrappers.sh
+++ b/nptl/tst-cancel-wrappers.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test whether all cancelable functions are cancelable.
-# Copyright (C) 2002, 2003, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
 
@@ -18,8 +18,9 @@
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
 
+NM="$1"; shift
 while [ $# -gt 0 ]; do
-  ( nm -P $1; echo 'end[end]:' ) | gawk ' BEGIN {
+  ( $NM -P $1; echo 'end[end]:' ) | gawk ' BEGIN {
 C["accept"]=1
 C["close"]=1
 C["connect"]=1

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

Summary of changes:
 ChangeLog                   |    5 +++++
 config.make.in              |    1 +
 nptl/ChangeLog              |    8 ++++++++
 nptl/Makefile               |    3 ++-
 nptl/tst-cancel-wrappers.sh |    5 +++--
 5 files changed, 19 insertions(+), 3 deletions(-)


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