mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-27 03:33:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jim Blandy 2012-10-21 22:38:34 +00:00 committed by Joseph Myers
parent 88d4247f19
commit aba759841b
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2012-10-21 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Remove all * sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Remove all

1
config.make.in
View File

@ -111,6 +111,7 @@ CPPFLAGS-config = @CPPFLAGS@
CPPUNDEFS = @CPPUNDEFS@ CPPUNDEFS = @CPPUNDEFS@
ASFLAGS-config = @ASFLAGS_config@ ASFLAGS-config = @ASFLAGS_config@
AR = @AR@ AR = @AR@
NM = @NM@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
AS = $(CC) -c AS = $(CC) -c
MIG = @MIG@ MIG = @MIG@

8
nptl/ChangeLog
View File

@ -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> 2012-10-17 Siddhesh Poyarekar <siddhesh@redhat.com>
* tst-cond25.c (do_test_wait): Don't check for return value from * tst-cond25.c (do_test_wait): Don't check for return value from

3
nptl/Makefile
View File

@ -587,7 +587,8 @@ ifeq (no,$(cross-compiling))
ifeq (yes,$(build-shared)) ifeq (yes,$(build-shared))
tests: $(objpfx)tst-cancel-wrappers.out tests: $(objpfx)tst-cancel-wrappers.out
$(objpfx)tst-cancel-wrappers.out: tst-cancel-wrappers.sh $(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 \ $(common-objpfx)libc.a \
$(objpfx)libpthread_pic.a \ $(objpfx)libpthread_pic.a \
$(objpfx)libpthread.a > $@ $(objpfx)libpthread.a > $@

5
nptl/tst-cancel-wrappers.sh
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Test whether all cancelable functions are cancelable. # 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. # This file is part of the GNU C Library.
# Contributed by Jakub Jelinek <jakub@redhat.com>, 2002. # Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
@ -18,8 +18,9 @@
# License along with the GNU C Library; if not, see # License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
NM="$1"; shift
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
( nm -P $1; echo 'end[end]:' ) | gawk ' BEGIN { ( $NM -P $1; echo 'end[end]:' ) | gawk ' BEGIN {
C["accept"]=1 C["accept"]=1
C["close"]=1 C["close"]=1
C["connect"]=1 C["connect"]=1