]>
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 | |
3 | @@ -1819,7 +1819,7 @@ | |
4 | # libseccomp check | |
5 | ||
6 | if test "$seccomp" != "no" ; then | |
7 | - if test "$cpu" = "i386" || test "$cpu" = "x86_64" && | |
8 | + if test "$cpu" = "i386" || test "$cpu" = "x86_64" || test "$cpu" = "x32" && | |
9 | $pkg_config --atleast-version=2.1.1 libseccomp; then | |
10 | libs_softmmu="$libs_softmmu `$pkg_config --libs libseccomp`" | |
11 | QEMU_CFLAGS="$QEMU_CFLAGS `$pkg_config --cflags libseccomp`" | |
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" | |
30 | @@ -5080,7 +5080,9 @@ case "$target_name" in | |
31 | \( "$target_name" = "ppcemb" -a "$cpu" = "ppc64" \) -o \ | |
32 | \( "$target_name" = "mipsel" -a "$cpu" = "mips" \) -o \ | |
33 | \( "$target_name" = "x86_64" -a "$cpu" = "i386" \) -o \ | |
34 | - \( "$target_name" = "i386" -a "$cpu" = "x86_64" \) \) ; then | |
35 | + \( "$target_name" = "i386" -a "$cpu" = "x86_64" \) -o \ | |
36 | + \( "$target_name" = "x86_64" -a "$cpu" = "x32" \) -o \ | |
37 | + \( "$target_name" = "i386" -a "$cpu" = "x32" \) \) ; then | |
38 | echo "CONFIG_KVM=y" >> $config_target_mak | |
39 | if test "$vhost_net" = "yes" ; then | |
40 | echo "CONFIG_VHOST_NET=y" >> $config_target_mak |