diff options
| author | Patrick Georgi <patrick@georgi-clan.de> | 2012-11-25 17:31:25 +0100 |
|---|---|---|
| committer | Patrick Georgi <patrick@georgi-clan.de> | 2012-11-27 22:01:02 +0100 |
| commit | 6999217ab6e4c8ed4c7f19a5578c36b01ad883ed (patch) | |
| tree | 9aaf971665adeeeaa601f14e5249ed0941b8cb2c | |
| parent | 23f38cd05c05ed1876febfa59b652cd7171027ca (diff) | |
build system: Eliminate special case for c_start
c_start.o has a special case in the build system, which we can
eliminate, somewhat simplifying the build.
To ensure that the entry point is at the beginning, introduce a
new section .textfirst that is placed appropriately. In principle
the ENTRY() definition in the linker script should be enough, but
better be safe.
Change-Id: I9737f7f5731e12ceb2119eb432b0e09832bc53fa
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/1909
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
| -rw-r--r-- | src/arch/x86/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/arch/x86/coreboot_ram.ld | 1 | ||||
| -rw-r--r-- | src/arch/x86/lib/c_start.S | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index a7446df7c1..2555280456 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -161,12 +161,12 @@ else $(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/arch/x86/coreboot_ram.ld $< endif -$(objgenerated)/coreboot_ram.o: $(obj)/arch/x86/lib/c_start.ramstage.o $$(ramstage-objs) $(LIBGCC_FILE_NAME) +$(objgenerated)/coreboot_ram.o: $$(ramstage-objs) $(LIBGCC_FILE_NAME) @printf " CC $(subst $(obj)/,,$(@))\n" ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) - $(LD) -m elf_i386 -r -o $@ $(obj)/arch/x86/lib/c_start.ramstage.o --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 --start-group $(filter-out $(obj)/arch/x86/lib/c_start.ramstage.o,$(ramstage-objs)) $(LIBGCC_FILE_NAME) --end-group + $(LD) -m elf_i386 -r -o $@ --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 --start-group $(ramstage-objs) $(LIBGCC_FILE_NAME) --end-group else - $(CC) -nostdlib -r -o $@ $(obj)/arch/x86/lib/c_start.ramstage.o -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(filter-out $(obj)/arch/x86/lib/c_start.ramstage.o,$(ramstage-objs)) $(LIBGCC_FILE_NAME) -Wl,--end-group + $(CC) -nostdlib -r -o $@ -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(ramstage-objs) $(LIBGCC_FILE_NAME) -Wl,--end-group endif ################################################################################ diff --git a/src/arch/x86/coreboot_ram.ld b/src/arch/x86/coreboot_ram.ld index 57ddd03c0d..a87a0e7e91 100644 --- a/src/arch/x86/coreboot_ram.ld +++ b/src/arch/x86/coreboot_ram.ld @@ -32,6 +32,7 @@ SECTIONS */ .text : { _text = .; + *(.textfirst); *(.text); *(.text.*); . = ALIGN(16); diff --git a/src/arch/x86/lib/c_start.S b/src/arch/x86/lib/c_start.S index a84724d7b9..9a8b4ac3c2 100644 --- a/src/arch/x86/lib/c_start.S +++ b/src/arch/x86/lib/c_start.S @@ -1,6 +1,6 @@ #include <cpu/x86/post_code.h> - .section ".text" + .section ".textfirst" .code32 .globl _start _start: |