From bade2a2d38ed2a6219c4ee5d513231bfab6e1f03 Mon Sep 17 00:00:00 2001
From: kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 3 Jan 2012 02:37:28 +0000
Subject: [PATCH] merge revision(s) 33577:

	* configure.in: check -fno-omit-frame-pointer acceptance and usage
	  under MinGW. [ruby-core:39957] [Bug #5407]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 5 +++++
 configure.in | 6 ++++++
 version.h    | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 444eb83422..2cadac3113 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan  2 21:36:56 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* configure.in: check -fno-omit-frame-pointer acceptance and usage
+	  under MinGW. [ruby-core:39957] [Bug #5407]
+
 Mon Jan  2 20:05:10 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* include/ruby/ruby.h (SIZE_MAX): define SIZE_MAX if not defined.
diff --git a/configure.in b/configure.in
index b6c93ef31b..6bcd1e9a74 100644
--- a/configure.in
+++ b/configure.in
@@ -503,6 +503,12 @@ if test "$GCC" = yes; then
     test "$visibility_option" = no || OBJCOPY=:
 fi
 
+if test "$GCC" = yes; then
+    AS_CASE(["$target_os"], [mingw*], [
+	RUBY_TRY_CFLAGS(-fno-omit-frame-pointer, [optflags="${optflags+$optflags }-fno-omit-frame-pointer"])
+    ])
+fi
+
 test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
 test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
 
diff --git a/version.h b/version.h
index 9b1f063be3..0a32b802ab 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 12
+#define RUBY_PATCHLEVEL 13
 
 #define RUBY_RELEASE_DATE "2012-01-03"
 #define RUBY_RELEASE_YEAR 2012