diff options
| author | Paolo \'Blaisorblade\' Giarrusso <blaisorblade_spam@yahoo.it> | 2005-01-14 23:31:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-14 23:31:04 -0800 |
| commit | b52feaa3201032192b63f2cc2b852c4c1e78b881 (patch) | |
| tree | 504be73fd884bc87186951b84f8822a8266b4357 /arch | |
| parent | 717d2f8d041a4a63115b031d4f18af8b01c37d4e (diff) | |
| download | history-b52feaa3201032192b63f2cc2b852c4c1e78b881.tar.gz | |
[PATCH] uml: update ld scripts to newer binutils
It seems that linker script for userspace software are quite
toolchain-depending, at least because what we use is a merge between builtin
LD scripts (see strings /usr/bin/ld) and normal kernel linking scripts.
Plus, a number of people are having toolchain-related troubles building UML
(even assertion failures on linking, with Gentoo and Fedora 2).
So, let's try to make UML nicer for binutils.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/kernel/dyn.lds.S | 3 | ||||
| -rw-r--r-- | arch/um/kernel/uml.lds.S | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S index 39ddb0968d2b72..715b0838a68c51 100644 --- a/arch/um/kernel/dyn.lds.S +++ b/arch/um/kernel/dyn.lds.S @@ -7,8 +7,11 @@ jiffies = jiffies_64; SECTIONS { + PROVIDE (__executable_start = START); . = START + SIZEOF_HEADERS; .interp : { *(.interp) } + /* Used in arch/um/kernel/mem.c. Any memory between START and __binary_start + * is remapped.*/ __binary_start = .; . = ALIGN(4096); /* Init code and data */ _stext = .; diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S index 72b608cc9e3387..76eadb3091894d 100644 --- a/arch/um/kernel/uml.lds.S +++ b/arch/um/kernel/uml.lds.S @@ -7,8 +7,12 @@ jiffies = jiffies_64; SECTIONS { + /*This must contain the right address - not quite the default ELF one.*/ + PROVIDE (__executable_start = START); . = START + SIZEOF_HEADERS; + /* Used in arch/um/kernel/mem.c. Any memory between START and __binary_start + * is remapped.*/ __binary_start = .; #ifdef MODE_TT .thread_private : { @@ -20,9 +24,13 @@ SECTIONS } . = ALIGN(4096); .remap : { arch/um/kernel/tt/unmap_fin.o (.text) } -#endif + + /* We want it only if we are in MODE_TT. In both cases, however, when MODE_TT + * is off the resulting binary segfaults.*/ . = ALIGN(4096); /* Init code and data */ +#endif + _stext = .; __init_begin = .; .init.text : { |