aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-11-06 09:48:05 +0000
committerUlrich Drepper <drepper@redhat.com>2003-11-06 09:48:05 +0000
commitc685b2b0b4e86f488ead098816292684362e55f7 (patch)
tree11fb207b58dc7ca4173d77490c394b073b9d7881 /nptl
parent44e941492d0dcefa98e0b7686ecfba3f39ded173 (diff)
downloadglibc-c685b2b0b4e86f488ead098816292684362e55f7.zip
glibc-c685b2b0b4e86f488ead098816292684362e55f7.tar.gz
glibc-c685b2b0b4e86f488ead098816292684362e55f7.tar.bz2
Update.
2003-11-06 Ulrich Drepper <drepper@redhat.com> * Makefile: Add magic to clean up correctly.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/Makefile6
-rw-r--r--nptl/tst-cleanup4aux.c8
3 files changed, 12 insertions, 6 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 220c2e8..df85903 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-06 Ulrich Drepper <drepper@redhat.com>
+
+ * Makefile: Add magic to clean up correctly.
+
2003-11-05 Jakub Jelinek <jakub@redhat.com>
* unwind.c (FRAME_LEFT): Define.
diff --git a/nptl/Makefile b/nptl/Makefile
index 8c519ff..f3ba929 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -262,7 +262,7 @@ modules-names = tst-atfork2mod tst-tls3mod tst-tls4moda tst-tls4modb \
tst-tls5mod tst-tls5moda tst-tls5modb tst-tls5modc \
tst-tls5modd tst-tls5mode tst-tls5modf \
tst-_res1mod1 tst-_res1mod2 tst-execstack-mod
-extra-objs += $(addsuffix .os,$(strip $(modules-names)))
+extra-objs += $(addsuffix .os,$(strip $(modules-names))) tst-cleanup4aux.o
test-extras += $(modules-names)
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
@@ -521,7 +521,9 @@ $(objpfx)$(multidir)/crtn.o: $(objpfx)crtn.o $(objpfx)$(multidir)/
ln -f $< $@
endif
-generated += crti.S crtn.S defs.h pt-initfini.s
+generated += crti.S crtn.S defs.h pt-initfini.s libpthread_nonshared.a \
+ multidir.mk tst-atfork2.mtrace tst-cancel-wrappers.out \
+ tst-tls6.out
generated += $(objpfx)tst-atfork2.mtrace \
$(addsuffix .so,$(strip $(modules-names)))
diff --git a/nptl/tst-cleanup4aux.c b/nptl/tst-cleanup4aux.c
index 0fcec5d..cd1a89a 100644
--- a/nptl/tst-cleanup4aux.c
+++ b/nptl/tst-cleanup4aux.c
@@ -44,7 +44,7 @@ fn3 (void)
_pthread_cleanup_push (&b, clh, (void *) 4l);
fn0 ();
-
+
_pthread_cleanup_pop (&b, 1);
}
@@ -68,7 +68,7 @@ fn5 (void)
_pthread_cleanup_push (&b, clh, (void *) 6l);
fn4 ();
-
+
_pthread_cleanup_pop (&b, 1);
}
@@ -92,7 +92,7 @@ fn7 (void)
_pthread_cleanup_push (&b, clh, (void *) 8l);
fn6 ();
-
+
_pthread_cleanup_pop (&b, 1);
}
@@ -116,6 +116,6 @@ fn9 (void)
_pthread_cleanup_push (&b, clh, (void *) 10l);
fn8 ();
-
+
_pthread_cleanup_pop (&b, 1);
}