From ad8d6dcb48a07caf7adb1dbc9df157149f0dee01 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 21 Mar 2021 14:27:23 +0900 Subject: Revert "merge revision(s) c32375883a696fcf8e9e99875f1339ee5474a255:" This reverts commit cfd1a17292ae37db4d09c1452a4a84e7fd58e7cf. --- tool/m4/ruby_check_builtin_setjmp.m4 | 8 ++++---- tool/m4/ruby_check_printf_prefix.m4 | 9 +++++---- tool/m4/ruby_check_setjmp.m4 | 6 +++--- tool/m4/ruby_check_sysconf.m4 | 6 +++--- tool/m4/ruby_cppoutfile.m4 | 4 ++-- tool/m4/ruby_decl_attribute.m4 | 4 ++-- tool/m4/ruby_dtrace_available.m4 | 2 +- tool/m4/ruby_dtrace_postprocess.m4 | 2 +- tool/m4/ruby_mingw32.m4 | 4 ++-- tool/m4/ruby_stack_grow_direction.m4 | 4 ++-- tool/m4/ruby_try_cflags.m4 | 2 +- tool/m4/ruby_try_ldflags.m4 | 2 +- 12 files changed, 27 insertions(+), 26 deletions(-) (limited to 'tool/m4') diff --git a/tool/m4/ruby_check_builtin_setjmp.m4 b/tool/m4/ruby_check_builtin_setjmp.m4 index 008fd45911..a4289e2e9d 100644 --- a/tool/m4/ruby_check_builtin_setjmp.m4 +++ b/tool/m4/ruby_check_builtin_setjmp.m4 @@ -8,18 +8,18 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp, ac_cv_func___builtin_setjmp=no for cast in "" "(void **)"; do RUBY_WERROR_FLAG( - [AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include + [AC_TRY_LINK([@%:@include @%:@include jmp_buf jb; @%:@ifdef NORETURN NORETURN(void t(void)); @%:@endif void t(void) {__builtin_longjmp($cast jb, 1);} - int jump(void) {(void)(__builtin_setjmp($cast jb) ? 1 : 0); return 0;}]], - [[ + int jump(void) {(void)(__builtin_setjmp($cast jb) ? 1 : 0); return 0;}], + [ void (*volatile f)(void) = t; if (!jump()) printf("%d\n", f != 0); - ]])], + ], [ac_cv_func___builtin_setjmp="yes with cast ($cast)"]) ]) test "$ac_cv_func___builtin_setjmp" = no || break diff --git a/tool/m4/ruby_check_printf_prefix.m4 b/tool/m4/ruby_check_printf_prefix.m4 index 0415f9fa92..9007c18c0a 100644 --- a/tool/m4/ruby_check_printf_prefix.m4 +++ b/tool/m4/ruby_check_printf_prefix.m4 @@ -4,7 +4,8 @@ AC_CACHE_CHECK([for printf prefix for $1], [rb_cv_pri_prefix_]AS_TR_SH($1),[ [rb_cv_pri_prefix_]AS_TR_SH($1)=[NONE] RUBY_WERROR_FLAG(RUBY_APPEND_OPTIONS(CFLAGS, $rb_cv_wsuppress_flags) for pri in $2; do - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include + AC_TRY_COMPILE( + [@%:@include @%:@include @%:@ifdef __GNUC__ @%:@if defined __MINGW_PRINTF_FORMAT @@ -17,9 +18,9 @@ AC_CACHE_CHECK([for printf prefix for $1], [rb_cv_pri_prefix_]AS_TR_SH($1),[ @%:@else @%:@define PRINTF_ARGS(decl, string_index, first_to_check) decl @%:@endif - PRINTF_ARGS(void test_sprintf(const char*, ...), 1, 2);]], - [[printf("%]${pri}[d", (]$1[)42); - test_sprintf("%]${pri}[d", (]$1[)42);]])], + PRINTF_ARGS(void test_sprintf(const char*, ...), 1, 2);], + [printf("%]${pri}[d", (]$1[)42); + test_sprintf("%]${pri}[d", (]$1[)42);], [rb_cv_pri_prefix_]AS_TR_SH($1)[=[$pri]; break]) done)]) AS_IF([test "[$rb_cv_pri_prefix_]AS_TR_SH($1)" != NONE], [ diff --git a/tool/m4/ruby_check_setjmp.m4 b/tool/m4/ruby_check_setjmp.m4 index 66652984ea..59f38581b8 100644 --- a/tool/m4/ruby_check_setjmp.m4 +++ b/tool/m4/ruby_check_setjmp.m4 @@ -2,14 +2,14 @@ # used for AC_ARG_WITH(setjmp-type) AC_DEFUN([RUBY_CHECK_SETJMP], [ AC_CACHE_CHECK([for ]$1[ as a macro or function], ac_cv_func_$1, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + [AC_TRY_COMPILE([ @%:@include ]AC_INCLUDES_DEFAULT([$3])[ @%:@define JMPARGS_1 env @%:@define JMPARGS_2 env,1 @%:@define JMPARGS JMPARGS_]m4_ifval($2,2,1)[ -]], - [m4_ifval($2,$2,jmp_buf)[ env; $1(JMPARGS);]])], +], + m4_ifval($2,$2,jmp_buf)[ env; $1(JMPARGS);], ac_cv_func_$1=yes, ac_cv_func_$1=no)] ) diff --git a/tool/m4/ruby_check_sysconf.m4 b/tool/m4/ruby_check_sysconf.m4 index 8324be6764..f6b247a16f 100644 --- a/tool/m4/ruby_check_sysconf.m4 +++ b/tool/m4/ruby_check_sysconf.m4 @@ -1,9 +1,9 @@ # -*- Autoconf -*- AC_DEFUN([RUBY_CHECK_SYSCONF], [dnl AC_CACHE_CHECK([whether _SC_$1 is supported], rb_cv_have_sc_[]m4_tolower($1), - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include - ]], - [[_SC_$1 >= 0]])], + [AC_TRY_COMPILE([#include + ], + [_SC_$1 >= 0], rb_cv_have_sc_[]m4_tolower($1)=yes, rb_cv_have_sc_[]m4_tolower($1)=no) ]) diff --git a/tool/m4/ruby_cppoutfile.m4 b/tool/m4/ruby_cppoutfile.m4 index 495ae0aae4..7c81c4f354 100644 --- a/tool/m4/ruby_cppoutfile.m4 +++ b/tool/m4/ruby_cppoutfile.m4 @@ -4,8 +4,8 @@ AC_DEFUN([RUBY_CPPOUTFILE], [save_CPPFLAGS="$CPPFLAGS" CPPFLAGS='-o conftest-1.i' rb_cv_cppoutfile=no -AC_PREPROC_IFELSE([AC_LANG_SOURCE([[test-for-cppout]])], - [grep test-for-cppout conftest-1.i > /dev/null && rb_cv_cppoutfile=yes]) +AC_TRY_CPP([test-for-cppout], + [grep test-for-cppout conftest-1.i > /dev/null && rb_cv_cppoutfile=yes]) CPPFLAGS="$save_CPPFLAGS" rm -f conftest*]) AS_IF([test "$rb_cv_cppoutfile" = yes], [ diff --git a/tool/m4/ruby_decl_attribute.m4 b/tool/m4/ruby_decl_attribute.m4 index 22358a079a..3187b9be60 100644 --- a/tool/m4/ruby_decl_attribute.m4 +++ b/tool/m4/ruby_decl_attribute.m4 @@ -21,7 +21,7 @@ for mac in \ "__declspec(attrib_code) x" \ x; do m4_ifval([$4],mac="$mac"${rbcv_cond+" /* only if $rbcv_cond */"}) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ + AC_TRY_COMPILE( m4_ifval([$4],${rbcv_cond+[@%:@if ]$rbcv_cond}) [@%:@define ]attrib[](attrib_params)[ $mac] m4_ifval([$4],${rbcv_cond+[@%:@else]} @@ -30,7 +30,7 @@ ${rbcv_cond+[@%:@endif]}) $6 @%:@define mesg ("") @%:@define san "address" - attrib[](attrib_params)[;]], [[]])], + attrib[](attrib_params)[;], [], [rbcv="$mac"; break]) done ])]) diff --git a/tool/m4/ruby_dtrace_available.m4 b/tool/m4/ruby_dtrace_available.m4 index babffaffac..79586d152c 100644 --- a/tool/m4/ruby_dtrace_available.m4 +++ b/tool/m4/ruby_dtrace_available.m4 @@ -7,7 +7,7 @@ AC_DEFUN([RUBY_DTRACE_AVAILABLE], AS_FOR(opt, rb_dtrace_opt, ["-xnolibs" ""], [dnl AS_IF([$DTRACE opt -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null], [], [continue]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include "conftest_provider.h"]], [[CONFTEST_FIRE();]])], + AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();], [], [continue]) # DTrace is available on the system rb_cv_dtrace_available=yes${rb_dtrace_opt:+"(opt)"} diff --git a/tool/m4/ruby_dtrace_postprocess.m4 b/tool/m4/ruby_dtrace_postprocess.m4 index 1cb651b481..9ef088b3f8 100644 --- a/tool/m4/ruby_dtrace_postprocess.m4 +++ b/tool/m4/ruby_dtrace_postprocess.m4 @@ -12,7 +12,7 @@ _PROBES $DTRACE ${DTRACE_OPT} -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null && : }], [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include "conftest_provider.h"]], [[CONFTEST_FIRE();]])],[ + AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();], [ AS_IF([{ cp -p conftest.${ac_objext} conftest.${ac_objext}.save && $DTRACE ${DTRACE_OPT} -G -s conftest_provider.d conftest.${ac_objext} 2>/dev/null && diff --git a/tool/m4/ruby_mingw32.m4 b/tool/m4/ruby_mingw32.m4 index 76b95f02a8..f44fe5575c 100644 --- a/tool/m4/ruby_mingw32.m4 +++ b/tool/m4/ruby_mingw32.m4 @@ -3,11 +3,11 @@ AC_DEFUN([RUBY_MINGW32], [AS_CASE(["$host_os"], [cygwin*], [ AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32, -[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ +[AC_TRY_CPP([ #ifndef __MINGW32__ # error #endif -]])],[rb_cv_mingw32=yes],[rb_cv_mingw32=no]) +], rb_cv_mingw32=yes,rb_cv_mingw32=no) rm -f conftest*]) AS_IF([test "$rb_cv_mingw32" = yes], [ target_os="mingw32" diff --git a/tool/m4/ruby_stack_grow_direction.m4 b/tool/m4/ruby_stack_grow_direction.m4 index f5f93579a4..74ec219322 100644 --- a/tool/m4/ruby_stack_grow_direction.m4 +++ b/tool/m4/ruby_stack_grow_direction.m4 @@ -6,7 +6,7 @@ AS_CASE(["$1"], [m68*|x86*|x64|i?86|ppc*|sparc*|alpha*], [ $2=-1], [hppa*], [ $2=+1], [ - AC_RUN_IFELSE([AC_LANG_SOURCE([[ + AC_TRY_RUN([ /* recurse to get rid of inlining */ static int stack_growup_p(addr, n) @@ -23,7 +23,7 @@ int main() int x; return stack_growup_p(&x, 10); } -]])],[$2=-1],[$2=+1],[$2=0]) +], $2=-1, $2=+1, $2=0) ]) eval stack_grow_dir=\$$2]) eval $2=\$stack_grow_dir diff --git a/tool/m4/ruby_try_cflags.m4 b/tool/m4/ruby_try_cflags.m4 index 8c9f22d50c..86ab80e1e6 100644 --- a/tool/m4/ruby_try_cflags.m4 +++ b/tool/m4/ruby_try_cflags.m4 @@ -3,7 +3,7 @@ AC_DEFUN([RUBY_TRY_CFLAGS], [ AC_MSG_CHECKING([whether ]$1[ is accepted as CFLAGS]) RUBY_WERROR_FLAG([ CFLAGS="[$]CFLAGS $1" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$4]], [[$5]])], + AC_TRY_COMPILE([$4], [$5], [$2 AC_MSG_RESULT(yes)], [$3 diff --git a/tool/m4/ruby_try_ldflags.m4 b/tool/m4/ruby_try_ldflags.m4 index d27940c7b2..b275107ed9 100644 --- a/tool/m4/ruby_try_ldflags.m4 +++ b/tool/m4/ruby_try_ldflags.m4 @@ -4,7 +4,7 @@ AC_DEFUN([RUBY_TRY_LDFLAGS], [ LDFLAGS="[$]LDFLAGS $1" AC_MSG_CHECKING([whether $1 is accepted as LDFLAGS]) RUBY_WERROR_FLAG([ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[$4]], [[$5]])], + AC_TRY_LINK([$4], [$5], [$2 AC_MSG_RESULT(yes)], [$3 -- cgit v1.2.3