]>
Commit | Line | Data |
---|---|---|
d80aea98 JR |
1 | --- qemu-2.2.0/configure~ 2015-03-26 19:52:14.000000000 +0100 |
2 | +++ qemu-2.2.0/configure 2015-03-26 19:56:34.255072716 +0100 | |
f9d90a34 | 3 | @@ -1904,7 +1904,7 @@ |
d80aea98 JR |
4 | |
5 | if test "$seccomp" != "no" ; then | |
f9d90a34 AM |
6 | case "$cpu" in |
7 | - i386|x86_64) | |
8 | + i386|x86_64|x32) | |
9 | libseccomp_minver="2.1.0" | |
10 | ;; | |
11 | arm|aarch64) | |
d80aea98 JR |
12 | @@ -2932,7 +2932,7 @@ |
13 | ########################################## | |
14 | # TPM passthrough is only on x86 Linux | |
15 | ||
16 | -if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then | |
17 | +if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64 -o "$cpu" = x32; then | |
18 | tpm_passthrough=$tpm | |
19 | else | |
20 | tpm_passthrough=no | |
21 | @@ -4161,7 +4161,7 @@ | |
22 | ||
23 | # Mac OS X ships with a broken assembler | |
24 | roms= | |
25 | -if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \ | |
26 | +if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" -o "$cpu" = "x32" \) -a \ | |
27 | "$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \ | |
28 | "$softmmu" = yes ; then | |
29 | roms="optionrom" | |
1b37833e | 30 | |
b04eac96 JR |
31 | --- qemu-2.6.0/include/qemu/atomic.h~ 2016-07-17 18:37:57.000000000 +0200 |
32 | +++ qemu-2.6.0/include/qemu/atomic.h 2016-07-17 18:38:33.485893530 +0200 | |
33 | @@ -20,7 +20,7 @@ | |
34 | /* Compiler barrier */ | |
35 | #define barrier() ({ asm volatile("" ::: "memory"); (void)0; }) | |
36 | ||
37 | -#ifdef __ATOMIC_RELAXED | |
38 | +#if defined(__ATOMIC_RELAXED) && !defined(__ILP32__) | |
39 | /* For C11 atomic ops */ | |
40 | ||
41 | /* Manual memory barriers |