Tue Dec 15 11:39:05 2009 UTC ()
Fix parallel build.  Analyzed & patch provided by enami@, thanks!


(uebayasi)
diff -r1.1.1.2 -r1.2 src/gnu/dist/gdb6/sim/mips/Makefile.in
diff -r1.1.1.1 -r1.2 src/gnu/dist/gdb6/sim/mn10300/Makefile.in
diff -r1.1.1.1 -r1.2 src/gnu/dist/gdb6/sim/v850/Makefile.in
diff -r1.13 -r1.14 src/tools/gdb/Makefile
cvs diff -r1.1.1.2 -r1.2 src/gnu/dist/gdb6/sim/mips/Attic/Makefile.in (expand / switch to unified diff)

--- src/gnu/dist/gdb6/sim/mips/Attic/Makefile.in 2006/07/02 20:28:34 1.1.1.2
+++ src/gnu/dist/gdb6/sim/mips/Attic/Makefile.in 2009/12/15 11:39:05 1.2
@@ -122,27 +122,26 @@ BUILT_SRC_FROM_IGEN = \ @@ -122,27 +122,26 @@ BUILT_SRC_FROM_IGEN = \
122 semantics.h \ 122 semantics.h \
123 semantics.c \ 123 semantics.c \
124 model.h \ 124 model.h \
125 model.c \ 125 model.c \
126 support.h \ 126 support.h \
127 support.c \ 127 support.c \
128 engine.h \ 128 engine.h \
129 engine.c \ 129 engine.c \
130 irun.c \ 130 irun.c \
131 131
132$(BUILT_SRC_FROM_IGEN): tmp-igen 132$(BUILT_SRC_FROM_IGEN): tmp-igen
133 133
134tmp-igen: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE) 134tmp-igen: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE)
135 cd ../igen && $(MAKE) 
136 ../igen/igen \ 135 ../igen/igen \
137 $(IGEN_TRACE) \ 136 $(IGEN_TRACE) \
138 -I $(srcdir) \ 137 -I $(srcdir) \
139 -Werror \ 138 -Werror \
140 -Wnodiscard \ 139 -Wnodiscard \
141 @sim_igen_flags@ \ 140 @sim_igen_flags@ \
142 -G gen-direct-access \ 141 -G gen-direct-access \
143 -G gen-zero-r0 \ 142 -G gen-zero-r0 \
144 -B 32 \ 143 -B 32 \
145 -H 31 \ 144 -H 31 \
146 -i $(IGEN_INSN) \ 145 -i $(IGEN_INSN) \
147 -o $(IGEN_DC) \ 146 -o $(IGEN_DC) \
148 -x \ 147 -x \
cvs diff -r1.1.1.1 -r1.2 src/gnu/dist/gdb6/sim/mn10300/Attic/Makefile.in (expand / switch to unified diff)

--- src/gnu/dist/gdb6/sim/mn10300/Attic/Makefile.in 2006/05/15 14:24:50 1.1.1.1
+++ src/gnu/dist/gdb6/sim/mn10300/Attic/Makefile.in 2009/12/15 11:39:05 1.2
@@ -72,27 +72,26 @@ $(BUILT_SRC_FROM_IGEN): tmp-igen @@ -72,27 +72,26 @@ $(BUILT_SRC_FROM_IGEN): tmp-igen
72 72
73.PHONY: clean-igen 73.PHONY: clean-igen
74clean-igen: 74clean-igen:
75 rm -f $(BUILT_SRC_FROM_IGEN) 75 rm -f $(BUILT_SRC_FROM_IGEN)
76 rm -f tmp-igen tmp-insns 76 rm -f tmp-igen tmp-insns
77 77
78../igen/igen: 78../igen/igen:
79 cd ../igen && $(MAKE) 79 cd ../igen && $(MAKE)
80 80
81IGEN_TRACE= # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejection -G trace-entries 81IGEN_TRACE= # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejection -G trace-entries
82IGEN_INSN=$(srcdir)/mn10300.igen $(srcdir)/am33.igen $(srcdir)/am33-2.igen 82IGEN_INSN=$(srcdir)/mn10300.igen $(srcdir)/am33.igen $(srcdir)/am33-2.igen
83IGEN_DC=$(srcdir)/mn10300.dc 83IGEN_DC=$(srcdir)/mn10300.dc
84tmp-igen: $(IGEN_INSN) $(IGEN_DC) ../igen/igen 84tmp-igen: $(IGEN_INSN) $(IGEN_DC) ../igen/igen
85 cd ../igen && $(MAKE) 
86 ../igen/igen \ 85 ../igen/igen \
87 $(IGEN_TRACE) \ 86 $(IGEN_TRACE) \
88 -G gen-direct-access \ 87 -G gen-direct-access \
89 -M mn10300,am33 -G gen-multi-sim=am33 \ 88 -M mn10300,am33 -G gen-multi-sim=am33 \
90 -M am33_2 \ 89 -M am33_2 \
91 -I $(srcdir) \ 90 -I $(srcdir) \
92 -i $(IGEN_INSN) \ 91 -i $(IGEN_INSN) \
93 -o $(IGEN_DC) \ 92 -o $(IGEN_DC) \
94 -x \ 93 -x \
95 -n icache.h -hc tmp-icache.h \ 94 -n icache.h -hc tmp-icache.h \
96 -n icache.c -c tmp-icache.c \ 95 -n icache.c -c tmp-icache.c \
97 -n semantics.h -hs tmp-semantics.h \ 96 -n semantics.h -hs tmp-semantics.h \
98 -n semantics.c -s tmp-semantics.c \ 97 -n semantics.c -s tmp-semantics.c \
cvs diff -r1.1.1.1 -r1.2 src/gnu/dist/gdb6/sim/v850/Attic/Makefile.in (expand / switch to unified diff)

