From 99c1d4518bf2ff230eaa6ee54c08e85f2d6c008e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 11 Nov 2013 07:35:57 -0700 Subject: [PATCH] fix "tkill" check An earlier patch removed the check for "syscall" since the results were not used in the C code. However, the result was used, via the cache variable, elsewhere in configure. This patch fixes the problem by checking for "syscall" at the point at which HAVE_TKILL_SYSCALL is defined. 2013-11-11 Tom Tromey * config.in, configure: Rebuild. * configure.ac (HAVE_TKILL_SYSCALL): Check for "syscall". --- gdb/ChangeLog | 5 +++++ gdb/configure | 7 ++++++- gdb/configure.ac | 6 ++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a47c14e6e56..c35ed65a834 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2013-11-11 Tom Tromey + + * config.in, configure: Rebuild. + * configure.ac (HAVE_TKILL_SYSCALL): Check for "syscall". + 2013-11-11 Joel Brobecker * remote-sim.c (gdbsim_detach): Break declaration into diff --git a/gdb/configure b/gdb/configure index 1728d091a1d..8b20a133a3b 100755 --- a/gdb/configure +++ b/gdb/configure @@ -12454,10 +12454,15 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_sys_syscall_h_has_tkill" >&5 $as_echo "$gdb_cv_sys_syscall_h_has_tkill" >&6; } fi -if test "x$gdb_cv_sys_syscall_h_has_tkill" = "xyes" && test "x$ac_cv_func_syscall" = "xyes"; then +if test "x$gdb_cv_sys_syscall_h_has_tkill" = "xyes"; then + ac_fn_c_check_func "$LINENO" "syscall" "ac_cv_func_syscall" +if test "x$ac_cv_func_syscall" = x""yes; then : $as_echo "#define HAVE_TKILL_SYSCALL 1" >>confdefs.h + +fi + fi ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include diff --git a/gdb/configure.ac b/gdb/configure.ac index 34908abdb30..88db73acad3 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1736,8 +1736,10 @@ if test "x$ac_cv_header_sys_syscall_h" = "xyes"; then ) fi dnl See if we can issue tkill syscall. -if test "x$gdb_cv_sys_syscall_h_has_tkill" = "xyes" && test "x$ac_cv_func_syscall" = "xyes"; then - AC_DEFINE(HAVE_TKILL_SYSCALL, 1, [Define if you support the tkill syscall.]) +if test "x$gdb_cv_sys_syscall_h_has_tkill" = "xyes"; then + AC_CHECK_FUNC(syscall, + AC_DEFINE(HAVE_TKILL_SYSCALL, 1, [Define if you support the tkill syscall.]) + ) fi dnl Check if we can disable the virtual address space randomization. -- 2.30.2