Module Name: src
Committed By: mrg
Date: Wed Mar 16 05:44:16 UTC 2016
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile Makefile.inc
src/external/gpl3/gcc/lib/libobjc: Makefile
Log Message:
apply an ugly hack to force-build insn-modes.h for libgcc and libobjc
since they want it now.
XXX: super ugly, probably can be fixed by rearranging a bunch of what
XXX: is currently in ../usr.bin/backend/ that builds insn-modes.h.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libgcc/Makefile
cvs rdiff -u -r1.30 -r1.31 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/lib/libobjc/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/lib/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile:1.3 src/external/gpl3/gcc/lib/libgcc/Makefile:1.4
--- src/external/gpl3/gcc/lib/libgcc/Makefile:1.3 Sat Mar 1 10:00:33 2014
+++ src/external/gpl3/gcc/lib/libgcc/Makefile Wed Mar 16 05:44:16 2016
@@ -1,7 +1,24 @@
-# $NetBSD: Makefile,v 1.3 2014/03/01 10:00:33 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/03/16 05:44:16 mrg Exp $
.include <bsd.own.mk>
+# XXXGCC5
+#
+# XXX libgcc (and libobjc) need insn-modes.h.
+# XXX for now, when doing make obj, create these needed objdirs
+# XXX in the obj phase, so that both normal and compat builds
+# XXX get here
+
+.if make(obj)
+SUBDIR+= ../../usr.bin/host-libiberty .WAIT
+SUBDIR+= ../../usr.bin/backend .WAIT
+.endif
+.if !make(obj) && !make(clean) && !make(cleandir)
+.BEGIN:
+ ${MAKEDIRTARGET} ../../usr.bin/host-libiberty all
+ ${MAKEDIRTARGET} ../../usr.bin/backend insn-modes.h
+.endif
+
SUBDIR+= libgcc
.if ${MKPIC} != "no"
Index: src/external/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.30 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.31
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.30 Wed Apr 15 19:13:46 2015
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Wed Mar 16 05:44:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.30 2015/04/15 19:13:46 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.31 2016/03/16 05:44:16 mrg Exp $
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
@@ -193,3 +193,7 @@ DPSRCS+= ${_dst}
EXTRA_FAKEHEADERS= options.h libgcc_tm.h
.include "../../Makefile.hacks"
+
+# XXX insn-modes.h
+BINBACKENDOBJ!= cd ${.CURDIR}/../../../usr.bin/backend && ${PRINTOBJDIR}
+CPPFLAGS+= -I${BINBACKENDOBJ}
Index: src/external/gpl3/gcc/lib/libobjc/Makefile
diff -u src/external/gpl3/gcc/lib/libobjc/Makefile:1.13 src/external/gpl3/gcc/lib/libobjc/Makefile:1.14
--- src/external/gpl3/gcc/lib/libobjc/Makefile:1.13 Sun Jun 1 19:51:01 2014
+++ src/external/gpl3/gcc/lib/libobjc/Makefile Wed Mar 16 05:44:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/06/01 19:51:01 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2016/03/16 05:44:16 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -115,6 +115,10 @@ CLEANFILES+= options.h optionlist
.PATH: ${DIST}/libobjc ${DIST}/libobjc/objc ${DIST}/libobjc/objc-private
+# XXX insn-modes.h
+BINBACKENDOBJ!= cd ${.CURDIR}/../../usr.bin/backend && ${PRINTOBJDIR}
+CPPFLAGS+= -I${BINBACKENDOBJ}
+
.else
.include <bsd.prog.mk> # do nothing
.endif
