- updated to 8.2.4, partial merge of PLD spec changes

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

diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index 286d987860bed7b034700db907445ffd063854b3..a2d165fca575736af3b1ed9ca9e3d515ea465602 100644 (file)
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -1,28 +1,13 @@
-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
+--- qemu-8.2.4/include/qemu/osdep.h.orig       2024-05-13 21:19:44.000000000 +0200
++++ qemu-8.2.4/include/qemu/osdep.h    2024-05-28 21:35:11.927464569 +0200
+@@ -27,10 +27,6 @@
+ #ifndef QEMU_OSDEP_H
+ #define QEMU_OSDEP_H
  
- # make source path absolute
- source_path=`cd "$source_path"; pwd`
-@@ -4514,12 +4510,8 @@ fi
- # After here, no more $cc or $ld runs
- 
- if test "$gcov" = "yes" ; then
--  CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
-+  CFLAGS="-fprofile-arcs -ftest-coverage $CFLAGS"
-   LDFLAGS="-fprofile-arcs -ftest-coverage $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 !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ && defined __linux__
+-# define _FORTIFY_SOURCE 2
+-#endif
+-
+ #include "config-host.h"
+ #ifdef NEED_CPU_H
+ #include CONFIG_TARGET