diff options
author | Jens Arnold <amiconn@rockbox.org> | 2008-04-29 06:19:32 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2008-04-29 06:19:32 +0000 |
commit | 2bbacf89fea9f5613fd884b57809070da5b8c925 (patch) | |
tree | 6af43aad91a09e02f4325b50d361154dc3ea8beb /firmware/rom.lds | |
parent | f3d83c7be7e9cb5700cb5b3d8632867a1862bc80 (diff) | |
download | rockbox-2bbacf89fea9f5613fd884b57809070da5b8c925.tar.gz rockbox-2bbacf89fea9f5613fd884b57809070da5b8c925.zip |
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
Diffstat (limited to 'firmware/rom.lds')
-rw-r--r-- | firmware/rom.lds | 10 |
1 files changed, 5 insertions, 5 deletions
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) | |||
4 | 4 | ||
5 | #ifdef CPU_COLDFIRE | 5 | #ifdef CPU_COLDFIRE |
6 | OUTPUT_FORMAT(elf32-m68k) | 6 | OUTPUT_FORMAT(elf32-m68k) |
7 | INPUT(target/coldfire/crt0.o) | 7 | STARTUP(target/coldfire/crt0.o) |
8 | #elif defined(CPU_PP) | 8 | #elif defined(CPU_PP) |
9 | OUTPUT_FORMAT(elf32-littlearm) | 9 | OUTPUT_FORMAT(elf32-littlearm) |
10 | INPUT(target/arm/crt0-pp.o) | 10 | STARTUP(target/arm/crt0-pp.o) |
11 | #elif defined(CPU_ARM) | 11 | #elif defined(CPU_ARM) |
12 | OUTPUT_FORMAT(elf32-littlearm) | 12 | OUTPUT_FORMAT(elf32-littlearm) |
13 | INPUT(target/arm/crt0.o) | 13 | STARTUP(target/arm/crt0.o) |
14 | #elif CONFIG_CPU == SH7034 | 14 | #elif CONFIG_CPU == SH7034 |
15 | OUTPUT_FORMAT(elf32-sh) | 15 | OUTPUT_FORMAT(elf32-sh) |
16 | INPUT(target/sh/crt0.o) | 16 | STARTUP(target/sh/crt0.o) |
17 | #else | 17 | #else |
18 | OUTPUT_FORMAT(elf32-sh) | 18 | OUTPUT_FORMAT(elf32-sh) |
19 | INPUT(crt0.o) | 19 | STARTUP(crt0.o) |
20 | #endif | 20 | #endif |
21 | 21 | ||
22 | 22 | ||