Update.

	* Makefile (tests-nolibpthread): Add tst-unload.  Don't link with
	libpthread for the files in this list.
	(CFLAGS-tst-unload): Removed.
	* tst-unload.c (do_test): Don't use complete path for
	LIBPHREAD_SO.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 5ac0a6296fe2c56dd59d2d83f4b20e5e8736afc2..a9dc41a7a044ec54c35add8c5a9c705fc125b0fa 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,11 @@
 2004-02-25  Ulrich Drepper  <drepper@redhat.com>
 
+       * Makefile (tests-nolibpthread): Add tst-unload.  Don't link with
+       libpthread for the files in this list.
+       (CFLAGS-tst-unload): Removed.
+       * tst-unload.c (do_test): Don't use complete path for
+       LIBPHREAD_SO.
+
        * Makefile: Define sonames for tst-tls5mod, tst-_res1mod1, and
        tst-_res1mod2.
 

diff --git a/nptl/Makefile b/nptl/Makefile
index 08cd85eadfc7572d669788f07be75165649d466f..2694c97989519961427ab09142ba4daf99fe8b0c 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -238,6 +238,9 @@ tests = tst-attr1 tst-attr2 tst-attr3 \
        tst-backtrace1 \
        tst-oddstacklimit
 
+# Files which must not be linked with libpthread.
+tests-nolibpthread = tst-unload
+
 # This sets the stack resource limit to 1023kb, which is not a multiple
 # of the page size since every architecture's page size is > 1k.
 tst-oddstacklimit-ENV = ; ulimit -s 1023;
@@ -375,8 +378,6 @@ endif
 # function frequently to get a thread-specific handle.
 CFLAGS-pthread_self.os += -fomit-frame-pointer
 
-CFLAGS-tst-unload.c += -DPREFIX=\"$(objpfx)\"
-
 # Run the cancellation and cleanup tests also for the modern, exception-based
 # implementation.  For this we have to pass the -fexceptions parameter.
 CFLAGS-tst-cancelx2.c += -fexceptions
@@ -484,7 +485,7 @@ $(objpfx)libpthread.so: $(common-objpfx)libc.so \
 # Make sure we link with the thread library.
 ifeq ($(build-shared),yes)
 $(addprefix $(objpfx), \
-  $(filter-out $(tests-static) $(tests-reverse), \
+  $(filter-out $(tests-static) $(tests-reverse) $(tests-nolibpthread), \
     $(tests) $(test-srcs))): $(objpfx)libpthread.so \
                             $(objpfx)libpthread_nonshared.a
 $(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so

diff --git a/nptl/tst-unload.c b/nptl/tst-unload.c
index ca779fe1b57e0745c3ce28908e057e36d4e2c5cb..ad86518caa248b8086c532fdd4d4a5f6f1f91923 100644 (file)
--- a/nptl/tst-unload.c
+++ b/nptl/tst-unload.c
@@ -1,5 +1,5 @@
 /* Tests for non-unloading of libpthread.
-   Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
 static int
 do_test (void)
 {
-  void *p = dlopen (PREFIX LIBPTHREAD_SO, RTLD_LAZY);
+  void *p = dlopen (LIBPTHREAD_SO, RTLD_LAZY);
 
   if (p == NULL)
     {