[commit] r5439 - trunk/src/arch/i386

[repository service]

Author: stepan
Date: Thu Apr 15 01:58:07 2010
New Revision: 5439
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5439

Log:
get rid of this nerving crt0.d stuff

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/arch/i386/Makefile.bigbootblock.inc
   trunk/src/arch/i386/Makefile.bootblock.inc

Modified: trunk/src/arch/i386/Makefile.bigbootblock.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.bigbootblock.inc	Wed Apr 14 23:47:24 2010	(r5438)
+++ trunk/src/arch/i386/Makefile.bigbootblock.inc	Thu Apr 15 01:58:07 2010	(r5439)
@@ -26,7 +26,7 @@

$(obj)/mainboard/$(MAINBOARDDIR)/crt0.s: $(obj)/crt0.S
    @printf "    CC         $(subst $(obj)/,,$(@))\n"
-	$(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@
+	$(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< -o $@

$(obj)/coreboot: $$(initobjs) $(obj)/ldscript.ld
    @printf "    LINK       $(subst $(obj)/,,$(@))\n"

Modified: trunk/src/arch/i386/Makefile.bootblock.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.bootblock.inc	Wed Apr 14 23:47:24 2010	(r5438)
+++ trunk/src/arch/i386/Makefile.bootblock.inc	Thu Apr 15 01:58:07 2010	(r5439)
@@ -63,7 +63,7 @@

$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.s: $(obj)/bootblock/bootblock.c
    @printf "    CC         $(subst $(obj)/,,$(@))\n"
-	$(CC) -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -I$(obj)/bootblock -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@
+	$(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -I$(obj)/bootblock -include $(obj)/config.h -I. -I$(src) $< -o $@

$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc: $(src)/arch/i386/init/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) $(obj)/romcc
    @printf "    ROMCC      $(subst $(obj)/,,$(@))\n"
@@ -107,5 +107,5 @@

$(obj)/mainboard/$(MAINBOARDDIR)/crt0.s: $(obj)/romstage/crt0.S
    @printf "    CC         $(subst $(obj)/,,$(@))\n"
-	$(CC) -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -I$(obj)/romstage -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@
+	$(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -I$(obj)/romstage -include $(obj)/config.h -I. -I$(src) $< -o $@

[Patrick Georgi]

Am 15.04.2010 01:58, schrieb repository service:
> $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s: $(obj)/crt0.S
>    @printf "    CC         $(subst $(obj)/,,$(@))\n"
> $(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@
> $(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< -o $@

I think we did that to avoid partially written files to break the build
(ie. gcc might not work atomically on -E)

Should we use -MF $(basename $@).d at that place (and the other two
places) instead, which explicitely specifies the filename to use for the
dependency file?

Patrick