8c721a87ae
- Remove deprecated patch "work-around-SA_RESTART-race" (boo#982208) - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.6 * Patches dropped: 0002-XXX-work-around-SA_RESTART-race-wit.patch 0003-qemu-0.9.0.cvs-binfmt.patch 0004-qemu-cvs-alsa_bitfield.patch 0005-qemu-cvs-alsa_ioctl.patch 0006-qemu-cvs-alsa_mmap.patch 0007-qemu-cvs-gettimeofday.patch 0008-qemu-cvs-ioctl_debug.patch 0009-qemu-cvs-ioctl_nodirection.patch 0010-block-vmdk-Support-creation-of-SCSI.patch 0011-linux-user-add-binfmt-wrapper-for-a.patch 0012-PPC-KVM-Disable-mmu-notifier-check.patch 0013-linux-user-fix-segfault-deadlock.patch 0014-linux-user-binfmt-support-host-bina.patch 0015-linux-user-Ignore-broken-loop-ioctl.patch 0016-linux-user-lock-tcg.patch 0017-linux-user-Run-multi-threaded-code-.patch 0018-linux-user-lock-tb-flushing-too.patch 0019-linux-user-Fake-proc-cpuinfo.patch 0020-linux-user-implement-FS_IOC_GETFLAG.patch 0021-linux-user-implement-FS_IOC_SETFLAG.patch 0022-linux-user-XXX-disable-fiemap.patch 0023-slirp-nooutgoing.patch 0024-vnc-password-file-and-incoming-conn.patch 0025-linux-user-add-more-blk-ioctls.patch 0026-linux-user-use-target_ulong.patch 0027-block-Add-support-for-DictZip-enabl.patch 0028-block-Add-tar-container-format.patch OBS-URL: https://build.opensuse.org/request/show/408549 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=305
54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
From 936efd7b1f317b574dbedf08e69e4206f16ac39f Mon Sep 17 00:00:00 2001
|
|
From: Olaf Hering <olaf@aepfle.de>
|
|
Date: Fri, 1 Apr 2016 12:27:16 +0200
|
|
Subject: [PATCH] build: link with libatomic on powerpc-linux
|
|
|
|
Building on powerpc-linux fails with undefined reference to
|
|
__atomic_load_8 in icount_warp_rt(). Force linking to -latomic.
|
|
|
|
Fixes a0aa44b ("include/qemu/atomic.h: default to __atomic functions")
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
---
|
|
configure | 27 +++++++++++++++++++++++++++
|
|
1 file changed, 27 insertions(+)
|
|
|
|
diff --git a/configure b/configure
|
|
index 4efabe3..b455035 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -4032,6 +4032,33 @@ if test "$usb_redir" != "no" ; then
|
|
fi
|
|
fi
|
|
|
|
+if test "$linux_user" = "no" -a "$cpu" = "ppc" -a "$targetos" = "Linux" ; then
|
|
+ # Do we need libm
|
|
+ cat > $TMPC << EOF
|
|
+ #include <unistd.h>
|
|
+ #include <stdint.h>
|
|
+ #include <qemu/atomic.h>
|
|
+ int64_t val;
|
|
+ int main(int argc, char **argv)
|
|
+ {
|
|
+ val = (int64_t)read(0, NULL, 0);
|
|
+ if (atomic_read(&val) == -1) {
|
|
+ return 0;
|
|
+ }
|
|
+ return 1;
|
|
+ }
|
|
+EOF
|
|
+ if compile_prog "-Iinclude" "" ; then
|
|
+ :
|
|
+ echo "No need to link with -latomic on powerpc-linux"
|
|
+ elif compile_prog "-Iinclude" "-latomic" ; then
|
|
+ echo "Link with -latomic on powerpc-linux"
|
|
+ libs_softmmu="$libs_softmmu -latomic"
|
|
+ else
|
|
+ error_exit "libatomic check failed"
|
|
+ fi
|
|
+fi
|
|
+
|
|
##########################################
|
|
# check if we have VSS SDK headers for win
|
|
|