aboutsummaryrefslogtreecommitdiff
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 /configure
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 'configure')
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 494e9ced7..2d46d399a 100755
--- a/configure
+++ b/configure
@@ -2364,9 +2364,10 @@ if test "$target_softmmu" = "yes" ; then
fi
if test "$target_user_only" = "yes" -a "$static" = "no" -a \
- "$user_pie" = "yes" ; then
+ "$user_pie" = "yes" ; then
cflags="-fpie $cflags"
ldflags="-pie $ldflags"
+ echo "CONFIG_USER_PIE=y" >> $config_mak
fi
if test "$target_softmmu" = "yes" -a \( \