diff options
author | Kirill A. Shutemov <kirill@shutemov.name> | 2009-09-12 02:17:54 +0300 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2009-09-12 13:15:26 +0000 |
commit | df70204db53e3611af986f434e74a882bce190ca (patch) | |
tree | 34ef56820964e67a57bbdd2038f188f001328721 /linux-user | |
parent | 5791f45b58d2147a7a642e3fe0eb68f2f265d254 (diff) | |
download | qemu-df70204db53e3611af986f434e74a882bce190ca.tar.gz qemu-df70204db53e3611af986f434e74a882bce190ca.tar.bz2 qemu-df70204db53e3611af986f434e74a882bce190ca.zip |
Fix text relocations in linux-user targets
There is a link hack in linux-user which produces an executable that
looks like PIE, but always has text relocations since all object files
isn't position-independent (compiled without -fpic/-fpie). Dynamic loader
has to do more work to load a binary with text relocations.
The best way to keep this functionality is to build a true PIE without
text relocations.
Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'linux-user')
-rw-r--r-- | linux-user/main.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index a628c01725..81a1ada50b 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -48,32 +48,6 @@ int have_guest_base; static const char *interp_prefix = CONFIG_QEMU_PREFIX; const char *qemu_uname_release = CONFIG_UNAME_RELEASE; -#if defined(__i386__) && !defined(CONFIG_STATIC) -/* Force usage of an ELF interpreter even if it is an ELF shared - object ! */ -const char interp[] __attribute__((section(".interp"))) = "/lib/ld-linux.so.2"; -#endif - -/* for recent libc, we add these dummy symbols which are not declared - when generating a linked object (bug in ld ?) */ -#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined(CONFIG_STATIC) -asm(".globl __preinit_array_start\n" - ".globl __preinit_array_end\n" - ".globl __init_array_start\n" - ".globl __init_array_end\n" - ".globl __fini_array_start\n" - ".globl __fini_array_end\n" - ".section \".rodata\"\n" - "__preinit_array_start:\n" - "__preinit_array_end:\n" - "__init_array_start:\n" - "__init_array_end:\n" - "__fini_array_start:\n" - "__fini_array_end:\n" - ".long 0\n" - ".previous\n"); -#endif - /* XXX: on x86 MAP_GROWSDOWN only works if ESP <= address + 32, so we allocate a bigger stack. Need a better solution, for example by remapping the process stack directly at the right place */ |