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

  New Revision: 47279

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

  Log:
    merge revision(s) r45885: [Backport #9818]
    
    * configure.in (RUBY_SETJMP_TYPE): check for setjmp type after
      CCDLFLAGS is appended to CFLAGS, since __builtin_setjmp can be
      affected.  [ruby-core:62469] [Bug #9818]

  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 47278)
+++ ruby_2_1/configure.in	(revision 47279)
@@ -2023,6 +2023,7 @@ AC_CACHE_CHECK(for sigsetjmp as a macro https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L2023
 	ac_cv_func_sigsetjmp=yes,
 	ac_cv_func_sigsetjmp=no)])
 
+AC_DEFUN(RUBY_CHECK_BUILTIN_SETJMP, [
 if test x"${ac_cv_func___builtin_setjmp}" = xyes; then
    unset ac_cv_func___builtin_setjmp
 fi
@@ -2044,10 +2045,13 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L2045
 	])
 	test "$ac_cv_func___builtin_setjmp" = no || break
     done])
+])
 
 # we don't use _setjmp if _longjmp doesn't exist.
 test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no
 
+AC_DEFUN(RUBY_SETJMP_TYPE, [
+RUBY_CHECK_BUILTIN_SETJMP
 AC_MSG_CHECKING(for setjmp type)
 setjmp_suffix=
 AC_ARG_WITH(setjmp-type,
@@ -2092,6 +2096,7 @@ AC_MSG_RESULT(${setjmp_prefix}setjmp${se https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L2096
 AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env)${setjmp_sigmask+,0})])
 AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp($setjmp_cast(env),val)])
 AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)
+])
 # End of setjmp check.
 
 AC_ARG_ENABLE(setreuid,
@@ -3369,6 +3374,7 @@ AC_SUBST(DTRACE_OBJ) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L3374
 AC_SUBST(DTRACE_GLOMMED_OBJ)
 AC_SUBST(LIBRUBY_A_OBJS)
 
+RUBY_SETJMP_TYPE
 }
 { # build section
 
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47278)
+++ ruby_2_1/ChangeLog	(revision 47279)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Aug 26 00:08:40 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (RUBY_SETJMP_TYPE): check for setjmp type after
+	  CCDLFLAGS is appended to CFLAGS, since __builtin_setjmp can be
+	  affected.  [ruby-core:62469] [Bug #9818]
+
 Tue Aug 26 00:07:20 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in: get rid of __builtin_setjmp/__builtin_longjmp on
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47278)
+++ ruby_2_1/version.h	(revision 47279)
@@ -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 212
+#define RUBY_PATCHLEVEL 213
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 8

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


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