Module Name: src
Committed By: mrg
Date: Sat Aug 10 23:49:12 UTC 2024
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile Makefile.isl
src/share/mk: bsd.own.mk
src/tools: Makefile
src/tools/gcc: Makefile
Log Message:
introduce a way to build GCC without the isl library
if NOGCCISL is set, don't build or link against isl. should fix PR#58505.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc/usr.bin/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/Makefile.isl
cvs rdiff -u -r1.1392 -r1.1393 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.222 -r1.223 src/tools/Makefile
cvs rdiff -u -r1.113 -r1.114 src/tools/gcc/Makefile
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/usr.bin/Makefile
diff -u src/external/gpl3/gcc/usr.bin/Makefile:1.16 src/external/gpl3/gcc/usr.bin/Makefile:1.17
--- src/external/gpl3/gcc/usr.bin/Makefile:1.16 Tue Jun 18 04:07:18 2024
+++ src/external/gpl3/gcc/usr.bin/Makefile Sat Aug 10 23:49:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2024/06/18 04:07:18 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2024/08/10 23:49:12 mrg Exp $
NOOBJ=# defined
@@ -8,13 +8,19 @@ GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5
.if ${MKGCC} != "no" && exists(${.CURDIR}/gcc/arch/${GCC_MACHINE_ARCH}/defs.mk)
+.if defined(NOGCCISL)
+ISL_SUBDIR= ../../../mit/isl/lib/libisl
+.else
+ISL_SUBDIR=
+.endif
+
# host-libiberty is used by include on rs6000.
SUBDIR+= host-libiberty .WAIT
# We keep libcpp here since it depends upon frontend.
.if ${MKGCCCMDS} != "no" || make(includes)
SUBDIR+= host-libcpp .WAIT \
- ../../../mit/isl/lib/libisl \
+ ${ISL_SUBDIR} \
backend .WAIT \
frontend .WAIT \
common common-target .WAIT \
Index: src/external/gpl3/gcc/usr.bin/Makefile.isl
diff -u src/external/gpl3/gcc/usr.bin/Makefile.isl:1.1 src/external/gpl3/gcc/usr.bin/Makefile.isl:1.2
--- src/external/gpl3/gcc/usr.bin/Makefile.isl:1.1 Sun Feb 25 00:28:02 2024
+++ src/external/gpl3/gcc/usr.bin/Makefile.isl Sat Aug 10 23:49:12 2024
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile.isl,v 1.1 2024/02/25 00:28:02 mrg Exp $
+# $NetBSD: Makefile.isl,v 1.2 2024/08/10 23:49:12 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_LIBISL_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_LIBISL_=1
.include <bsd.own.mk>
+.if !defined(NOGCCISL)
+
LIBISL= ${.CURDIR}/../../../../mit/isl
LIBISLOBJ!= cd ${LIBISL}/lib/libisl && ${PRINTOBJDIR}
DPADD+= ${LIBISLOBJ}/libisl.a
@@ -13,3 +15,5 @@ LDADD+= ${LIBISLOBJ}/libisl.a
CFLAGS+= -I${LIBISL}/dist/include -I${LIBISL}/include
.endif
+
+.endif
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1392 src/share/mk/bsd.own.mk:1.1393
--- src/share/mk/bsd.own.mk:1.1392 Tue Jul 16 21:10:16 2024
+++ src/share/mk/bsd.own.mk Sat Aug 10 23:49:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1392 2024/07/16 21:10:16 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1393 2024/08/10 23:49:12 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -115,6 +115,14 @@ MKGCCCMDS?= no
.endif # MKGCC == no # }
#
+# Build GCC with the "isl" library enabled.
+# The alpha port does not work with it, see GCC PR's 84204 and 84353.
+#
+.if ${MACHINE} == "alpha"
+NOGCCISL= # defined
+.endif
+
+#
# What binutils is used?
#
.if \
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.222 src/tools/Makefile:1.223
--- src/tools/Makefile:1.222 Sat Jun 8 13:03:41 2024
+++ src/tools/Makefile Sat Aug 10 23:49:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.222 2024/06/08 13:03:41 tsutsui Exp $
+# $NetBSD: Makefile,v 1.223 2024/08/10 23:49:12 mrg Exp $
.include <bsd.own.mk>
.include <bsd.endian.mk>
@@ -29,7 +29,7 @@ TOOLCHAIN_BITS+= gmake .WAIT
TOOLCHAIN_BITS+= gmp .WAIT
TOOLCHAIN_BITS+= mpfr .WAIT
TOOLCHAIN_BITS+= mpc .WAIT
-. if (defined(HAVE_GCC) && ${HAVE_GCC} >= 12)
+. if (defined(HAVE_GCC) && ${HAVE_GCC} >= 12 && !defined(NOGCCISL))
TOOLCHAIN_BITS+= isl .WAIT
. endif
. endif
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.113 src/tools/gcc/Makefile:1.114
--- src/tools/gcc/Makefile:1.113 Sun Jun 16 16:03:30 2024
+++ src/tools/gcc/Makefile Sat Aug 10 23:49:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2024/06/16 16:03:30 gutteridge Exp $
+# $NetBSD: Makefile,v 1.114 2024/08/10 23:49:12 mrg Exp $
.include <bsd.hostinit.mk>
@@ -65,10 +65,10 @@ COMMON_CONFIGURE_ARGS+= --with-default-l
# We enabled isl support for GCC 12. Move into normal segment when
# removing GCC 10.
-.if ${HAVE_GCC} < 12
-ISL_CONFIGURE_ARGS+= --without-isl
+.if ${HAVE_GCC} < 12 || defined(NOGCCISL)
+COMMON_CONFIGURE_ARGS+= --without-isl
.else
-ISL_CONFIGURE_ARGS+= --with-isl=${TOOLDIR}
+COMMON_CONFIGURE_ARGS+= --with-isl=${TOOLDIR}
.endif
CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
