- updated to 6.2.0

[packages/qemu.git] / x32.patch

diff --git a/x32.patch b/x32.patch
index 250576cbcb01f3a064d99db1dc0b2c5158b8688c..34854563abf6e48f1b291e99633753f4f8af854a 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 @@
- libseccomp_minver="2.2.0"
- if test "$seccomp" != "no" ; then
-     case "$cpu" in
--    i386|x86_64|mips)
-+    i386|x86_64|x32|mips)
-         ;;
-     arm|aarch64)
-         libseccomp_minver="2.2.3"
-@@ -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-6.2.0.orig/configure qemu-6.2.0/configure
+--- qemu-6.2.0.orig/configure  2022-01-23 13:48:29.104596968 +0100
++++ qemu-6.2.0/configure       2022-01-23 13:48:53.080645444 +0100
+@@ -3349,7 +3349,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