From c6696b7957c62d89379d765c9a9008441ee7580c Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 4 May 2003 23:27:34 +0000 Subject: * csu/Makefile ($(csu-dummies) target rule): Don't use a temp C file. Depend on $(before-compile). --- ChangeLog | 3 +++ csu/Makefile | 8 +++----- linuxthreads/ChangeLog | 4 ++++ linuxthreads/Makefile | 1 + nptl/ChangeLog | 4 ++++ nptl/Makefile | 1 + 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2a57b1..3dcc52e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-05-04 Roland McGrath + * csu/Makefile ($(csu-dummies) target rule): Don't use a temp C file. + Depend on $(before-compile). + * csu/Makefile ($(objpfx)crt%.o): Replace implicit rule with a static pattern rule. The implicit rule could be ruled out when $(objpfx) didn't exist at the time of its consideration (ugh!). diff --git a/csu/Makefile b/csu/Makefile index 2adf57d..d1899ad 100644 --- a/csu/Makefile +++ b/csu/Makefile @@ -179,11 +179,9 @@ $(addprefix $(objpfx),$(sort g$(start-installed-name) \ # These extra files are sometimes expected by system standard linking # procedures, but we have nothing for them to do. So compile empty files. -$(addprefix $(objpfx),$(filter-out $(start-installed-name),$(csu-dummies))): - @-rm -f $(@:.o=.c) - echo > $(@:.o=.c) - $(COMPILE.c) $(@:.o=.c) $(OUTPUT_OPTION) - rm -f $(@:.o=.c) +$(addprefix $(objpfx),$(filter-out $(start-installed-name),$(csu-dummies))):\ + $(before-compile) + $(COMPILE.c) -o $@ -x c /dev/null # These headers are used by the startup code. $(objpfx)abi-tag.h: $(..)abi-tags diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 04616f1..8f695c6 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,7 @@ +2003-05-04 Roland McGrath + + * Makefile ($(objpfx)../libc.so): New target. + 2003-04-26 Ulrich Drepper * pthread.c (__pthread_initialize_manager): Remove one last diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile index d832074..f105bd6 100644 --- a/linuxthreads/Makefile +++ b/linuxthreads/Makefile @@ -222,6 +222,7 @@ $(addprefix $(objpfx), \ $(addprefix $(objpfx), $(tests-reverse)): \ $(objpfx)../libc.so $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a +$(objpfx)../libc.so: $(common-objpfx)libc.so ; $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.so $(objpfx)unload: $(common-objpfx)dlfcn/libdl.so $(objpfx)unload.out: $(objpfx)libpthread.so $(objpfx)libpthread_nonshared.a diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 963fd6f..a1efb2b 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2003-05-04 Roland McGrath + + * Makefile ($(objpfx)../libc.so): New target. + 2003-05-02 Ulrich Drepper * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h diff --git a/nptl/Makefile b/nptl/Makefile index 5a91ff8..a0bd364 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -314,6 +314,7 @@ $(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so $(addprefix $(objpfx), $(tests-reverse)): \ $(objpfx)../libc.so $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a +$(objpfx)../libc.so: $(common-objpfx)libc.so ; $(addprefix $(objpfx),$(tests-static)): $(objpfx)libpthread.a $(objpfx)tst-atfork2.out: $(objpfx)tst-atfork2mod.so -- cgit v1.1