Module Name: src
Committed By: maxv
Date: Fri Feb 23 14:16:52 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: Makefile.amd64
src/sys/arch/i386/conf: Makefile.i386
Log Message:
Revert previous, we'll need something better (and compatible with Clang).
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.188 -r1.189 src/sys/arch/i386/conf/Makefile.i386
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.65 src/sys/arch/amd64/conf/Makefile.amd64:1.66
--- src/sys/arch/amd64/conf/Makefile.amd64:1.65 Fri Feb 23 09:00:56 2018
+++ src/sys/arch/amd64/conf/Makefile.amd64 Fri Feb 23 14:16:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amd64,v 1.65 2018/02/23 09:00:56 maxv Exp $
+# $NetBSD: Makefile.amd64,v 1.66 2018/02/23 14:16:52 maxv Exp $
# Makefile for NetBSD
#
@@ -35,7 +35,7 @@ GENASSYM_CONF= ${AMD64}/amd64/genassym.c
##
DEFCOPTS= -O2 -fno-omit-frame-pointer
CPPFLAGS+= -Damd64 -Dx86_64
-CFLAGS+= -mcmodel=kernel -fno-shrink-wrap
+CFLAGS+= -mcmodel=kernel
# -mno-sse implies -mno-sse2 (etc), explicitly disable avx to be extra sure
CFLAGS+= -mno-red-zone -mno-mmx -mno-sse -mno-avx
# make absolutely sure we don't get x87 registers used as well
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.188 src/sys/arch/i386/conf/Makefile.i386:1.189
--- src/sys/arch/i386/conf/Makefile.i386:1.188 Fri Feb 23 09:00:55 2018
+++ src/sys/arch/i386/conf/Makefile.i386 Fri Feb 23 14:16:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.188 2018/02/23 09:00:55 maxv Exp $
+# $NetBSD: Makefile.i386,v 1.189 2018/02/23 14:16:52 maxv Exp $
# Makefile for NetBSD
#
@@ -35,7 +35,7 @@ GENASSYM_CONF= ${I386}/i386/genassym.cf
##
DEFCOPTS= -O2 -fno-omit-frame-pointer
CPPFLAGS+= -Di386
-CFLAGS+= -msoft-float -fno-shrink-wrap
+CFLAGS+= -msoft-float
## no-sse implies no-sse2 but not no-avx
CFLAGS+= -mno-mmx -mno-sse -mno-avx
