Module Name: src
Committed By: mrg
Date: Thu Aug 19 06:52:38 UTC 2021
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch: Makefile
src/share/mk: bsd.own.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile
cvs rdiff -u -r1.1259 -r1.1260 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.6 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.7
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.6 Sun Apr 25 15:08:28 2021
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile Thu Aug 19 06:52:37 2021
@@ -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 @@ SUBDIR= riscv32 riscv64
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
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1259 src/share/mk/bsd.own.mk:1.1260
--- src/share/mk/bsd.own.mk:1.1259 Mon Aug 16 17:40:16 2021
+++ src/share/mk/bsd.own.mk Thu Aug 19 06:52:37 2021
@@ -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 @@ MK${var}:= yes
#
# 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.
