From b9442ec18bbaf5544111cc0bb98f2eb50e58942b Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 31 Oct 2020 08:31:00 -0400 Subject: [PATCH] gdbsupport: replace AC_TRY_COMPILE in common.m4 ... with AC_COMPILE_IFELSE + AC_LANG_PROGRAM. All the changes in the generated configure files are insignificant whitespace changes. gdb/ChangeLog: * configure: Re-generate. gdbserver/ChangeLog: * configure: Re-generate. gdbsupport/ChangeLog: * common.m4: Replace AC_TRY_COMPILE with AC_COMPILE_IFELSE + AC_LANG_PROGRAM. * configure: Re-generate. Change-Id: Id58e6e887f6be817d52b189921845838031dbd2a --- gdb/ChangeLog | 4 ++++ gdb/configure | 11 +++++++---- gdbserver/ChangeLog | 4 ++++ gdbserver/configure | 11 +++++++---- gdbsupport/ChangeLog | 6 ++++++ gdbsupport/common.m4 | 19 ++++++++++++++----- gdbsupport/configure | 11 +++++++---- 7 files changed, 49 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d9484b71bc5..e3734cf564a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -10,6 +10,10 @@ * configure: Re-generate. +2020-10-31 Simon Marchi + + * configure: Re-generate. + 2020-10-31 Simon Marchi * acinclude.m4: Modernize. diff --git a/gdb/configure b/gdb/configure index 801e7a152e7..a08c8c57ae3 100755 --- a/gdb/configure +++ b/gdb/configure @@ -14232,13 +14232,14 @@ if ${gdb_cv_func_sigsetjmp+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - - #include - +#include int main () { -sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1); +sigjmp_buf env; + while (! sigsetjmp (env, 1)) + siglongjmp (env, 1); + ; return 0; } @@ -14247,8 +14248,10 @@ if ac_fn_c_try_compile "$LINENO"; then : gdb_cv_func_sigsetjmp=yes else gdb_cv_func_sigsetjmp=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_func_sigsetjmp" >&5 $as_echo "$gdb_cv_func_sigsetjmp" >&6; } diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 5da03da2868..505ad8ef9f6 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -10,6 +10,10 @@ * configure: Re-generate. +2020-10-31 Simon Marchi + + * configure: Re-generate. + 2020-10-31 Simon Marchi * configure.ac: Modernize. diff --git a/gdbserver/configure b/gdbserver/configure index 39ec4916df7..bd48d67973d 100755 --- a/gdbserver/configure +++ b/gdbserver/configure @@ -8029,13 +8029,14 @@ if ${gdb_cv_func_sigsetjmp+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - - #include - +#include int main () { -sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1); +sigjmp_buf env; + while (! sigsetjmp (env, 1)) + siglongjmp (env, 1); + ; return 0; } @@ -8044,8 +8045,10 @@ if ac_fn_c_try_compile "$LINENO"; then : gdb_cv_func_sigsetjmp=yes else gdb_cv_func_sigsetjmp=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_func_sigsetjmp" >&5 $as_echo "$gdb_cv_func_sigsetjmp" >&6; } diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index 2532a3973a7..3d673d481b9 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,3 +1,9 @@ +2020-10-31 Simon Marchi + + * common.m4: Replace AC_TRY_COMPILE with AC_COMPILE_IFELSE + + AC_LANG_PROGRAM. + * configure: Re-generate. + 2020-10-31 Simon Marchi * common.m4: Replace AC_FUNC_VFORK with AC_FUNC_FORK. diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4 index c265a9b9422..4d739380273 100644 --- a/gdbsupport/common.m4 +++ b/gdbsupport/common.m4 @@ -127,11 +127,20 @@ AC_DEFUN([GDB_AC_COMMON], [ dnl Check if sigsetjmp is available. Using AC_CHECK_FUNCS won't dnl do since sigsetjmp might only be defined as a macro. - AC_CACHE_CHECK([for sigsetjmp], gdb_cv_func_sigsetjmp, - [AC_TRY_COMPILE([ - #include - ], [sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1);], - gdb_cv_func_sigsetjmp=yes, gdb_cv_func_sigsetjmp=no)]) + AC_CACHE_CHECK( + [for sigsetjmp], + [gdb_cv_func_sigsetjmp], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include ], + [sigjmp_buf env; + while (! sigsetjmp (env, 1)) + siglongjmp (env, 1);] + )], + [gdb_cv_func_sigsetjmp=yes], + [gdb_cv_func_sigsetjmp=no] + )] + ) if test "$gdb_cv_func_sigsetjmp" = "yes"; then AC_DEFINE(HAVE_SIGSETJMP, 1, [Define if sigsetjmp is available. ]) fi diff --git a/gdbsupport/configure b/gdbsupport/configure index 1452b350ae3..9c5e59c5f10 100755 --- a/gdbsupport/configure +++ b/gdbsupport/configure @@ -9043,13 +9043,14 @@ if ${gdb_cv_func_sigsetjmp+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - - #include - +#include int main () { -sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1); +sigjmp_buf env; + while (! sigsetjmp (env, 1)) + siglongjmp (env, 1); + ; return 0; } @@ -9058,8 +9059,10 @@ if ac_fn_c_try_compile "$LINENO"; then : gdb_cv_func_sigsetjmp=yes else gdb_cv_func_sigsetjmp=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_func_sigsetjmp" >&5 $as_echo "$gdb_cv_func_sigsetjmp" >&6; } -- 2.30.2