[src/trunk]: src/sys/arch Revert previous, we'll need something better (and c...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/54a1f5477b18
branches:  trunk
changeset: 359741:54a1f5477b18
user:      maxv <maxv%NetBSD.org@localhost>
date:      Fri Feb 23 14:16:52 2018 +0000

description:
Revert previous, we'll need something better (and compatible with Clang).

diffstat:

 sys/arch/amd64/conf/Makefile.amd64 |  4 ++--
 sys/arch/i386/conf/Makefile.i386   |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 1f32c747152c -r 54a1f5477b18 sys/arch/amd64/conf/Makefile.amd64
--- a/sys/arch/amd64/conf/Makefile.amd64        Fri Feb 23 09:57:20 2018 +0000
+++ b/sys/arch/amd64/conf/Makefile.amd64        Fri Feb 23 14:16:52 2018 +0000
@@ -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 @@
 ##
 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
diff -r 1f32c747152c -r 54a1f5477b18 sys/arch/i386/conf/Makefile.i386
--- a/sys/arch/i386/conf/Makefile.i386  Fri Feb 23 09:57:20 2018 +0000
+++ b/sys/arch/i386/conf/Makefile.i386  Fri Feb 23 14:16:52 2018 +0000
@@ -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 @@
 ##
 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