Patrick Georgi merged this change.

View Change

Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Aaron Durbin: Looks good to me, approved
x86/smmstub: Fix compiling with external toolchains

This copies the makefile code from the smm/smm.o.

Now works with clang version 7.0.1 from my OS using

Change-Id: I298d24d54b8fb27da96257ccda65b7fbee988ebb
Signed-off-by: Arthur Heymans <>
Reviewed-by: Paul Menzel <>
Reviewed-by: Aaron Durbin <>
Tested-by: build bot (Jenkins) <>
M src/cpu/x86/smm/
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cpu/x86/smm/ b/src/cpu/x86/smm/
index 32f5ea7..e6add1d 100644
--- a/src/cpu/x86/smm/
+++ b/src/cpu/x86/smm/
@@ -47,8 +47,8 @@

# SMM Stub Module. The stub is used as a trampoline for relocation and normal
# SMM handling.
-$(obj)/smmstub/smmstub.o: $$(smmstub-objs)
- $(CC_smmstub) $(CFLAGS_smmstub) -nostdlib -r -o $@ $^
+$(obj)/smmstub/smmstub.o: $$(smmstub-objs) $(COMPILER_RT_smmstub)
+ $(LD_smmstub) -nostdlib -r -o $@ $(COMPILER_RT_FLAGS_smmstub) --whole-archive --start-group $(smmstub-objs) --no-whole-archive $(COMPILER_RT_smmstub) --end-group

# Link the SMM stub module with a 0-byte heap.
ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y)

To view, visit change 30504. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I298d24d54b8fb27da96257ccda65b7fbee988ebb
Gerrit-Change-Number: 30504
Gerrit-PatchSet: 5
Gerrit-Owner: Arthur Heymans <>
Gerrit-Reviewer: Aaron Durbin <>
Gerrit-Reviewer: Arthur Heymans <>
Gerrit-Reviewer: Martin Roth <>
Gerrit-Reviewer: Patrick Georgi <>
Gerrit-Reviewer: Paul Menzel <>
Gerrit-Reviewer: build bot (Jenkins) <>
Gerrit-CC: Patrick Rudolph <>
Gerrit-MessageType: merged