bootstrap-mk-files-20160908:

Unless a platform explicitly sets DBG, default to -O2 on all
architectures. Most importantly, don't default to unoptimized builds
on AMD64.

10 files changed, 20 insertions, 106 deletions

diff --git a/pkgtools/bootstrap-mk-files/Makefile b/pkgtools/bootstrap-mk-files/Makefile
index e63eb3bb722..613d0522a3d 100644
--- a/pkgtools/bootstrap-mk-files/Makefile
+++ b/pkgtools/bootstrap-mk-files/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2016/04/11 12:37:48 jperkin Exp $
+# $NetBSD: Makefile,v 1.52 2016/09/08 14:28:12 joerg Exp $
 
-PKGNAME=	bootstrap-mk-files-20160411
+PKGNAME=	bootstrap-mk-files-20160908
 CATEGORIES=	pkgtools
 
 CONFLICTS+=	mk-files-[0-9]*
diff --git a/pkgtools/bootstrap-mk-files/files/mods/AIX.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/AIX.sys.mk
index 97b0269c273..4c4a6087794 100644
--- a/pkgtools/bootstrap-mk-files/files/mods/AIX.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/AIX.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: AIX.sys.mk,v 1.1 2008/07/03 20:06:21 joerg Exp $
+#	$NetBSD: AIX.sys.mk,v 1.2 2016/09/08 14:28:12 joerg Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 
 unix?=		We run Unix
