Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Move -mcmodel=kernel CFLAGS from bsd.klinks.mk to amd64/incl...



details:   https://anonhg.NetBSD.org/src/rev/62ee2eb05158
branches:  trunk
changeset: 749354:62ee2eb05158
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Nov 27 13:50:29 2009 +0000

description:
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.

diffstat:

 share/mk/bsd.klinks.mk              |  5 +----
 sys/arch/amd64/include/Makefile.inc |  8 +++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r 640f197f0766 -r 62ee2eb05158 share/mk/bsd.klinks.mk
--- a/share/mk/bsd.klinks.mk    Fri Nov 27 13:45:15 2009 +0000
+++ b/share/mk/bsd.klinks.mk    Fri Nov 27 13:50:29 2009 +0000
@@ -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"
diff -r 640f197f0766 -r 62ee2eb05158 sys/arch/amd64/include/Makefile.inc
--- a/sys/arch/amd64/include/Makefile.inc       Fri Nov 27 13:45:15 2009 +0000
+++ b/sys/arch/amd64/include/Makefile.inc       Fri Nov 27 13:50:29 2009 +0000
@@ -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



Home | Main Index | Thread Index | Old Index