[coreboot-gerrit] Patch set updated for coreboot: arch/x86/bootblock: Link in object files selected with bootblock-y

[Alexandru Gagniuc (mr.nuke.me@gmail.com)]

Alexandru Gagniuc (mr.nuke.me at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11783

-gerrit

commit 120127cc412f5c2a5963d8052dd8d6b48c44de12
Author: Alexandru Gagniuc <mr.nuke.me at gmail.com>
Date:   Fri Oct 2 12:17:56 2015 -0700

    arch/x86/bootblock: Link in object files selected with bootblock-y
    
    As part of preparing for systems with non-memory-mapped media, we want
    to be able to call into C code. This change allows us to link C code
    directly into the bootblock. The steps of going from bootblock main()
    to CAR setup to C code will be implemented in subsequent patches.
    
    Note that a few files selected with bootblock-y will now be compiled
    for the bootblock as well, but since we enabled garbage collection,
    they will not be included in the final binary.
    
    Change-Id: I5ca6dcaf176f5469c6a3bb925859399123493bc6
    Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
---
 src/arch/x86/Makefile.inc | 6 ++++--
 src/arch/x86/failover.ld  | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 6b71b4a..ff3b4fe 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -110,9 +110,11 @@ $(objgenerated)/bootblock.inc: $(src)/arch/x86/$(subst ",,$(CONFIG_BOOTBLOCK_SOU
 		$< > $(objgenerated)/bootblock.inc.d
 	$(ROMCC) -c -S $(bootblock_romccflags) -I. $(CPPFLAGS_bootblock) $< -o $@
 
-$(objcbfs)/bootblock.debug: $(obj)/arch/x86/bootblock.bootblock.o $(obj)/arch/x86/bootblock.bootblock.ld
+# $(obj)/arch/x86/bootblock.bootblock.ld is part of $(bootblock-objs)
+$(objcbfs)/bootblock.debug: $$(bootblock-objs)
 	@printf "    LINK       $(subst $(obj)/,,$(@))\n"
-	$(LD_bootblock) $(LDFLAGS_bootblock) -static -o $@ -L$(obj) $< \
+	$(LD_bootblock) $(LDFLAGS_bootblock) -o $@ -L$(obj) \
+		$(filter-out %.ld,$(bootblock-objs)) \
 		-T $(obj)/arch/x86/bootblock.bootblock.ld
 
 
diff --git a/src/arch/x86/failover.ld b/src/arch/x86/failover.ld
index 94d5263..bbff36e 100644
--- a/src/arch/x86/failover.ld
+++ b/src/arch/x86/failover.ld
@@ -43,6 +43,9 @@ SECTIONS
 		*(.rom.text);
 		*(.rom.data);
 		*(.rom.data.*);
+		*(.text);
+		*(.text.*);
+		*(.rodata);
 		*(.rodata.*);
 		_erom = .;
 	} >rom = 0xff
@@ -65,6 +68,7 @@ SECTIONS
 		*(.note)
 		*(.comment.*)
 		*(.note.*)
+		*(.eh_frame)
 		*(.iplt)
 		*(.rel.*)
 		*(.igot.*)