--- src/gnu/dist/gdb6/sim/v850/Attic/Makefile.in 2006/05/15 14:26:30 1.1.1.1
+++ src/gnu/dist/gdb6/sim/v850/Attic/Makefile.in 2009/12/15 11:39:05 1.2
@@ -70,27 +70,26 @@ $(BUILT_SRC_FROM_IGEN): tmp-igen @@ -70,27 +70,26 @@ $(BUILT_SRC_FROM_IGEN): tmp-igen
70 70
71.PHONY: clean-igen 71.PHONY: clean-igen
72clean-igen: 72clean-igen:
73 rm -f $(BUILT_SRC_FROM_IGEN) 73 rm -f $(BUILT_SRC_FROM_IGEN)
74 rm -f tmp-igen tmp-insns 74 rm -f tmp-igen tmp-insns
75 75
76../igen/igen: 76../igen/igen:
77 cd ../igen && $(MAKE) 77 cd ../igen && $(MAKE)
78 78
79IGEN_TRACE= # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejection -G trace-entries 79IGEN_TRACE= # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejection -G trace-entries
80IGEN_INSN=$(srcdir)/v850.igen 80IGEN_INSN=$(srcdir)/v850.igen
81IGEN_DC=$(srcdir)/v850-dc 81IGEN_DC=$(srcdir)/v850-dc
82tmp-igen: $(IGEN_INSN) $(IGEN_DC) ../igen/igen 82tmp-igen: $(IGEN_INSN) $(IGEN_DC) ../igen/igen
83 cd ../igen && $(MAKE) 
84 ../igen/igen \ 83 ../igen/igen \
85 $(IGEN_TRACE) \ 84 $(IGEN_TRACE) \
86 -G gen-direct-access \ 85 -G gen-direct-access \
87 -G gen-zero-r0 \ 86 -G gen-zero-r0 \
88 -i $(IGEN_INSN) \ 87 -i $(IGEN_INSN) \
89 -o $(IGEN_DC) \ 88 -o $(IGEN_DC) \
90 -x \ 89 -x \
91 -n icache.h -hc tmp-icache.h \ 90 -n icache.h -hc tmp-icache.h \
92 -n icache.c -c tmp-icache.c \ 91 -n icache.c -c tmp-icache.c \
93 -n semantics.h -hs tmp-semantics.h \ 92 -n semantics.h -hs tmp-semantics.h \
94 -n semantics.c -s tmp-semantics.c \ 93 -n semantics.c -s tmp-semantics.c \
95 -n idecode.h -hd tmp-idecode.h \ 94 -n idecode.h -hd tmp-idecode.h \
96 -n idecode.c -d tmp-idecode.c \ 95 -n idecode.c -d tmp-idecode.c \
cvs diff -r1.13 -r1.14 src/tools/gdb/Makefile (expand / switch to unified diff)

--- src/tools/gdb/Makefile 2009/12/14 14:13:16 1.13
+++ src/tools/gdb/Makefile 2009/12/15 11:39:05 1.14
@@ -1,27 +1,26 @@ @@ -1,27 +1,26 @@
1# $NetBSD: Makefile,v 1.13 2009/12/14 14:13:16 christos Exp $ 1# $NetBSD: Makefile,v 1.14 2009/12/15 11:39:05 uebayasi Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5MODULE= gdb6 5MODULE= gdb6
6 6
7FIND_ARGS= \! \( -type d -name sim -prune \) 7FIND_ARGS= \! \( -type d -name sim -prune \)
8 8
9CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} --disable-nls \ 9CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} --disable-nls \
10 --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," 10 --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-,"
11 11
12MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} 12MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q}
13 13
14.NOTPARALLEL: # XXX otherwise fails with itable.c / interp.c build 
15ALL_TARGET= all-gdb 14ALL_TARGET= all-gdb
16INSTALL_TARGET= install-gdb 15INSTALL_TARGET= install-gdb
17 16
18.include "${.CURDIR}/../Makefile.gnuhost" 17.include "${.CURDIR}/../Makefile.gnuhost"
19 18
20CCADDFLAGS= ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ 19CCADDFLAGS= ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
21 20
22NEWCONFIGDIR?= ${.CURDIR}/../.. 21NEWCONFIGDIR?= ${.CURDIR}/../..
23MKNATIVE?= ${.CURDIR}/mknative-gdb 22MKNATIVE?= ${.CURDIR}/mknative-gdb
24 23
25# Some configure tests require running a test program, which is not 24# Some configure tests require running a test program, which is not
26# possible when cross-building. Provide configure with "cached" 25# possible when cross-building. Provide configure with "cached"
27# values in the environment. 26# values in the environment.