[src/trunk]: src/external/gpl3/gcc/lib apply an ugly hack to force-build insn...

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

details:   https://anonhg.NetBSD.org/src/rev/3d5b2392bfd8
branches:  trunk
changeset: 344164:3d5b2392bfd8
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Mar 16 05:44:16 2016 +0000

description:
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.

diffstat:

 external/gpl3/gcc/lib/libgcc/Makefile     |  19 ++++++++++++++++++-
 external/gpl3/gcc/lib/libgcc/Makefile.inc |   6 +++++-
 external/gpl3/gcc/lib/libobjc/Makefile    |   6 +++++-
 3 files changed, 28 insertions(+), 3 deletions(-)

diffs (66 lines):

diff -r 6d3c9b9fd65c -r 3d5b2392bfd8 external/gpl3/gcc/lib/libgcc/Makefile
--- a/external/gpl3/gcc/lib/libgcc/Makefile     Wed Mar 16 05:42:07 2016 +0000
+++ b/external/gpl3/gcc/lib/libgcc/Makefile     Wed Mar 16 05:44:16 2016 +0000
@@ -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"
diff -r 6d3c9b9fd65c -r 3d5b2392bfd8 external/gpl3/gcc/lib/libgcc/Makefile.inc
--- a/external/gpl3/gcc/lib/libgcc/Makefile.inc Wed Mar 16 05:42:07 2016 +0000
+++ b/external/gpl3/gcc/lib/libgcc/Makefile.inc Wed Mar 16 05:44:16 2016 +0000
@@ -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 @@
 
 EXTRA_FAKEHEADERS=     options.h libgcc_tm.h
 .include "../../Makefile.hacks"
+
+# XXX insn-modes.h
+BINBACKENDOBJ!=        cd ${.CURDIR}/../../../usr.bin/backend && ${PRINTOBJDIR}
+CPPFLAGS+=     -I${BINBACKENDOBJ}
diff -r 6d3c9b9fd65c -r 3d5b2392bfd8 external/gpl3/gcc/lib/libobjc/Makefile
--- a/external/gpl3/gcc/lib/libobjc/Makefile    Wed Mar 16 05:42:07 2016 +0000
+++ b/external/gpl3/gcc/lib/libobjc/Makefile    Wed Mar 16 05:44:16 2016 +0000
@@ -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 @@
 
 .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