about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makeconfig5
-rw-r--r--gmon/Makefile11
3 files changed, 18 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 908b4551d3..e6fc5701cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Tue Jan 16 17:37:39 1996  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
+	* gmon/Makefile (CFLAGS-mcount.c): New variable.
+	(mcount.po): New target.
+
+	* Makeconfig (CFLAGS): Append $(CFLAGS-$(<F)).
+
 	* csu/Makefile [have-initfini=yes] (CPPFLAGS): Append -DHAVE_INITFINI.
 	(initfini): Compile initfini.c with -fPIC.
 
diff --git a/Makeconfig b/Makeconfig
index 03df0d56dd..ce057c3a01 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -421,7 +421,8 @@ libio-include = -I$(..)libio
 # These are the variables that the implicit compilation rules use.
 CPPFLAGS = $(+includes) $(defines) -include $(..)libc-symbols.h \
 	   $(sysdep-CPPFLAGS) $(CPPFLAGS-$(suffix $@))
-override CFLAGS	= $(+cflags) $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@))
+override CFLAGS	= $(+cflags) $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) \
+		  $(CFLAGS-$(<F))
 
 
 # This is the macro that the implicit linking rules use.
diff --git a/gmon/Makefile b/gmon/Makefile
index 3bd4201b72..e44e3c75af 100644
--- a/gmon/Makefile
+++ b/gmon/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -26,3 +26,12 @@ headers	:= sys/gmon.h machine-gmon.h
 routines := gmon mcount profil
 
 include ../Rules
+
+# The mcount code won't work without a frame pointer.
+CFLAGS-mcount.c := -fno-omit-frame-pointer
+
+# We cannot compile mcount.c with -pg because that would
+# create resursive calls.  Just copy the normal static object.
+$(objpfx)mcount.po: $(objpfx)mcount.o
+	rm -f $@
+	ln $< $@