From eb1c9a44c352ded1bcb9316f5fa0752b61abbb10 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 16 Jan 2012 18:45:09 +0100
Subject: [PATCH] w32: Always build with -fno-omit-frame-pointer.

This is required due to a bug in the mingw32 runtime.
* configure.ac (HAVE_W32_SYSTEM): Force use of -fno-omit-frame-pointer.
---
 configure.ac | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/configure.ac b/configure.ac
index ad08c2388..1a0c58aaa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -594,6 +594,14 @@ case "${host}" in
         agent_support=no
 	use_simple_gettext=yes
 	have_w32_system=yes
+        # gcc 4.6 uses by default -fomit-frame-pointer.  This
+        # conflicts with mingw runtime's setjmp/longjmp usage.  The
+        # actual bug we notice is a segv related to the dlopened
+        # iconv.dll: After returning from set_native_charset the stack
+        # frame is corrupt.
+        if test -n "$GCC" ; then
+            CFLAGS="$CFLAGS -fno-omit-frame-pointer"
+        fi
         ;;
     i?86-emx-os2 | i?86-*-os2*emx )
         # OS/2 with the EMX environment