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/target/arm/tcc780x | |
| 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/target/arm/tcc780x')
| -rw-r--r-- | firmware/target/arm/tcc780x/app.lds | 2 | ||||
| -rw-r--r-- | firmware/target/arm/tcc780x/boot.lds | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/tcc780x/app.lds b/firmware/target/arm/tcc780x/app.lds index 069dd24b9c..97ae2c2e82 100644 --- a/firmware/target/arm/tcc780x/app.lds +++ b/firmware/target/arm/tcc780x/app.lds | |||
| @@ -4,7 +4,7 @@ ENTRY(start) | |||
| 4 | 4 | ||
| 5 | OUTPUT_FORMAT(elf32-littlearm) | 5 | OUTPUT_FORMAT(elf32-littlearm) |
| 6 | OUTPUT_ARCH(arm) | 6 | OUTPUT_ARCH(arm) |
| 7 | INPUT(target/arm/tcc780x/crt0.o) | 7 | STARTUP(target/arm/tcc780x/crt0.o) |
| 8 | 8 | ||
| 9 | #define PLUGINSIZE PLUGIN_BUFFER_SIZE | 9 | #define PLUGINSIZE PLUGIN_BUFFER_SIZE |
| 10 | #define CODECSIZE CODEC_SIZE | 10 | #define CODECSIZE CODEC_SIZE |
diff --git a/firmware/target/arm/tcc780x/boot.lds b/firmware/target/arm/tcc780x/boot.lds index 657f31901a..ea4a562a35 100644 --- a/firmware/target/arm/tcc780x/boot.lds +++ b/firmware/target/arm/tcc780x/boot.lds | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | ENTRY(start) | 3 | ENTRY(start) |
| 4 | OUTPUT_FORMAT(elf32-littlearm) | 4 | OUTPUT_FORMAT(elf32-littlearm) |
| 5 | OUTPUT_ARCH(arm) | 5 | OUTPUT_ARCH(arm) |
| 6 | INPUT(target/arm/tcc780x/crt0.o) | 6 | STARTUP(target/arm/tcc780x/crt0.o) |
| 7 | 7 | ||
| 8 | #define DRAMSIZE (MEMORYSIZE * 0x100000) | 8 | #define DRAMSIZE (MEMORYSIZE * 0x100000) |
| 9 | 9 | ||