@@ -3,18 +3,15 @@ AC_DEFUN([RUBY_SETJMP_TYPE], [
3
3
RUBY_CHECK_BUILTIN_SETJMP
4
4
RUBY_CHECK_SETJMP(_setjmpex, [ ] , [ @%:@ include <setjmpex.h>] )
5
5
RUBY_CHECK_SETJMP(_setjmp)
6
- RUBY_CHECK_SETJMP(sigsetjmp, [ sigjmp_buf] )
7
6
AC_MSG_CHECKING ( for setjmp type )
8
7
setjmp_suffix=
9
- unset setjmp_sigmask
10
8
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] ) ,
12
10
[
13
11
AS_CASE ( [ $withval] ,
14
12
[ __builtin_setjmp] , [ setjmp=__builtin_setjmp] ,
15
13
[ _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=] ,
18
15
[ setjmp] , [ setjmp_prefix=] ,
19
16
[ setjmpex] , [ setjmp_prefix= setjmp_suffix=ex] ,
20
17
[ ''] , [ unset setjmp_prefix] ,
@@ -34,19 +31,13 @@ AS_IF([test ${setjmp_prefix+set}], [
34
31
] , [ test "$ac_cv_func__setjmp" = yes] , [
35
32
setjmp_prefix=_
36
33
setjmp_suffix=
37
- ] , [ test "$ac_cv_func_sigsetjmp" = yes] , [
38
- AS_CASE ( [ $target_os] ,[ solaris*|cygwin*] ,[ setjmp_prefix=] ,[ setjmp_prefix=sig] )
39
- setjmp_suffix=
40
34
] , [
41
35
setjmp_prefix=
42
36
setjmp_suffix=
43
37
] )
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))] )
49
40
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 ) )
51
42
AS_IF ( [ test x$setjmp_suffix = xex] , [ AC_DEFINE_UNQUOTED ( RUBY_USE_SETJMPEX , 1 ) ] )
52
43
] ) dnl
0 commit comments