- updated to 7.0.0

[packages/qemu.git] / x32.patch

diff --git a/x32.patch b/x32.patch
index beee3deda90b63a5e603ce6b214a453448a5cda7..60881304ff7d8f0fd115f46d7a5db5ae3c08b86e 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -1,41 +1,12 @@
---- qemu-2.2.0/configure~      2015-03-26 19:52:14.000000000 +0100
-+++ qemu-2.2.0/configure       2015-03-26 19:56:34.255072716 +0100
-@@ -1904,7 +1904,7 @@
- 
- if test "$seccomp" != "no" ; then
-     case "$cpu" in
--    i386|x86_64)
-+    i386|x86_64|x32)
-         libseccomp_minver="2.1.0"
-         ;;
-     arm|aarch64)
-@@ -2932,7 +2932,7 @@
- ##########################################
- # TPM passthrough is only on x86 Linux
- 
--if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then
-+if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64 -o "$cpu" = x32; then
-   tpm_passthrough=$tpm
- else
-   tpm_passthrough=no
-@@ -4161,7 +4161,7 @@
+diff -ur qemu-7.0.0.orig/configure qemu-7.0.0/configure
+--- qemu-7.0.0.orig/configure  2022-06-03 00:32:41.475669725 +0200
++++ qemu-7.0.0/configure       2022-06-03 00:33:45.782798282 +0200
+@@ -2701,7 +2701,7 @@
  
  # Mac OS X ships with a broken assembler
  roms=
--if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
-+if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" -o "$cpu" = "x32" \) -a \
-         "$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \
-         "$softmmu" = yes ; then
-   roms="optionrom"
-
---- qemu-2.6.0/include/qemu/atomic.h~  2016-07-17 18:37:57.000000000 +0200
-+++ qemu-2.6.0/include/qemu/atomic.h   2016-07-17 18:38:33.485893530 +0200
-@@ -20,7 +20,7 @@
- /* Compiler barrier */
- #define barrier()   ({ asm volatile("" ::: "memory"); (void)0; })
- 
--#ifdef __ATOMIC_RELAXED
-+#if defined(__ATOMIC_RELAXED) && !defined(__ILP32__)
- /* For C11 atomic ops */
- 
- /* Manual memory barriers
+-if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \
++if { test "$cpu" = "i386" || test "$cpu" = "x86_64" || test "$cpu" = "x32"; } && \
+         test "$targetos" != "darwin" && test "$targetos" != "sunos" && \
+         test "$targetos" != "haiku" && test "$softmmu" = yes ; then
+     # Different host OS linkers have different ideas about the name of the ELF