@@ -24,20 +24,7 @@ COMPILE.S?=	${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp
 LINK.S?=	${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=		cc
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
-		${MACHINE_ARCH} == "arm32" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax"
-DBG?=	-O2
-.elif ${MACHINE_ARCH} == "x86_64"
-DBG?=
-.else
-DBG?=	-O
-.endif
+DBG?=		-O2
 CFLAGS?=	${DBG}
 COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff --git a/pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk
index 6bd3b6f5738..8be5a01353d 100644
--- a/pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/IRIX.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: IRIX.sys.mk,v 1.4 2011/08/29 10:43:35 cheusov Exp $
+#	$NetBSD: IRIX.sys.mk,v 1.5 2016/09/08 14:28:12 joerg Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 
 unix?=		We run Unix
@@ -22,7 +22,7 @@ LINK.S?=	${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=		cc
 NOGCCERROR?=	# defined
-DBG?=	-O2
+DBG?=		-O2
 CFLAGS?=	${DBG}
 COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff --git a/pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk
index f7664a76985..7ef40c11031 100644
--- a/pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: Linux.sys.mk,v 1.6 2015/08/31 09:03:19 jperkin Exp $
+#	$NetBSD: Linux.sys.mk,v 1.7 2016/09/08 14:28:12 joerg Exp $
 #	NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp 
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 
@@ -25,20 +25,7 @@ COMPILE.S?=	${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp
 LINK.S?=	${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=		cc
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
-		${MACHINE_ARCH} == "arm32" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax"
-DBG?=	-O2
-.elif ${MACHINE_ARCH} == "x86_64"
-DBG?=
-.else
-DBG?=	-O
-.endif
+DBG?=		-O2
 CFLAGS?=	${DBG}
 COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff --git a/pkgtools/bootstrap-mk-files/files/mods/Minix.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/Minix.sys.mk
index 9a1a2e9bbc9..1e70cdcc6b0 100644
--- a/pkgtools/bootstrap-mk-files/files/mods/Minix.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/Minix.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: Minix.sys.mk,v 1.3 2015/06/11 09:20:56 joerg Exp $
+#	$NetBSD: Minix.sys.mk,v 1.4 2016/09/08 14:28:12 joerg Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 
 unix?=		We run Unix.
@@ -21,7 +21,7 @@ COMPILE.S?=	${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp
 LINK.S?=	${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=		gcc
-DBG?=
+DBG?=		-O2
 CFLAGS?=	${DBG}
 COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff --git a/pkgtools/bootstrap-mk-files/files/mods/NetBSD.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/NetBSD.sys.mk
index 92341c14b96..e100faa5404 100644
--- a/pkgtools/bootstrap-mk-files/files/mods/NetBSD.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/NetBSD.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $
+#	$NetBSD: NetBSD.sys.mk,v 1.2 2016/09/08 14:28:12 joerg Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 
 unix?=		We run NetBSD.
@@ -23,20 +23,7 @@ COMPILE.S?=	${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp
 LINK.S?=	${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=		cc
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
-		${MACHINE_ARCH} == "arm32" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax"
-DBG?=	-O2
-.elif ${MACHINE_ARCH} == "x86_64"
-DBG?=
-.else
-DBG?=	-O
-.endif
+DBG?=		-O2
 CFLAGS?=	${DBG}
 COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff --git a/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.sys.mk
index 2ef8389731e..4c99f3b6fc1 100644
--- a/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: OpenBSD.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $
+#	$NetBSD: OpenBSD.sys.mk,v 1.2 2016/09/08 14:28:12 joerg Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 
 unix?=		We run OpenBSD.
@@ -23,15 +23,7 @@ COMPILE.S?=	${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp
 LINK.S?=	${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=		cc
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax"
-DBG?=	-O2
-.else
-DBG?=	-O
-.endif
+DBG?=		-O2
 CFLAGS?=	${DBG}
 COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff --git a/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk
index 57942731799..3727ec874dc 100644
--- a/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: QNX.sys.mk,v 1.1 2015/07/04 07:19:08 ryoon Exp $
+#	$NetBSD: QNX.sys.mk,v 1.2 2016/09/08 14:28:12 joerg Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 
 unix?=		We run Unix
@@ -24,20 +24,7 @@ COMPILE.S?=	${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp
 LINK.S?=	${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=		gcc
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
-		${MACHINE_ARCH} == "arm32" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax"
-DBG?=	-O2
-.elif ${MACHINE_ARCH} == "x86_64"
-DBG?=
-.else
-DBG?=	-O
-.endif
+DBG?=		-O2
 CFLAGS?=	${DBG}
 COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff --git a/pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk b/pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk
index 99e4f7b10fb..bb9f1f63fb6 100644
--- a/pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: SunOS.sys.mk,v 1.7 2015/08/31 09:03:19 jperkin Exp $
+#	$NetBSD: SunOS.sys.mk,v 1.8 2016/09/08 14:28:12 joerg Exp $
 #	NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp 
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 
@@ -26,20 +26,7 @@ LINK.S?=	${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 # Unless told otherwise, assume GNU CC
 CC?=		gcc
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
-		${MACHINE_ARCH} == "arm32" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax"
-DBG?=	-O2
-.elif ${MACHINE_ARCH} == "x86_64"
-DBG?=
-.else
-DBG?=	-O
-.endif
+DBG?=		-O2
 CFLAGS?=	${DBG}
 COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
diff --git a/pkgtools/bootstrap-mk-files/files/sys.mk b/pkgtools/bootstrap-mk-files/files/sys.mk
index db022616536..02d5f81e4df 100644
--- a/pkgtools/bootstrap-mk-files/files/sys.mk
+++ b/pkgtools/bootstrap-mk-files/files/sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $
+#	$NetBSD: sys.mk,v 1.2 2016/09/08 14:28:12 joerg Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 
 unix?=		We run Unix
@@ -24,20 +24,7 @@ COMPILE.S?=	${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp
 LINK.S?=	${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 CC?=		cc
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
-		${MACHINE_ARCH} == "arm32" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax"
-DBG?=	-O2
-.elif ${MACHINE_ARCH} == "x86_64"
-DBG?=
-.else
-DBG?=	-O
-.endif
+DBG?=		-O2
 CFLAGS?=	${DBG}
 COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}