diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | config.make.in | 1 | ||||
| -rw-r--r-- | nptl/ChangeLog | 8 | ||||
| -rw-r--r-- | nptl/Makefile | 3 | ||||
| -rw-r--r-- | nptl/tst-cancel-wrappers.sh | 5 |
5 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 3a0c652e90..6fbc12d6d1 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 b6d1c945dc..c22acf4a10 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 317e02a705..6154e61c67 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 184057b572..bc563f8969 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 dad2a674e1..b16ab2fe9e 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 |