From: Roland McGrath <roland@gnu.org>
Date: Wed, 11 Oct 1995 05:53:53 +0000 (+0000)
Subject: Wed Oct 11 00:00:00 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
X-Git-Tag: cvs/libc-951016~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db65048bb3c73fc0ec408df62c6f78fa39d62d85;p=thirdparty%2Fglibc.git

Wed Oct 11 00:00:00 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>

	* Makeconfig (config-LDFLAGS): Add missing slash.

	* sysdeps/mach/hurd/profil.c (fork_profil): Only call
	update_waiter if profiling was enabled in the parent.

	* csu/initfini.c: Don't pass -f flag to cp.
---

diff --git a/ChangeLog b/ChangeLog
index a9547c4097e..ec8d1315190 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Oct 11 00:00:00 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* Makeconfig (config-LDFLAGS): Add missing slash.
+
+	* sysdeps/mach/hurd/profil.c (fork_profil): Only call
+	update_waiter if profiling was enabled in the parent.
+
+	* csu/initfini.c: Don't pass -f flag to cp.
+
 Tue Oct 10 23:08:53 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
 	* Makerules (build-shlib): Pass -rpath and -rpath-link options.
diff --git a/Makeconfig b/Makeconfig
index 25740cb097b..d21d7114e0e 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -275,7 +275,7 @@ ifndef +link
 endif
 ifndef config-LDFLAGS
 ifeq (yes,$(build-shared))
-config-LDFLAGS = -Wl,-dynamic-linker=$(libdir)$(rtld-installed-name)
+config-LDFLAGS = -Wl,-dynamic-linker=$(libdir)/$(rtld-installed-name)
 endif
 endif
 ifndef link-libc
diff --git a/csu/initfini.c b/csu/initfini.c
index 8dcd30a008a..b0d0e68cbd9 100644
--- a/csu/initfini.c
+++ b/csu/initfini.c
@@ -53,8 +53,9 @@ void _fini (void) __attribute__ ((section (".fini")));
 /* End the here document containing the initial common code.
    Then move the output file crtcommon.tmp to crti.s-new and crtn.s-new.  */
 asm ("\nEOF_common\n\
-mv -f crtcommon.tmp crti.s-new\n\
-cp -f crti.s-new crtn.s-new");
+rm -f crti.s-new crtn.s-new\n\
+mv crtcommon.tmp crti.s-new\n\
+cp crti.s-new crtn.s-new");
 
 /* Append the .init prologue to crti.s-new.  */
 asm ("cat >> crti.s-new <<\\EOF.crti.init");
diff --git a/sysdeps/mach/hurd/profil.c b/sysdeps/mach/hurd/profil.c
index 4032219a9eb..43456ec628b 100644
--- a/sysdeps/mach/hurd/profil.c
+++ b/sysdeps/mach/hurd/profil.c
@@ -158,7 +158,10 @@ fork_profil (void)
   ss = sample_scale;
   sample_scale = 0;
 
-  err = update_waiter (sb, n * sizeof *sb, o, ss);
-  assert_perror (err);
+  if (ss != 0)
+    {
+      err = update_waiter (sb, n * sizeof *sb, o, ss);
+      assert_perror (err);
+    }
 }
 text_set_element (_hurd_fork_child_hook, fork_profil);