Skip to content

Commit 65d3eac

Browse files
committed
No longer needs sigsetjmp
Since signal handlers just set flag and return now, `sigsetjmp` and `siglongjmp` will not be needed.
1 parent 92f2cf1 commit 65d3eac

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

tool/m4/ruby_check_builtin_setjmp.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
2020
void (*volatile f)(void) = t;
2121
if (!jump()) printf("%d\n", f != 0);
2222
]])],
23-
[ac_cv_func___builtin_setjmp="yes with cast ($cast)"])
23+
[ac_cv_func___builtin_setjmp="yes${cast:+ with cast ($cast)}"])
2424
])
2525
test "$ac_cv_func___builtin_setjmp" = no || break
2626
done])

tool/m4/ruby_setjmp_type.m4

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@ AC_DEFUN([RUBY_SETJMP_TYPE], [
33
RUBY_CHECK_BUILTIN_SETJMP
44
RUBY_CHECK_SETJMP(_setjmpex, [], [@%:@include <setjmpex.h>])
55
RUBY_CHECK_SETJMP(_setjmp)
6-
RUBY_CHECK_SETJMP(sigsetjmp, [sigjmp_buf])
76
AC_MSG_CHECKING(for setjmp type)
87
setjmp_suffix=
9-
unset setjmp_sigmask
108
AC_ARG_WITH(setjmp-type,
11-
AS_HELP_STRING([--with-setjmp-type], [select setjmp type]),
9+
AS_HELP_STRING([--with-setjmp-type], [select setjmp type]),
1210
[
1311
AS_CASE([$withval],
1412
[__builtin_setjmp], [setjmp=__builtin_setjmp],
1513
[_setjmp], [ setjmp_prefix=_],
16-
[sigsetjmp,*], [ setjmp_prefix=sig setjmp_sigmask=`expr "$withval" : 'sigsetjmp\(,.*\)'`],
17-
[sigsetjmp], [ setjmp_prefix=sig],
14+
[sigsetjmp*], [ AC_MSG_WARN(No longer use sigsetjmp; use setjmp instead); setjmp_prefix=],
1815
[setjmp], [ setjmp_prefix=],
1916
[setjmpex], [ setjmp_prefix= setjmp_suffix=ex],
2017
[''], [ unset setjmp_prefix],
@@ -34,19 +31,13 @@ AS_IF([test ${setjmp_prefix+set}], [
3431
], [test "$ac_cv_func__setjmp" = yes], [
3532
setjmp_prefix=_
3633
setjmp_suffix=
37-
], [test "$ac_cv_func_sigsetjmp" = yes], [
38-
AS_CASE([$target_os],[solaris*|cygwin*],[setjmp_prefix=],[setjmp_prefix=sig])
39-
setjmp_suffix=
4034
], [
4135
setjmp_prefix=
4236
setjmp_suffix=
4337
])
44-
AS_IF([test x$setjmp_prefix:$setjmp_sigmask = xsig:], [
45-
setjmp_sigmask=,0
46-
])
47-
AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+\($setjmp_cast\)}${setjmp_sigmask})
48-
AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env)${setjmp_sigmask})])
38+
AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+\($setjmp_cast\)})
39+
AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env))])
4940
AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp($setjmp_cast(env),val)])
50-
AS_IF([test "(" "$GCC" != yes ")" -o x$setjmp_prefix != x__builtin_], AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf))
41+
AS_CASE(["$GCC:$setjmp_prefix"], [yes:__builtin_], [], AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, jmp_buf))
5142
AS_IF([test x$setjmp_suffix = xex], [AC_DEFINE_UNQUOTED(RUBY_USE_SETJMPEX, 1)])
5243
])dnl

0 commit comments

Comments
 (0)