diff options
| author | Roland McGrath <roland@gnu.org> | 1995-10-11 05:53:53 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-10-11 05:53:53 +0000 |
| commit | db65048bb3c73fc0ec408df62c6f78fa39d62d85 (patch) | |
| tree | bd924c431be839070bf9c83bbfe75e889a3ce57e | |
| parent | 8e3cc80f6d4f69ce003c82d3561ac324692792ad (diff) | |
| download | glibc-db65048bb3c73fc0ec408df62c6f78fa39d62d85.tar.gz glibc-db65048bb3c73fc0ec408df62c6f78fa39d62d85.tar.xz glibc-db65048bb3c73fc0ec408df62c6f78fa39d62d85.zip | |
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.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makeconfig | 2 | ||||
| -rw-r--r-- | csu/initfini.c | 5 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/profil.c | 7 |
4 files changed, 18 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index a9547c4097..ec8d131519 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 25740cb097..d21d7114e0 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 8dcd30a008..b0d0e68cbd 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 4032219a9e..43456ec628 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); |