1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No longer needs sigsetjmp

Browse Source 
Since signal handlers just set flag and return now, `sigsetjmp` and
`siglongjmp` will not be needed.
This commit is contained in:
Nobuyoshi Nakada 2024-06-24 16:30:50 +09:00
parent 92f2cf1bf9
commit 65d3eacc80
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tool/m4/ruby_check_builtin_setjmp.m4
View File

@ -20,7 +20,7 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
void (*volatile f)(void) = t; void (*volatile f)(void) = t;
if (!jump()) printf("%d\n", f != 0); if (!jump()) printf("%d\n", f != 0);
]])], ]])],
[ac_cv_func___builtin_setjmp="yes with cast ($cast)"]) [ac_cv_func___builtin_setjmp="yes${cast:+ with cast ($cast)}"])
]) ])
test "$ac_cv_func___builtin_setjmp" = no || break test "$ac_cv_func___builtin_setjmp" = no || break
done]) done])

19
tool/m4/ruby_setjmp_type.m4
View File

@ -3,18 +3,15 @@ AC_DEFUN([RUBY_SETJMP_TYPE], [
RUBY_CHECK_BUILTIN_SETJMP RUBY_CHECK_BUILTIN_SETJMP
RUBY_CHECK_SETJMP(_setjmpex, [], [@%:@include <setjmpex.h>]) RUBY_CHECK_SETJMP(_setjmpex, [], [@%:@include <setjmpex.h>])
RUBY_CHECK_SETJMP(_setjmp) RUBY_CHECK_SETJMP(_setjmp)
RUBY_CHECK_SETJMP(sigsetjmp, [sigjmp_buf])
AC_MSG_CHECKING(for setjmp type) AC_MSG_CHECKING(for setjmp type)
setjmp_suffix= setjmp_suffix=
unset setjmp_sigmask
AC_ARG_WITH(setjmp-type, AC_ARG_WITH(setjmp-type,
AS_HELP_STRING([--with-setjmp-type], [select setjmp type]), AS_HELP_STRING([--with-setjmp-type], [select setjmp type]),
[ [
AS_CASE([$withval], AS_CASE([$withval],
[__builtin_setjmp], [setjmp=__builtin_setjmp], [__builtin_setjmp], [setjmp=__builtin_setjmp],
[_setjmp], [ setjmp_prefix=_], [_setjmp], [ setjmp_prefix=_],
[sigsetjmp,*], [ setjmp_prefix=sig setjmp_sigmask=`expr "$withval" : 'sigsetjmp\(,.*\)'`], [sigsetjmp*], [ AC_MSG_WARN(No longer use sigsetjmp; use setjmp instead); setjmp_prefix=],
[sigsetjmp], [ setjmp_prefix=sig],
[setjmp], [ setjmp_prefix=], [setjmp], [ setjmp_prefix=],
[setjmpex], [ setjmp_prefix= setjmp_suffix=ex], [setjmpex], [ setjmp_prefix= setjmp_suffix=ex],
[''], [ unset setjmp_prefix], [''], [ unset setjmp_prefix],
@ -34,19 +31,13 @@ AS_IF([test ${setjmp_prefix+set}], [
], [test "$ac_cv_func__setjmp" = yes], [ ], [test "$ac_cv_func__setjmp" = yes], [
setjmp_prefix=_ setjmp_prefix=_
setjmp_suffix= setjmp_suffix=
], [test "$ac_cv_func_sigsetjmp" = yes], [
AS_CASE([$target_os],[solaris*|cygwin*],[setjmp_prefix=],[setjmp_prefix=sig])
setjmp_suffix=
], [ ], [
setjmp_prefix= setjmp_prefix=
setjmp_suffix= setjmp_suffix=
]) ])
AS_IF([test x$setjmp_prefix:$setjmp_sigmask = xsig:], [ AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+\($setjmp_cast\)})
setjmp_sigmask=,0 AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env))])
])
AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+\($setjmp_cast\)}${setjmp_sigmask})
AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env)${setjmp_sigmask})])
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)])
AS_IF([test "(" "$GCC" != yes ")" -o x$setjmp_prefix != x__builtin_], AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)) AS_CASE(["$GCC:$setjmp_prefix"], [yes:__builtin_], [], AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, jmp_buf))
AS_IF([test x$setjmp_suffix = xex], [AC_DEFINE_UNQUOTED(RUBY_USE_SETJMPEX, 1)]) AS_IF([test x$setjmp_suffix = xex], [AC_DEFINE_UNQUOTED(RUBY_USE_SETJMPEX, 1)])
])dnl ])dnl