nagachika	2014-08-26 00:07:33 +0900 (Tue, 26 Aug 2014)

  New Revision: 47278

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47278

  Log:
    merge revision(s) r45537: [Backport #9710]
    
    * configure.in: get rid of __builtin_setjmp/__builtin_longjmp on
      x64-mingw, which causes SEGV with callcc.
      [ruby-core:61887] [Bug #9710]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 47277)
+++ ruby_2_1/configure.in	(revision 47278)
@@ -1047,6 +1047,7 @@ main() https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L1047
                 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>])
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47277)
+++ ruby_2_1/ChangeLog	(revision 47278)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Aug 26 00:07:20 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* configure.in (ac_cv_func___builtin_setjmp): should not skip
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47277)
+++ ruby_2_1/version.h	(revision 47278)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #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

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45537


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/