Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35601 )
Change subject: arch/x86: Fix __ROMCC__ automatic prerequisities ......................................................................
arch/x86: Fix __ROMCC__ automatic prerequisities
While the list of prerequisities is not created with romcc, we need to simulate it since different set of header files will is used.
Change-Id: Ib799c872b5280e2035126f9660e04e51acc4b1a8 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/arch/x86/Makefile.inc 1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/35601/1
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 554107f..612424d 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -161,7 +161,7 @@ $(objgenerated)/bootblock.inc: $(src)/arch/x86/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) $(objutil)/romcc/romcc $(OPTION_TABLE_H) $(KCONFIG_AUTOHEADER) # The open quote in the subst messes with syntax highlighting. Fix it - ") @printf " ROMCC $(subst $(obj)/,,$(@))\n" - $(CC_bootblock) $(CPPFLAGS_bootblock) -MM -MT$(objgenerated)/bootblock.inc \ + $(CC_bootblock) -D__ROMCC__ -D__PRE_RAM__ -D__BOOTBLOCK__ $(CPPFLAGS_bootblock) -MM -MT$(objgenerated)/bootblock.inc \ $< > $(objgenerated)/bootblock.inc.d $(ROMCC) -c -S $(bootblock_romccflags) -I. $(CPPFLAGS_bootblock) $< -o $@
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35601 )
Change subject: arch/x86: Fix __ROMCC__ automatic prerequisities ......................................................................
Patch Set 1:
(1 comment)
Patrick, this is possibly your territory?
https://review.coreboot.org/c/coreboot/+/35601/1/src/arch/x86/Makefile.inc File src/arch/x86/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/35601/1/src/arch/x86/Makefile.inc@1... PS1, Line 164: $(CC_bootblock) -D__ROMCC__ -D__PRE_RAM__ -D__BOOTBLOCK__ $(CPPFLAGS_bootblock) -MM -MT$(objgenerated)/bootblock.inc \ I expected -D__PRE_RAM__ -D__BOOTBLOCK__ to appear in CPPFLAGS_xx but they do not?
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35601 )
Change subject: arch/x86: Fix __ROMCC__ automatic prerequisities ......................................................................
Patch Set 2: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/35601/1/src/arch/x86/Makefile.inc File src/arch/x86/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/35601/1/src/arch/x86/Makefile.inc@1... PS1, Line 164: $(CC_bootblock) -D__ROMCC__ -D__PRE_RAM__ -D__BOOTBLOCK__ $(CPPFLAGS_bootblock) -MM -MT$(objgenerated)/bootblock.inc \
I expected -D__PRE_RAM__ -D__BOOTBLOCK__ to appear in CPPFLAGS_xx but they do not?
They're explicitly added to command lines in the create_cc_template macro (Makefile:351, look for $(3)). Might want to revisit this, but that part of the build system is arcane enough as-is ;-)
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35601 )
Change subject: arch/x86: Fix __ROMCC__ automatic prerequisities ......................................................................
arch/x86: Fix __ROMCC__ automatic prerequisities
While the list of prerequisities is not created with romcc, we need to simulate it since different set of header files will is used.
Change-Id: Ib799c872b5280e2035126f9660e04e51acc4b1a8 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/35601 Reviewed-by: Patrick Georgi pgeorgi@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/arch/x86/Makefile.inc 1 file changed, 1 insertion(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 554107f..612424d 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -161,7 +161,7 @@ $(objgenerated)/bootblock.inc: $(src)/arch/x86/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) $(objutil)/romcc/romcc $(OPTION_TABLE_H) $(KCONFIG_AUTOHEADER) # The open quote in the subst messes with syntax highlighting. Fix it - ") @printf " ROMCC $(subst $(obj)/,,$(@))\n" - $(CC_bootblock) $(CPPFLAGS_bootblock) -MM -MT$(objgenerated)/bootblock.inc \ + $(CC_bootblock) -D__ROMCC__ -D__PRE_RAM__ -D__BOOTBLOCK__ $(CPPFLAGS_bootblock) -MM -MT$(objgenerated)/bootblock.inc \ $< > $(objgenerated)/bootblock.inc.d $(ROMCC) -c -S $(bootblock_romccflags) -I. $(CPPFLAGS_bootblock) $< -o $@
-
Kyösti Mälkki (Code Review) -
Patrick Georgi (Code Review)