merge revision(s) r45537: [Backport ruby#9710]

nagachika · nagachika · commit 73ce2f3dfaa8 · 2014-08-25T15:07:33.000Z
* configure.in: get rid of __builtin_setjmp/__builtin_longjmp on x64-mingw, which causes SEGV with callcc. [ruby-core:61887] [Bug ruby#9710] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 26 00:07:20 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: get rid of __builtin_setjmp/__builtin_longjmp on
+	  x64-mingw, which causes SEGV with callcc.
+	  [ruby-core:61887] [Bug #9710]
+
 Tue Aug 26 00:06:05 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (ac_cv_func___builtin_setjmp): should not skip
diff --git a/configure.in b/configure.in
@@ -1047,6 +1047,7 @@ main()
                 ac_cv_func_clock_gettime=yes
                 ac_cv_func_clock_getres=yes
 		ac_cv_func_malloc_usable_size=no
+		{ test "$target_cpu" = x64 && ac_cv_func___builtin_setjmp=no; }
 		AC_CHECK_TYPE([NET_LUID], [], [],
 			      [@%:@include <windows.h>
 		  	      @%:@include <iphlpapi.h>])
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-08-26"
-#define RUBY_PATCHLEVEL 211
+#define RUBY_PATCHLEVEL 212
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 8

-Original file line number
+Diff line change
@@ @@ -1,3 +1,9 @@ @@
 +Tue Aug 26 00:07:20 2014  Nobuyoshi Nakada  <[email protected]>
++
 +	* configure.in: get rid of __builtin_setjmp/__builtin_longjmp on
 +	  x64-mingw, which causes SEGV with callcc.
 +	  [ruby-core:61887] [Bug #9710]
++
 Tue Aug 26 00:06:05 2014  Nobuyoshi Nakada  <[email protected]>
 	* configure.in (ac_cv_func___builtin_setjmp): should not skip