- merged PLD changes

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

diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index 286d987860bed7b034700db907445ffd063854b3..ed5ce2a7a2e81a4f946a2450910d5e70e7812de0 100644 (file)
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -1,28 +1,16 @@
-diff -urp qemu-2.6.1.orig/configure qemu-2.6.1/configure
---- qemu-2.6.1.orig/configure  2016-08-22 12:44:02.279554000 +0000
-+++ qemu-2.6.1/configure       2016-08-22 12:44:21.033554000 +0000
-@@ -392,10 +392,6 @@ QEMU_CFLAGS="-Wall -Wundef -Wwrite-strin
- QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
- QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
- QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include"
--if test "$debug_info" = "yes"; then
--    CFLAGS="-g $CFLAGS"
--    LDFLAGS="-g $LDFLAGS"
--fi
- 
- # make source path absolute
- source_path=`cd "$source_path"; pwd`
-@@ -4514,12 +4510,8 @@ fi
- # After here, no more $cc or $ld runs
+--- qemu-5.0.0/configure.orig  2020-05-25 07:18:02.653298508 +0200
++++ qemu-5.0.0/configure       2020-05-25 07:23:20.044912383 +0200
+@@ -6258,12 +6258,8 @@
+ write_c_skeleton
  
  if test "$gcov" = "yes" ; then
--  CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
-+  CFLAGS="-fprofile-arcs -ftest-coverage $CFLAGS"
-   LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
+-  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"
 -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