From 25c51f71d5bef8b4b71aa3e35cce974b54cda731 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 14 Jan 2020 16:16:39 -0700 Subject: [PATCH] Fix indentation in common.m4 Simon pointed out that the indentation in common.m4 is off. This patch fixes the problem. gdb/ChangeLog 2020-01-14 Tom Tromey * configure: Rebuild. * gdbsupport/common.m4 (GDB_AC_COMMON): Fix indentation. gdb/gdbserver/ChangeLog 2020-01-14 Tom Tromey * configure: Rebuild. Change-Id: I6a629bd5873cca95ba3e17656f0d0ce583a08361 --- gdb/ChangeLog | 5 +++++ gdb/configure | 8 ++++---- gdb/gdbserver/ChangeLog | 4 ++++ gdb/gdbserver/configure | 8 ++++---- gdb/gdbsupport/common.m4 | 16 ++++++++-------- 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3f9a6ca550..c3a910d2a7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-01-14 Tom Tromey + + * configure: Rebuild. + * gdbsupport/common.m4 (GDB_AC_COMMON): Fix indentation. + 2020-01-14 Bernd Edlinger * skip.c (skip_function_command): Make skip w/o arguments use the diff --git a/gdb/configure b/gdb/configure index aa53c097ca..f9aed98699 100755 --- a/gdb/configure +++ b/gdb/configure @@ -14351,7 +14351,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigsetjmp" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigsetjmp" >&5 $as_echo_n "checking for sigsetjmp... " >&6; } if ${gdb_cv_func_sigsetjmp+:} false; then : $as_echo_n "(cached) " >&6 @@ -14359,7 +14359,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + #include int main () @@ -14378,11 +14378,11 @@ 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; } -if test "$gdb_cv_func_sigsetjmp" = "yes"; then + if test "$gdb_cv_func_sigsetjmp" = "yes"; then $as_echo "#define HAVE_SIGSETJMP 1" >>confdefs.h -fi + fi # Check the return and argument types of ptrace. diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index fe8b392981..0010e273ae 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2020-01-14 Tom Tromey + + * configure: Rebuild. + 2020-01-13 Simon Marchi * Makefile.in (%-generated.c): Remove rule for files from diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index f70b3d5521..9d262bf58c 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -7743,7 +7743,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigsetjmp" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigsetjmp" >&5 $as_echo_n "checking for sigsetjmp... " >&6; } if ${gdb_cv_func_sigsetjmp+:} false; then : $as_echo_n "(cached) " >&6 @@ -7751,7 +7751,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + #include int main () @@ -7770,11 +7770,11 @@ 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; } -if test "$gdb_cv_func_sigsetjmp" = "yes"; then + if test "$gdb_cv_func_sigsetjmp" = "yes"; then $as_echo "#define HAVE_SIGSETJMP 1" >>confdefs.h -fi + fi # Check the return and argument types of ptrace. diff --git a/gdb/gdbsupport/common.m4 b/gdb/gdbsupport/common.m4 index c36d84a42b..f070de379e 100644 --- a/gdb/gdbsupport/common.m4 +++ b/gdb/gdbsupport/common.m4 @@ -70,12 +70,12 @@ 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)]) -if test "$gdb_cv_func_sigsetjmp" = "yes"; then - AC_DEFINE(HAVE_SIGSETJMP, 1, [Define if sigsetjmp is available. ]) -fi + 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)]) + if test "$gdb_cv_func_sigsetjmp" = "yes"; then + AC_DEFINE(HAVE_SIGSETJMP, 1, [Define if sigsetjmp is available. ]) + fi ]) -- 2.34.1