[coreboot] New patch to review for coreboot: f29db5c clang's integrated assembler isn't complete enough yet
Patrick Georgi (patrick@georgi-clan.de)
gerrit at coreboot.org
Sun Mar 11 20:48:57 CET 2012
Patrick Georgi (patrick at georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/784
-gerrit
commit f29db5c1dda55cb0c520b27a90d3c134ff396999
Author: Patrick Georgi <patrick at georgi-clan.de>
Date: Sun Mar 11 19:43:30 2012 +0100
clang's integrated assembler isn't complete enough yet
So we tell clang not to use it. (.code16 and other issues)
Change-Id: I881326354d7286219beadfc31f54e5a6923adb7a
Signed-off-by: Patrick Georgi <patrick at georgi-clan.de>
---
Makefile.inc | 6 ++++++
src/arch/x86/Makefile.inc | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
index 86a072a..1375684 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -58,6 +58,12 @@ ifeq ($(CONFIG_TRACE),y)
ramstage-c-ccopts:= -finstrument-functions
endif
+ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
+romstage-s-ccopts:=-no-integrated-as
+ramstage-S-ccopts:=-no-integrated-as
+ramstage-s-ccopts:=-no-integrated-as
+endif
+
smm-c-ccopts:=-D__SMM__
smm-S-ccopts:=-D__SMM__
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index d3dac11..250c077 100755
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -318,7 +318,7 @@ $(obj)/bootblock/bootblock.S: $$(bootblock_inc)
$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.o: $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.s
@printf " CC $(subst $(obj)/,,$(@))\n"
- $(CC) -Wa,-acdlns -c -o $@ $< > $(dir $@)/crt0.disasm
+ $(CC) $(romstage-s-ccopts) -Wa,-acdlns -c -o $@ $< > $(dir $@)/crt0.disasm
$(obj)/mainboard/$(MAINBOARDDIR)/bootblock.s: $(obj)/bootblock/bootblock.S $(obj)/config.h $(obj)/build.h
@printf " CC $(subst $(obj)/,,$(@))\n"
@@ -368,7 +368,7 @@ $(obj)/romstage/crt0.S: $$(crt0s)
$(obj)/mainboard/$(MAINBOARDDIR)/crt0.romstage.o: $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s
@printf " CC $(subst $(obj)/,,$(@))\n"
- $(CC) -Wa,-acdlns -c -o $@ $< > $(dir $@)/crt0.disasm
+ $(CC) $(romstage-s-ccopts) -Wa,-acdlns -c -o $@ $< > $(dir $@)/crt0.disasm
$(obj)/mainboard/$(MAINBOARDDIR)/crt0.s: $(obj)/romstage/crt0.S $(obj)/config.h $(obj)/build.h
@printf " CC $(subst $(obj)/,,$(@))\n"
More information about the coreboot
mailing list