diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2019-11-07 20:42:29 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2019-11-07 20:42:29 +0000 |
| commit | 3ff3f71ff3208de3d266d976d32d4db90d6b3fb6 (patch) | |
| tree | 5694dc5f52e037594888fb3764e15a85ddbf0feb /sys/arch/i386/conf | |
| parent | 2301c8319f5a1f935328e8b774b0118665a026b7 (diff) | |
The compiler -pg option implies -fno-ret-protector, as we want to disable
retguard and similar when profiling. However, that missed all the .S files,
as ${PROF} wasn't added when ${NORMAL_S} was converted from direct invocation
of ${AS} to instead use ${CC}. Similarly, mcount.o still had retguards
as it cannot be built with -pg. So: pass ${PROF} when compiling .S files,
and compile "no profiling" files with -fno-ret-protector on archs with
retguard.
feedback and ok mpi@ mortimer@
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/Makefile.i386 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 5764d7bf693..0fbe0b53a40 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.135 2019/06/21 15:34:07 deraadt Exp $ +# $OpenBSD: Makefile.i386,v 1.136 2019/11/07 20:42:28 guenther Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -66,7 +66,7 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< NORMAL_C_NOP= ${CC} ${CFLAGS} ${CPPFLAGS} -c $< NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $< -NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $< +NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} ${PROF} -c $< %OBJS |