summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2009-09-13 13:33:05 +0000
committerBlue Swirl <blauwirbel@gmail.com>2009-09-13 13:33:05 +0000
commit91b40c5be84a478e98c0416325844a7f66d0efae (patch)
treed1dbdb15bc8aed0e6ff70dc6a7832af14d6b9f92 /linux-user
parentSparc64: make system bus parent of PCI bus (diff)
downloadqemu-kvm-91b40c5be84a478e98c0416325844a7f66d0efae.tar.gz
qemu-kvm-91b40c5be84a478e98c0416325844a7f66d0efae.tar.bz2
qemu-kvm-91b40c5be84a478e98c0416325844a7f66d0efae.zip
Fix Sparc/Linux host breakage by df70204db53e3611af986f434e74a882bce190ca
While i386, x86_64 and Sparc64/OpenBSD still worked after df70204db53e3611af986f434e74a882bce190ca, Sparc32 and Sparc64 Linux hosts broke. Partially revert the commit: make the restored code conditional to !CONFIG_USER_PIE. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/main.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/linux-user/main.c b/linux-user/main.c
index 81a1ada50..f3455c5a3 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -48,6 +48,27 @@ int have_guest_base;
static const char *interp_prefix = CONFIG_QEMU_PREFIX;
const char *qemu_uname_release = CONFIG_UNAME_RELEASE;
+/* 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)) && !defined(CONFIG_USER_PIE)
+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 */