[commits] r1357 - in /branches/eglibc-2_5/libc: ./ nptl/

[jimb@xxxxxxxxxx]

Author: jimb
Date: Fri Feb  2 10:42:56 2007
New Revision: 1357

Log:
	Use the host nm in NPTL tests.
	* aclocal.m4 (LIBC_PROG_BINUTILS): Find path to 'nm', too.
        * configure: Regenerated.
	* config.make.in: Accept 'nm' path from configure script.
	* nptl/Makefile (tst-cancel-wrappers.out): Pass 'nm' path to test
	script.
	* nptl/tst-cancel-wrappers.sh: Use the 'nm' given in arguments.

Modified:
    branches/eglibc-2_5/libc/ChangeLog.eglibc
    branches/eglibc-2_5/libc/aclocal.m4
    branches/eglibc-2_5/libc/config.make.in
    branches/eglibc-2_5/libc/configure
    branches/eglibc-2_5/libc/nptl/Makefile
    branches/eglibc-2_5/libc/nptl/tst-cancel-wrappers.sh

Modified: branches/eglibc-2_5/libc/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_5/libc/ChangeLog.eglibc (original)
+++ branches/eglibc-2_5/libc/ChangeLog.eglibc Fri Feb  2 10:42:56 2007
@@ -1,3 +1,13 @@
+2007-02-02  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
+
+	Use the host nm in NPTL tests.
+	* aclocal.m4 (LIBC_PROG_BINUTILS): Find path to 'nm', too.
+        * configure: Regenerated.
+	* config.make.in: Accept 'nm' path from configure script.
+	* nptl/Makefile (tst-cancel-wrappers.out): Pass 'nm' path to test
+	script.
+	* nptl/tst-cancel-wrappers.sh: Use the 'nm' given in arguments.
+
 2007-01-25  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
 
 	* Makerules: Allow option groups to control xtests as well.

Modified: branches/eglibc-2_5/libc/aclocal.m4
==============================================================================
--- branches/eglibc-2_5/libc/aclocal.m4 (original)
+++ branches/eglibc-2_5/libc/aclocal.m4 Fri Feb  2 10:42:56 2007
@@ -97,6 +97,8 @@
 LD=`$CC -print-prog-name=ld`
 AR=`$CC -print-prog-name=ar`
 AC_SUBST(AR)
+NM=`$CC -print-prog-name=nm`
+AC_SUBST(NM)
 OBJDUMP=`$CC -print-prog-name=objdump`
 AC_SUBST(OBJDUMP)
 

Modified: branches/eglibc-2_5/libc/config.make.in
==============================================================================
--- branches/eglibc-2_5/libc/config.make.in (original)
+++ branches/eglibc-2_5/libc/config.make.in Fri Feb  2 10:42:56 2007
@@ -102,6 +102,7 @@
 CFLAGS = @CFLAGS@
 ASFLAGS-config = @ASFLAGS_config@
 AR = @AR@
+NM = @NM@
 RANLIB = @RANLIB@
 MAKEINFO = @MAKEINFO@
 AS = $(CC) -c

Modified: branches/eglibc-2_5/libc/configure
==============================================================================
--- branches/eglibc-2_5/libc/configure (original)
+++ branches/eglibc-2_5/libc/configure Fri Feb  2 10:42:56 2007
@@ -313,7 +313,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons add_on_subdirs base_machine submachine sysnames sysdeps_add_ons INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES CXX_SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_cc_with_libunwind libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_hashstyle fno_unit_at_a_time libc_cv_ssp libc_cv_have_initfini no_whole_archive exceptions LIBGD have_libaudit have_libcap have_selinux EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons add_on_subdirs base_machine submachine sysnames sysdeps_add_ons INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR NM OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES CXX_SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_cc_with_libunwind libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_hashstyle fno_unit_at_a_time libc_cv_ssp libc_cv_have_initfini no_whole_archive exceptions LIBGD have_libaudit have_libcap have_selinux EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3859,6 +3859,8 @@
 AS=`$CC -print-prog-name=as`
 LD=`$CC -print-prog-name=ld`
 AR=`$CC -print-prog-name=ar`
+
+NM=`$CC -print-prog-name=nm`
 
 OBJDUMP=`$CC -print-prog-name=objdump`
 
@@ -8486,6 +8488,7 @@
 s,@CXXFLAGS@,$CXXFLAGS,;t t
 s,@ac_ct_CXX@,$ac_ct_CXX,;t t
 s,@AR@,$AR,;t t
+s,@NM@,$NM,;t t
 s,@OBJDUMP@,$OBJDUMP,;t t
 s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t

Modified: branches/eglibc-2_5/libc/nptl/Makefile
==============================================================================
--- branches/eglibc-2_5/libc/nptl/Makefile (original)
+++ branches/eglibc-2_5/libc/nptl/Makefile Fri Feb  2 10:42:56 2007
@@ -592,16 +592,17 @@
 LDFLAGS-pthread.so += -e __nptl_main
 endif
 
-ifeq (no,$(cross-compiling))
+# eglibc: 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 > $@
 endif
-endif
+# eglibc: endif
 
 tst-exec4-ARGS = $(built-program-cmd)
 

Modified: branches/eglibc-2_5/libc/nptl/tst-cancel-wrappers.sh
==============================================================================
--- branches/eglibc-2_5/libc/nptl/tst-cancel-wrappers.sh (original)
+++ branches/eglibc-2_5/libc/nptl/tst-cancel-wrappers.sh Fri Feb  2 10:42:56 2007
@@ -19,8 +19,9 @@
 # Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307 USA.
 
+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