Quick fix for high resolution kernel profiling on i386's. Use

-finstrument-functions instead of -mprofiler-epilogue.  The former
works essentially the same as the latter but has a higher overhead
(about 22 more bytes per function for passing unused args to the
profiling functions).

Removed all traces of the IDENT Makefile variable, which had been
reduced to just a place for holding profiling's contribution to CFLAGS
(the IDENT that gives the kernel identity was renamed to KERN_IDENT).

1 files changed, 8 insertions, 10 deletions

diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 3e213c7..3a83c70 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -38,7 +38,7 @@ INCLUDES+= -I$S/../include
 INCLUDES+= -I/usr/include
 .endif
 
-COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
+COPTS=	${INCLUDES} -D_KERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -fno-common
 
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
@@ -50,18 +50,16 @@ ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
 CFLAGS+=	${FMT}
 
 .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1
-IDENT=	-DGPROF
-PROF=	-pg
-.endif
-
-DEFINED_PROF=	${PROF}
-.if defined(PROF)
-CFLAGS+=	-falign-functions=16
+CFLAGS+=	-DGPROF -falign-functions=16
 .if ${PROFLEVEL} >= 2
-IDENT+=	-DGPROF4 -DGUPROF
-PROF+=	-mprofiler-epilogue
+CFLAGS+=	-DGPROF4 -DGUPROF
+# XXX -Wno-inline is to break some warnings.
+PROF=	-finstrument-functions -Wno-inline
+.else
+PROF=	-pg
 .endif
 .endif
+DEFINED_PROF=	${PROF}
 
 .if defined(NO_WERROR)
 WERROR=