Module Name: src
Committed By: mrg
Date: Mon Sep 7 07:08:35 UTC 2020
Modified Files:
src/sys/arch/acorn32/conf: GENERIC INSTALL LOWMEM_WSCONS
src/sys/arch/acorn32/stand: Makefile.buildboot
Log Message:
-march=armv3m option is obsolete. remove it from commented kernel
configurations (we haven't supported those machines lately anyway),
and, for GCC >= 9, from the one caller.
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/sys/arch/acorn32/conf/GENERIC
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/acorn32/conf/INSTALL
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/acorn32/conf/LOWMEM_WSCONS
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/acorn32/stand/Makefile.buildboot
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/acorn32/conf/GENERIC
diff -u src/sys/arch/acorn32/conf/GENERIC:1.132 src/sys/arch/acorn32/conf/GENERIC:1.133
--- src/sys/arch/acorn32/conf/GENERIC:1.132 Sat Aug 1 08:20:47 2020
+++ src/sys/arch/acorn32/conf/GENERIC Mon Sep 7 07:08:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.132 2020/08/01 08:20:47 maxv Exp $
+# $NetBSD: GENERIC,v 1.133 2020/09/07 07:08:34 mrg Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.132 $"
+#ident "GENERIC-$Revision: 1.133 $"
# estimated number of users
maxusers 32
@@ -40,7 +40,7 @@ options CPU_ARM7 # Support the ARM7 cor
#options ARM6_LATE_ABORT # ARM6XX late abort support
# For StrongARM only kernels
-#makeoptions COPTS="-O2 -march=armv3m -mtune=strongarm"
+#makeoptions COPTS="-O2 -mtune=strongarm"
# File systems
Index: src/sys/arch/acorn32/conf/INSTALL
diff -u src/sys/arch/acorn32/conf/INSTALL:1.85 src/sys/arch/acorn32/conf/INSTALL:1.86
--- src/sys/arch/acorn32/conf/INSTALL:1.85 Sat Apr 18 11:00:37 2020
+++ src/sys/arch/acorn32/conf/INSTALL Mon Sep 7 07:08:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.85 2020/04/18 11:00:37 skrll Exp $
+# $NetBSD: INSTALL,v 1.86 2020/09/07 07:08:34 mrg Exp $
#
# INSTALL -- NetBSD/acorn32 install configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.85 $"
+#ident "INSTALL-$Revision: 1.86 $"
# estimated number of users
maxusers 32
@@ -40,7 +40,7 @@ options CPU_ARM7 # Support the ARM7 cor
#options ARM6_LATE_ABORT # ARM6XX late abort support
# For StrongARM only kernels
-#makeoptions COPTS="-O2 -march=armv3m -mtune=strongarm"
+#makeoptions COPTS="-O2 -mtune=strongarm"
# File systems
Index: src/sys/arch/acorn32/conf/LOWMEM_WSCONS
diff -u src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.77 src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.78
--- src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.77 Sat Apr 18 11:00:37 2020
+++ src/sys/arch/acorn32/conf/LOWMEM_WSCONS Mon Sep 7 07:08:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: LOWMEM_WSCONS,v 1.77 2020/04/18 11:00:37 skrll Exp $
+# $NetBSD: LOWMEM_WSCONS,v 1.78 2020/09/07 07:08:34 mrg Exp $
#
# LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
#
@@ -24,7 +24,7 @@ options CPU_ARM7 # Support the ARM7 cor
#options ARM6_LATE_ABORT # ARM6XX late abort support
# For StrongARM only kernels
-#makeoptions COPTS="-O2 -march=armv3m -mtune=strongarm"
+#makeoptions COPTS="-O2 -mtune=strongarm"
# For small kernels
makeoptions COPTS="-Os -fno-inline -Dinline= -D__inline__= -D_inline_= "
Index: src/sys/arch/acorn32/stand/Makefile.buildboot
diff -u src/sys/arch/acorn32/stand/Makefile.buildboot:1.26 src/sys/arch/acorn32/stand/Makefile.buildboot:1.27
--- src/sys/arch/acorn32/stand/Makefile.buildboot:1.26 Sun Apr 26 07:01:52 2020
+++ src/sys/arch/acorn32/stand/Makefile.buildboot Mon Sep 7 07:08:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.buildboot,v 1.26 2020/04/26 07:01:52 rin Exp $
+# $NetBSD: Makefile.buildboot,v 1.27 2020/09/07 07:08:35 mrg Exp $
S?= ${.CURDIR}/../../../..
@@ -40,7 +40,7 @@ LINKFLAGS+=-N -Ttext ${RELOC}
CPPFLAGS+= -D_STANDALONE
CPPFLAGS+= -I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
CPPFLAGS+= -I${.CURDIR}/../lib
-CPPFLAGS+= ${ARM_APCS_FLAGS} -march=armv3m
+CPPFLAGS+= ${ARM_APCS_FLAGS} ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} < 9:? -march=armv3m :}
CPUFLAGS=
CFLAGS= -O2
CFLAGS+= -ffreestanding -fno-unwind-tables
