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/target/arm/sandisk/app.lds | 2 +- firmware/target/arm/sandisk/boot.lds | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'firmware/target/arm/sandisk') diff --git a/firmware/target/arm/sandisk/app.lds b/firmware/target/arm/sandisk/app.lds index ccd23eb31b..d7159e8e1e 100644 --- a/firmware/target/arm/sandisk/app.lds +++ b/firmware/target/arm/sandisk/app.lds @@ -4,7 +4,7 @@ ENTRY(start) OUTPUT_FORMAT(elf32-littlearm) OUTPUT_ARCH(arm) -INPUT(target/arm/crt0-pp.o) +STARTUP(target/arm/crt0-pp.o) #define PLUGINSIZE PLUGIN_BUFFER_SIZE #define CODECSIZE CODEC_SIZE diff --git a/firmware/target/arm/sandisk/boot.lds b/firmware/target/arm/sandisk/boot.lds index 1c1066895f..f829076b12 100644 --- a/firmware/target/arm/sandisk/boot.lds +++ b/firmware/target/arm/sandisk/boot.lds @@ -3,7 +3,7 @@ ENTRY(start) OUTPUT_FORMAT(elf32-littlearm) OUTPUT_ARCH(arm) -INPUT(target/arm/crt0-pp-bl.o) +STARTUP(target/arm/crt0-pp-bl.o) #define DRAMSIZE (MEMORYSIZE * 0x100000) -- cgit v1.2.3