Module Name: src
Committed By: mrg
Date: Thu Jun 6 05:41:28 UTC 2024
Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/external/gpl3/gcc/usr.bin/include: Makefile
Log Message:
support powerpc with gcc 12.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/usr.bin/include/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/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.71 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.72
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.71 Sun Feb 25 00:28:02 2024
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Thu Jun 6 05:41:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2024/02/25 00:28:02 mrg Exp $
+# $NetBSD: Makefile,v 1.72 2024/06/06 05:41:28 mrg Exp $
HOSTPROG_CXX= 1
LIBISPRIVATE= yes
@@ -52,6 +52,7 @@ CPPFLAGS.cppbuiltin.cc+= -DBASEVER="\"${
CLEANFILES+= gengenrtl genrtl.h \
gengtype gtyp-gen.h gtype-brig.h gtype-desc.cc gtype-desc.h \
gtype-c.h gtype-cp.h gtype-f.h gtype-objc.h \
+ gtype-d.h gtype-fortran.h \
genflags genflags.h \
gencheck tree-check.h \
insn-preds.cc genpreds tm-preds.h tm_p.h cs-tm_p.h \
@@ -65,6 +66,8 @@ CLEANFILES+= gengenrtl genrtl.h \
# XXX
#COPTS.varasm.cc= -Wno-error
+.SUFFIXES: .lo .h .c .cc
+
# XXX Override the normal rule to use HOST_COMPILE.cc
.c.lo:
${_MKTARGET_COMPILE}
@@ -428,6 +431,31 @@ aarch64-builtin-iterators.h: ${DIST}/gcc
CLEANFILES+= aarch-builtin-iterators.h
+.if ${GCC_MACHINE_ARCH} == "powerpc" || ${GCC_MACHINE_ARCH} == "powerpc64" # {
+
+rs6000-gen-builtins.lo: ${HH} ${DIST}/gcc/config/rs6000/rs6000-gen-builtins.cc
+rbtree.lo: ${HH} ${DIST}/gcc/config/rs6000/rbtree.cc
+rs6000-gen-builtins: rs6000-gen-builtins.lo rbtree.lo
+ ${_MKTARGET_LINK}
+ ${HOST_LINK.cc} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY} ${LDFLAGS.${.TARGET}}
+rs6000-builtins.cc: rs6000-gen-builtins \
+ ${DIST}/gcc/config/rs6000/rs6000-builtins.def \
+ ${DIST}/gcc/config/rs6000/rs6000-overload.def
+ ${_MKTARGET_CREATE}
+ ./rs6000-gen-builtins \
+ ${DIST}/gcc/config/rs6000/rs6000-builtins.def \
+ ${DIST}/gcc/config/rs6000/rs6000-overload.def \
+ rs6000-builtins.h rs6000-builtins.cc rs6000-vecdefines.h
+rs6000-builtins.h rs6000-vecdefines.h: rs6000-builtins.cc
+
+CLEANFILES+= rs6000-builtins.h rs6000-builtins.cc rs6000-vecdefines.h
+CLEANFILES+= rs6000-gen-builtins rbtree.lo rs6000-gen-builtins.lo
+
+gtype-desc.h: rs6000-builtins.h
+
+.endif # }
+
+
#
# Required hard-coded dependancies.
#
Index: src/external/gpl3/gcc/usr.bin/include/Makefile
diff -u src/external/gpl3/gcc/usr.bin/include/Makefile:1.14 src/external/gpl3/gcc/usr.bin/include/Makefile:1.15
--- src/external/gpl3/gcc/usr.bin/include/Makefile:1.14 Tue Aug 1 05:57:55 2023
+++ src/external/gpl3/gcc/usr.bin/include/Makefile Thu Jun 6 05:41:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2023/08/01 05:57:55 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2024/06/06 05:41:28 mrg Exp $
.include <bsd.init.mk>
@@ -8,7 +8,9 @@ SUBDIR= sanitizer
.include "${.CURDIR}/arch/${GCC_MACHINE_ARCH}.mk"
.endif
-INCS= ${G_EXTRA_HEADERS:T}
+# XXX rs6000-vecdefines.h is generated in usr.bin/backend. we can
+# try to install this from there later perhaps?
+INCS= ${G_EXTRA_HEADERS:T:Nrs6000-vecdefines.h}
# Part of the standard headers, the rest of which we replace.
INCS+= stdatomic.h