archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-24 21:44:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) r45885: [Backport #9818]

Browse source 
* 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-08-25 15:08:46 +00:00
parent c901347d1d
commit a1f28fb554
3 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Aug 26 00:08:40 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@ruby-lang.org> Tue Aug 26 00:07:20 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: get rid of __builtin_setjmp/__builtin_longjmp on * configure.in: get rid of __builtin_setjmp/__builtin_longjmp on

6
configure.in
View file

@ -2023,6 +2023,7 @@ AC_CACHE_CHECK(for sigsetjmp as a macro or function, ac_cv_func_sigsetjmp,
ac_cv_func_sigsetjmp=yes, ac_cv_func_sigsetjmp=yes,
ac_cv_func_sigsetjmp=no)]) ac_cv_func_sigsetjmp=no)])
AC_DEFUN(RUBY_CHECK_BUILTIN_SETJMP, [
if test x"${ac_cv_func___builtin_setjmp}" = xyes; then if test x"${ac_cv_func___builtin_setjmp}" = xyes; then
unset ac_cv_func___builtin_setjmp unset ac_cv_func___builtin_setjmp
fi fi
@ -2044,10 +2045,13 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
]) ])
test "$ac_cv_func___builtin_setjmp" = no || break test "$ac_cv_func___builtin_setjmp" = no || break
done]) done])
])
# we don't use _setjmp if _longjmp doesn't exist. # we don't use _setjmp if _longjmp doesn't exist.
test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no 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) AC_MSG_CHECKING(for setjmp type)
setjmp_suffix= setjmp_suffix=
AC_ARG_WITH(setjmp-type, AC_ARG_WITH(setjmp-type,
@ -2092,6 +2096,7 @@ AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+($setjmp_cast
AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env)${setjmp_sigmask+,0})]) 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_LONGJMP(env,val)], [${setjmp_prefix}longjmp($setjmp_cast(env),val)])
AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf) AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)
])
# End of setjmp check. # End of setjmp check.
AC_ARG_ENABLE(setreuid, AC_ARG_ENABLE(setreuid,
@ -3369,6 +3374,7 @@ AC_SUBST(DTRACE_OBJ)
AC_SUBST(DTRACE_GLOMMED_OBJ) AC_SUBST(DTRACE_GLOMMED_OBJ)
AC_SUBST(LIBRUBY_A_OBJS) AC_SUBST(LIBRUBY_A_OBJS)
RUBY_SETJMP_TYPE
} }
{ # build section { # build section

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.2" #define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-08-26" #define RUBY_RELEASE_DATE "2014-08-26"
#define RUBY_PATCHLEVEL 212 #define RUBY_PATCHLEVEL 213
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 8 #define RUBY_RELEASE_MONTH 8