Skip to contentSkip to conversation

bios: fix for parallel build (make -j2)

PATCH Applied Carlo Marcelo Arenas Belon 2 participants 2 messages Jan 30, 2008 KVM

lore
Share & tools
lore

Carlo Marcelo Arenas Belon

author
#0 lore raw

PATCH 1/1 bios: fix for parallel build (make -j2)

prevents reusing tmp.bin for both BIOS-bochs-legacy and BIOS-bochs-latest targets.

committed upstream in revision 1.27 of Makefile.in to fix bug 1799877. patch applied as well to generated Makefile.

Signed-off-by Carlo Marcelo Arenas Belon <[email protected]>
---
 bios/Makefile    |    4 ++--
 bios/Makefile.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
bios/Makefile +2 -2
index 0abc108..36e6248 100644
@@ -75,9 +75,9 @@ BIOS-bochs-legacy: rombios.c apmbios.S biossums rombios.h
 	$(GCC) $(BIOS_BUILD_DATE) -DLEGACY -E -P $< > _rombiosl_.c
 	$(BCC) -o rombiosl.s -C-c -D__i86__ -0 -S _rombiosl_.c
 	sed -e 's/^\.text//' -e 's/^\.data//' rombiosl.s > _rombiosl_.s
-	$(AS86) _rombiosl_.s -b tmp.bin -u- -w- -g -0 -j -O -l rombiosl.txt
+	$(AS86) _rombiosl_.s -b tmpl.bin -u- -w- -g -0 -j -O -l rombiosl.txt
 	-perl ${srcdir}/makesym.perl < rombiosl.txt > rombiosl.sym
-	mv tmp.bin $@
+	mv tmpl.bin $@
 	./biossums $@
 	rm -f  _rombiosl_.s
bios/Makefile.in +2 -2
index 3e332ae..9b153d3 100644
@@ -74,9 +74,9 @@ BIOS-bochs-legacy: rombios.c apmbios.S biossums rombios.h
 	$(GCC) $(BIOS_BUILD_DATE) -DLEGACY -E -P $< > _rombiosl_.c
 	$(BCC) -o rombiosl.s -C-c -D__i86__ -0 -S _rombiosl_.c
 	sed -e 's/^\.text//' -e 's/^\.data//' rombiosl.s > _rombiosl_.s
-	$(AS86) _rombiosl_.s -b tmp.bin -u- -w- -g -0 -j -O -l rombiosl.txt
+	$(AS86) _rombiosl_.s -b tmpl.bin -u- -w- -g -0 -j -O -l rombiosl.txt
 	-perl ${srcdir}/makesym.perl < rombiosl.txt > rombiosl.sym
-	mv tmp.bin $@
+	mv tmpl.bin $@
 	./biossums $@
 	@RMCOMMAND@ _rombiosl_.s
Signature · 7 lines
1.5.3.7


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
Applied
#1 lore raw
Quoted 7 lines · Carlo Marcelo Arenas Belon

prevents reusing tmp.bin for both BIOS-bochs-legacy and BIOS-bochs-latest targets.

committed upstream in revision 1.27 of Makefile.in to fix bug 1799877. patch applied as well to generated Makefile.

Applied, thanks.

Signature · 7 lines
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/