[src/trunk]: src/share/mk fix arm64 builds: turn off MKCOMPAT for GCC

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

details:   https://anonhg.NetBSD.org/src/rev/2f77a57ecb1d
branches:  trunk
changeset: 985317:2f77a57ecb1d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Aug 19 06:52:37 2021 +0000

description:
fix arm64 builds:  turn off MKCOMPAT for GCC

no idea why it was enabled as we can't easily target 32 bit.

if we figure this out for aarch32, the subdir names etc will
probably be different, or we can just revive the deleted
files no longer referenced with this commit.

diffstat:

 external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile |   7 +-----
 share/mk/bsd.own.mk                                           |  13 ++++++----
 2 files changed, 9 insertions(+), 11 deletions(-)

diffs (48 lines):

diff -r 4ba9ec7a364c -r 2f77a57ecb1d external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile     Thu Aug 19 05:09:24 2021 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile     Thu Aug 19 06:52:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2021/04/25 15:08:28 christos Exp $
+#      $NetBSD: Makefile,v 1.7 2021/08/19 06:52:37 mrg Exp $
 
 # install multilib c++config.h files
 .include <bsd.init.mk>
@@ -28,11 +28,6 @@
 CXXCONFIGARGS= riscv64 _LP64 riscv32
 .endif
 
-.if ${MACHINE_ARCH} == "aarch64"
-SUBDIR=                arm aarch64
-CXXCONFIGARGS= aarch64 _LP64 arm
-.endif
-
 # now install the generated front end
 
 c++config.h: Makefile mkcxxconfig_h.sh
diff -r 4ba9ec7a364c -r 2f77a57ecb1d share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Thu Aug 19 05:09:24 2021 +0000
+++ b/share/mk/bsd.own.mk       Thu Aug 19 06:52:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1259 2021/08/16 17:40:16 mrg Exp $
+#      $NetBSD: bsd.own.mk,v 1.1260 2021/08/19 06:52:37 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1038,10 +1038,13 @@
 #
 # aarch64eb is not yet supported.
 #
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" \
-    || ${MACHINE_MIPS64} \
-    || ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "aarch64" \
-    || ${MACHINE_ARCH} == "riscv64" || !empty(MACHINE_ARCH:Mearm*)
+.if ${MACHINE_ARCH} == "x86_64" || \
+    ${MACHINE_ARCH} == "sparc64" || \
+    ${MACHINE_MIPS64} || \
+    ${MACHINE_ARCH} == "powerpc64" || \
+    (${MACHINE_ARCH} == "aarch64" && ${HAVE_GCC:U0} == 0) || \
+    ${MACHINE_ARCH} == "riscv64" || \
+    !empty(MACHINE_ARCH:Mearm*)
 MKCOMPAT?=     yes
 .else
 # Don't let this build where it really isn't supported.