Thu Apr 12 20:44:16 2018 UTC ()
fix the hard coded depends list for insn-*.  i pulled these out
of the generated .d files for a successful build.  i've tested
that at least one recent macppc build failure is fixed with this
change (namely, try building just insn-emit.o in this subdir),
but the pattern should fix anything else left in insn*.

this really should finally fix PR#53137.


(mrg)
diff -r1.46 -r1.47 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs diff -r1.46 -r1.47 src/external/gpl3/gcc/usr.bin/backend/Makefile (expand / switch to unified diff)

--- src/external/gpl3/gcc/usr.bin/backend/Makefile 2018/04/05 05:38:59 1.46
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile 2018/04/12 20:44:16 1.47
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.46 2018/04/05 05:38:59 mrg Exp $ 1# $NetBSD: Makefile,v 1.47 2018/04/12 20:44:16 mrg Exp $
2 2
3LIBISPRIVATE= yes 3LIBISPRIVATE= yes
4 4
5LIB= backend 5LIB= backend
6 6
7SRCS= ${G_OBJS} ${G_out_file:T} regsub.c 7SRCS= ${G_OBJS} ${G_out_file:T} regsub.c
8 8
9# XXX: something misses these. 9# XXX: something misses these.
10CLEANDIRFILES+= ${G_OBJS:.o=.d} 10CLEANDIRFILES+= ${G_OBJS:.o=.d}
11 11
12# Make sure we use the pre-generated C files 12# Make sure we use the pre-generated C files
13.l.c: 13.l.c:
14 @true 14 @true
@@ -453,47 +453,60 @@ CASECFNDEPS= aarch64-builtins.c arm-buil @@ -453,47 +453,60 @@ CASECFNDEPS= aarch64-builtins.c arm-buil
453${CASECFNDEPS}: case-cfn-macros.h 453${CASECFNDEPS}: case-cfn-macros.h
454 454
455# 455#
456# Required hard-coded dependancies. 456# Required hard-coded dependancies.
457# 457#
458genextract.lo: insn-config.h 458genextract.lo: insn-config.h
459gencondmd.lo: tm_p.h tm-constrs.h 459gencondmd.lo: tm_p.h tm-constrs.h
460read-rtl.lo gencodes.lo genattrtab.lo genautomata.lo: insn-constants.h gtype-desc.h 460read-rtl.lo gencodes.lo genattrtab.lo genautomata.lo: insn-constants.h gtype-desc.h
461genattr-common.lo gensupport.lo genconditions.lo gentarget-def.lo: insn-constants.h 461genattr-common.lo gensupport.lo genconditions.lo gentarget-def.lo: insn-constants.h
462genattr.lo genflags.lo genemit.lo genconfig.lo gencheck.lo: insn-constants.h gtype-desc.h 462genattr.lo genflags.lo genemit.lo genconfig.lo gencheck.lo: insn-constants.h gtype-desc.h
463genopinit.lo genrecog.lo genpreds.lo genoutput.lo genpeep.lo: insn-constants.h  463genopinit.lo genrecog.lo genpreds.lo genoutput.lo genpeep.lo: insn-constants.h
464build-ggc-none.lo: gtype-desc.h 464build-ggc-none.lo: gtype-desc.h
465ggc-none.o: gtype-desc.h 465ggc-none.o: gtype-desc.h
466 466asan.d asan.o: insn-opinit.h
467insn-attrtab.o: insn-config.h 467insn-attrtab.o: insn-config.h
468insn-extract.o: insn-config.h 468insn-extract.o: insn-config.h
469toplev.d toplev.o: options.h 469toplev.d toplev.o: options.h
470coverage.d: gcov-iov.h 470coverage.d: gcov-iov.h
471gcov-io.h: gcov-iov.h 471gcov-io.h: gcov-iov.h
472alias.d alias.o: insn-constants.h tm_p.h 472alias.d alias.o: insn-constants.h tm_p.h
473cgraph.d cgraphunit.d cgraphunit.o: gcov-io.h 473cgraph.d cgraphunit.d cgraphunit.o: gcov-io.h
474vec.lo: gtype-desc.h 474vec.lo: gtype-desc.h
475gtype-desc.d gtype-desc.o: insn-constants.h 475gtype-desc.d gtype-desc.o: insn-constants.h
476insn-emit.d insn-emit.o: tm-constrs.h 476insn-emit.d insn-emit.o: tm-constrs.h insn-opinit.h
477insn-attr.h: insn-attr-common.h 477insn-attr.h: insn-attr-common.h
478asan.d asan.o: insn-opinit.h 
479data-streamer.d data-streamer-out.d coverage.d gcov-dump.d gcov-io.d gcov-iov.d gcov.d libgcov.d lto-cgraph.d mcf.d modulo-sched.d profile.d value-prof.d: gcov-io.h 
480data-streamer.o data-streamer-out.o coverage.o gcov-dump.o gcov-io.o gcov-iov.o gcov.o libgcov.o lto-cgraph.o mcf.o modulo-sched.o profile.o value-prof.o: gcov-io.h 
481gcov-io.h: gcov-iov.h 478gcov-io.h: gcov-iov.h
482df-scan.d df-scan.o: target-hooks-def.h 479df-scan.d df-scan.o: target-hooks-def.h
483read-md.d read-md.o read-md.lo: auto-build.h 480read-md.d read-md.o read-md.lo: auto-build.h
484hash-table.d hash-table.o hash-table.lo: auto-build.h gtype-desc.h 481hash-table.d hash-table.o hash-table.lo: auto-build.h gtype-desc.h
485gencfn-macros.d gencfn-macros.o gencfn-macros.lo: gtype-desc.h 482gencfn-macros.d gencfn-macros.o gencfn-macros.lo: gtype-desc.h
486cgraphunit.d cgraphunit.o: pass-instances.def 483cgraphunit.d cgraphunit.o: pass-instances.def
 484insn-opinit.o insn-opinit.d: insn-flags.h
 485.for _f in insn-attrtab insn-automata insn-dfatab insn-latencytab insn-output
 486${_f}.o ${_f}.d: insn-attr-common.h insn-attr.h
 487.endfor
 488.for _f in insn-attrtab insn-automata insn-dfatab insn-emit insn-extract \
 489 insn-latencytab insn-opinit insn-output insn-peep insn-preds \
 490 insn-recog
 491${_f}.o ${_f}.d: insn-codes.h insn-config.h insn-constants.h insn-flags.h
 492.endfor
 493.for _f in insn-enums insn-modes
 494${_f}.o ${_f}.d: insn-constants.h
 495.endfor
 496.for _f in data-streamer data-streamer-out coverage gcov-dump gcov-io \
 497 gcov-iov gcov libgcov lto-cgraph mcf modulo-sched profile value-prof
 498${_f}.o ${_f}.d: gcov-io.h
 499.endfor
