- updated to 6.0.0

[packages/qemu.git] / qemu-cflags.patch

diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index 970fe4608865dc3b897883ebd6951299463fda74..f5dab3ec1480e30b2d958819811038b0ec3042ba 100644 (file)
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -1,26 +1,17 @@
---- qemu-5.0.0./configure.orig 2020-05-09 00:48:28.237641000 +0200
-+++ qemu-5.0.0./configure      2020-05-09 00:50:39.164641000 +0200
-@@ -603,9 +603,6 @@
- QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
- QEMU_INCLUDES="-iquote . -iquote \$(SRC_PATH) -iquote \$(SRC_PATH)/accel/tcg -iquote \$(SRC_PATH)/include"
- QEMU_INCLUDES="$QEMU_INCLUDES -iquote \$(SRC_PATH)/disas/libvixl"
--if test "$debug_info" = "yes"; then
--    CFLAGS="-g $CFLAGS"
--fi
+diff -ur qemu-5.2.0.orig/configure qemu-5.2.0/configure
+--- qemu-5.2.0.orig/configure  2021-01-02 17:56:31.497947511 +0100
++++ qemu-5.2.0/configure       2021-01-02 18:11:17.004206582 +0100
+@@ -5664,13 +5664,6 @@
  
- # running configure in the source tree?
- # we know that's the case if configure is there.
-@@ -6258,12 +6255,8 @@
  write_c_skeleton
  
- if test "$gcov" = "yes" ; then
--  QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
-+  QEMU_CFLAGS="-fprofile-arcs -ftest-coverage $QEMU_CFLAGS"
-   QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
+-if test "$gcov" = "yes" ; then
+-  :
 -elif test "$fortify_source" = "yes" ; then
--  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
--elif test "$debug" = "no"; then
--  CFLAGS="-O2 $CFLAGS"
- fi
- 
- if test "$have_asan" = "yes"; then
+-  QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
+-  debug=no
+-fi
+-
+ case "$ARCH" in
+ alpha)
+   # Ensure there's only a single GP