From 2bbacf89fea9f5613fd884b57809070da5b8c925 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Tue, 29 Apr 2008 06:19:32 +0000 Subject: Make sure the linker considers crt0*.o before all files specified on the command line by using STARTUP() instead of INPUT() in the .lds. Using INPUT() makes the linker process crt0*.o after all files specified on the command line, making linking fail if there are librockbox.a members which are only referenced by crt0*.o. Remove the hackaround that was needed for building the gigabeat S bootloader before (aka UIE() problem). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17289 a1c6a512-1295-4272-9138-f99709370657 --- firmware/rom.lds | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'firmware/rom.lds') diff --git a/firmware/rom.lds b/firmware/rom.lds index 723977295a..a56beea915 100644 --- a/firmware/rom.lds +++ b/firmware/rom.lds @@ -4,19 +4,19 @@ ENTRY(start) #ifdef CPU_COLDFIRE OUTPUT_FORMAT(elf32-m68k) -INPUT(target/coldfire/crt0.o) +STARTUP(target/coldfire/crt0.o) #elif defined(CPU_PP) OUTPUT_FORMAT(elf32-littlearm) -INPUT(target/arm/crt0-pp.o) +STARTUP(target/arm/crt0-pp.o) #elif defined(CPU_ARM) OUTPUT_FORMAT(elf32-littlearm) -INPUT(target/arm/crt0.o) +STARTUP(target/arm/crt0.o) #elif CONFIG_CPU == SH7034 OUTPUT_FORMAT(elf32-sh) -INPUT(target/sh/crt0.o) +STARTUP(target/sh/crt0.o) #else OUTPUT_FORMAT(elf32-sh) -INPUT(crt0.o) +STARTUP(crt0.o) #endif -- cgit v1.2.3