487 500
488# XXX make all hooks generated for now. 501# XXX make all hooks generated for now.
489final.o: target-hooks-def.h c-family/c-target-hooks-def.h common/common-target-hooks-def.h 502final.o: target-hooks-def.h c-family/c-target-hooks-def.h common/common-target-hooks-def.h
490 503
491.if ${GCC_MACHINE_ARCH} == "alpha" 504.if ${GCC_MACHINE_ARCH} == "alpha"
492alpha.d alpha.o: tm-constrs.h tm_p.h insn-opinit.h target-hooks-def.h 505alpha.d alpha.o: tm-constrs.h tm_p.h insn-opinit.h target-hooks-def.h
493alpha.d: pass-instances.def 506alpha.d: pass-instances.def
494.endif 507.endif
495 508
496.if ${MACHINE_CPU} == "arm" 509.if ${MACHINE_CPU} == "arm"
497arm.d arm.o: insn-constants.h tm_p.h insn-opinit.h target-hooks-def.h 510arm.d arm.o: insn-constants.h tm_p.h insn-opinit.h target-hooks-def.h
498arm-builtins.d arm-builtins.o: insn-opinit.h 511arm-builtins.d arm-builtins.o: insn-opinit.h
499# XXX insn-recog.c:10304:7: error: this decimal constant is unsigned only in ISO C90 [-Werror] 512# XXX insn-recog.c:10304:7: error: this decimal constant is unsigned only in ISO C90 [-Werror]