summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-05-04 23:27:34 +0000
committerRoland McGrath <roland@gnu.org>2003-05-04 23:27:34 +0000
commitc6696b7957c62d89379d765c9a9008441ee7580c (patch)
tree88591bb3719915e92dbffb9f61816d412d12cc23
parent4b0b5882391d3286130125c5c50860ba22d46246 (diff)
* csu/Makefile ($(csu-dummies) target rule): Don't use a temp C file.
Depend on $(before-compile).
-rw-r--r--ChangeLog3
-rw-r--r--csu/Makefile8
-rw-r--r--linuxthreads/ChangeLog4
-rw-r--r--linuxthreads/Makefile1
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/Makefile1
6 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e2a57b1fc9..3dcc52e497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2003-05-04 Roland McGrath <roland@redhat.com>
+ * 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 2adf57dfba..d1899ad3e2 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 04616f1b56..8f695c631f 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-04 Roland McGrath <roland@redhat.com>
+
+ * Makefile ($(objpfx)../libc.so): New target.
+
2003-04-26 Ulrich Drepper <drepper@redhat.com>
* pthread.c (__pthread_initialize_manager): Remove one last
diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile
index d832074432..f105bd6454 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 963fd6f51e..a1efb2bf26 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-04 Roland McGrath <roland@redhat.com>
+
+ * Makefile ($(objpfx)../libc.so): New target.
+
2003-05-02 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
diff --git a/nptl/Makefile b/nptl/Makefile
index 5a91ff8dfa..a0bd3640f5 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