summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/x86/Makefile.inc6
-rw-r--r--src/arch/x86/failover.ld4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 6b71b4a003..ff3b4fec1a 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 94d5263bfb..bbff36e4fa 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.*)