[src/trunk]: src/sys/arch/acorn32 -march=armv3m option is obsolete. remove i...

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

details:   https://anonhg.NetBSD.org/src/rev/e6301304d242
branches:  trunk
changeset: 938395:e6301304d242
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Sep 07 07:08:34 2020 +0000

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

diffstat:

 sys/arch/acorn32/conf/GENERIC             |  6 +++---
 sys/arch/acorn32/conf/INSTALL             |  6 +++---
 sys/arch/acorn32/conf/LOWMEM_WSCONS       |  4 ++--
 sys/arch/acorn32/stand/Makefile.buildboot |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diffs (90 lines):

diff -r 9d02645adad0 -r e6301304d242 sys/arch/acorn32/conf/GENERIC
--- a/sys/arch/acorn32/conf/GENERIC     Mon Sep 07 07:07:32 2020 +0000
+++ b/sys/arch/acorn32/conf/GENERIC     Mon Sep 07 07:08:34 2020 +0000
@@ -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 @@
 
 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       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
 
diff -r 9d02645adad0 -r e6301304d242 sys/arch/acorn32/conf/INSTALL
--- a/sys/arch/acorn32/conf/INSTALL     Mon Sep 07 07:07:32 2020 +0000
+++ b/sys/arch/acorn32/conf/INSTALL     Mon Sep 07 07:08:34 2020 +0000
@@ -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 @@
 
 #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       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
 
diff -r 9d02645adad0 -r e6301304d242 sys/arch/acorn32/conf/LOWMEM_WSCONS
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS       Mon Sep 07 07:07:32 2020 +0000
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS       Mon Sep 07 07:08:34 2020 +0000
@@ -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       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_= "
diff -r 9d02645adad0 -r e6301304d242 sys/arch/acorn32/stand/Makefile.buildboot
--- a/sys/arch/acorn32/stand/Makefile.buildboot Mon Sep 07 07:07:32 2020 +0000
+++ b/sys/arch/acorn32/stand/Makefile.buildboot Mon Sep 07 07:08:34 2020 +0000
@@ -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 @@
 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