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/coldfire/iaudio/app.lds | 2 +- firmware/target/coldfire/iaudio/boot.lds | 2 +- firmware/target/coldfire/iriver/app.lds | 2 +- firmware/target/coldfire/iriver/boot.lds | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'firmware/target/coldfire') diff --git a/firmware/target/coldfire/iaudio/app.lds b/firmware/target/coldfire/iaudio/app.lds index 63c462cf4a..d3ccce24f0 100644 --- a/firmware/target/coldfire/iaudio/app.lds +++ b/firmware/target/coldfire/iaudio/app.lds @@ -3,7 +3,7 @@ ENTRY(start) OUTPUT_FORMAT(elf32-m68k) -INPUT(target/coldfire/crt0.o) +STARTUP(target/coldfire/crt0.o) #define PLUGINSIZE PLUGIN_BUFFER_SIZE #define CODECSIZE CODEC_SIZE diff --git a/firmware/target/coldfire/iaudio/boot.lds b/firmware/target/coldfire/iaudio/boot.lds index 17b1457747..bf307ae994 100644 --- a/firmware/target/coldfire/iaudio/boot.lds +++ b/firmware/target/coldfire/iaudio/boot.lds @@ -2,7 +2,7 @@ ENTRY(start) OUTPUT_FORMAT(elf32-m68k) -INPUT(target/coldfire/crt0.o) +STARTUP(target/coldfire/crt0.o) #define DRAMSIZE (MEMORYSIZE * 0x100000) diff --git a/firmware/target/coldfire/iriver/app.lds b/firmware/target/coldfire/iriver/app.lds index 3e4c81fe51..ae21ecd9de 100644 --- a/firmware/target/coldfire/iriver/app.lds +++ b/firmware/target/coldfire/iriver/app.lds @@ -3,7 +3,7 @@ ENTRY(start) OUTPUT_FORMAT(elf32-m68k) -INPUT(target/coldfire/crt0.o) +STARTUP(target/coldfire/crt0.o) #define PLUGINSIZE PLUGIN_BUFFER_SIZE #define CODECSIZE CODEC_SIZE diff --git a/firmware/target/coldfire/iriver/boot.lds b/firmware/target/coldfire/iriver/boot.lds index 4e2619f764..5330cb6df7 100644 --- a/firmware/target/coldfire/iriver/boot.lds +++ b/firmware/target/coldfire/iriver/boot.lds @@ -2,7 +2,7 @@ ENTRY(start) OUTPUT_FORMAT(elf32-m68k) -INPUT(target/coldfire/crt0.o) +STARTUP(target/coldfire/crt0.o) #define DRAMSIZE (MEMORYSIZE * 0x100000) -- cgit v1.2.3