Module Name: src Committed By: pooka Date: Fri Nov 27 13:50:29 UTC 2009
Modified Files: src/share/mk: bsd.klinks.mk src/sys/arch/amd64/include: Makefile.inc Log Message: Move -mcmodel=kernel CFLAGS from bsd.klinks.mk to amd64/include/Makefile.inc to avoid having the kernel toolchain flags split over a billion different files. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/mk/bsd.klinks.mk cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/include/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/share/mk/bsd.klinks.mk diff -u src/share/mk/bsd.klinks.mk:1.5 src/share/mk/bsd.klinks.mk:1.6 --- src/share/mk/bsd.klinks.mk:1.5 Sun Mar 15 05:57:54 2009 +++ src/share/mk/bsd.klinks.mk Fri Nov 27 13:50:29 2009 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.klinks.mk,v 1.5 2009/03/15 05:57:54 tsutsui Exp $ +# $NetBSD: bsd.klinks.mk,v 1.6 2009/11/27 13:50:29 pooka Exp $ # .include <bsd.own.mk> @@ -23,9 +23,6 @@ CLEANFILES+= x86 .elif ${MACHINE} == "amd64" CLEANFILES+= x86 -.if !defined(RUMPKERNEL) -CFLAGS+= -mcmodel=kernel -.endif .endif .if defined(XEN_BUILD) || ${MACHINE} == "xen" Index: src/sys/arch/amd64/include/Makefile.inc diff -u src/sys/arch/amd64/include/Makefile.inc:1.2 src/sys/arch/amd64/include/Makefile.inc:1.3 --- src/sys/arch/amd64/include/Makefile.inc:1.2 Wed Nov 25 17:08:08 2009 +++ src/sys/arch/amd64/include/Makefile.inc Fri Nov 27 13:50:29 2009 @@ -1,4 +1,10 @@ -# $NetBSD: Makefile.inc,v 1.2 2009/11/25 17:08:08 tron Exp $ +# $NetBSD: Makefile.inc,v 1.3 2009/11/27 13:50:29 pooka Exp $ CFLAGS+= -mno-red-zone + +# this should really be !(RUMPKERNEL && PIC) +.if !defined(RUMPKERNEL) +CFLAGS+= -mcmodel=kernel +.endif + USE_SSP?= yes