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

2 files changed, 2 insertions, 2 deletions

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)