diff options
author | Simon Marchi <simon.marchi@polymtl.ca> | 2020-10-25 21:08:49 -0400 |
---|---|---|
committer | Simon Marchi <simon.marchi@polymtl.ca> | 2020-10-25 21:08:49 -0400 |
commit | 006811bc02fe28060a8557b1f17a129440c975d4 (patch) | |
tree | a4973393e9adf4452eafba5c7aac45fb61f2ce49 /gdb | |
parent | 02855c3a546243f4a0e48dc207ebb1f9e0e04545 (diff) | |
download | binutils-gdb-006811bc02fe28060a8557b1f17a129440c975d4.tar.gz |
gdb: move ptrace.m4 to gdbsupport
ptrace.m4, providing the GDB_AC_PTRACE autoconf macro, is used by gdb,
gdbserver and gdbsupport. I think it would make sense to move it to
gdbsupport.
gdb/ChangeLog:
* acinclude.m4: Update ptrace.m4 path.
* ptrace.m4: Moved to gdbsupport.
gdbserver/ChangeLog:
* acinclude.m4: Update ptrace.m4 path.
gdbsupport/ChangeLog:
* Makefile.in: Re-generate.
* acinclude.m4: Update ptrace.m4 path.
* ptrace.m4: Move here.
Change-Id: I849c149fd5dd8c3b2b0af38654fb353e3727871b
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/ChangeLog | 5 | ||||
-rw-r--r-- | gdb/acinclude.m4 | 2 | ||||
-rw-r--r-- | gdb/ptrace.m4 | 90 |
3 files changed, 6 insertions, 91 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2606f871170..d4d13c07b4c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-10-25 Simon Marchi <simon.marchi@polymtl.ca> + + * acinclude.m4: Update ptrace.m4 path. + * ptrace.m4: Moved to gdbsupport. + 2020-10-24 Simon Marchi <simon.marchi@polymtl.ca> * symfile-mem.c (add_vsyscall_page): Use inferior parameter diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index 6fbc88bb55c..9aa32e6d147 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -72,7 +72,7 @@ dnl For libiberty_INIT. m4_include(libiberty.m4) dnl For GDB_AC_PTRACE. -m4_include(ptrace.m4) +m4_include(../gdbsupport/ptrace.m4) m4_include(ax_cxx_compile_stdcxx.m4) diff --git a/gdb/ptrace.m4 b/gdb/ptrace.m4 deleted file mode 100644 index 0fcd855aa8f..00000000000 --- a/gdb/ptrace.m4 +++ /dev/null @@ -1,90 +0,0 @@ -dnl Copyright (C) 2012-2020 Free Software Foundation, Inc. -dnl -dnl This file is part of GDB. -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 3 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program. If not, see <http://www.gnu.org/licenses/>. - -dnl Check the return and argument types of ptrace. - -AC_DEFUN([GDB_AC_PTRACE], -[ - -AC_CHECK_HEADERS([sys/ptrace.h ptrace.h]) - -gdb_ptrace_headers=' -#include <sys/types.h> -#if HAVE_SYS_PTRACE_H -# include <sys/ptrace.h> -#endif -#if HAVE_UNISTD_H -# include <unistd.h> -#endif -' - -# Check return type. Varargs (used on GNU/Linux) conflict with the -# empty argument list, so check for that explicitly. -AC_CACHE_CHECK([return type of ptrace], gdb_cv_func_ptrace_ret, - AC_TRY_COMPILE($gdb_ptrace_headers, - [extern long ptrace (enum __ptrace_request, ...);], - gdb_cv_func_ptrace_ret='long', - AC_TRY_COMPILE($gdb_ptrace_headers, - [extern int ptrace ();], - gdb_cv_func_ptrace_ret='int', - gdb_cv_func_ptrace_ret='long'))) -AC_DEFINE_UNQUOTED(PTRACE_TYPE_RET, $gdb_cv_func_ptrace_ret, - [Define as the return type of ptrace.]) -# Check argument types. -AC_CACHE_CHECK([types of arguments for ptrace], gdb_cv_func_ptrace_args, [ - AC_TRY_COMPILE($gdb_ptrace_headers, - [extern long ptrace (enum __ptrace_request, ...);], - [gdb_cv_func_ptrace_args='enum __ptrace_request,int,long,long'],[ -for gdb_arg1 in 'int' 'long'; do - for gdb_arg2 in 'pid_t' 'int' 'long'; do - for gdb_arg3 in 'int *' 'caddr_t' 'int' 'long' 'void *'; do - for gdb_arg4 in 'int' 'long' 'void *'; do - AC_TRY_COMPILE($gdb_ptrace_headers, [ -extern $gdb_cv_func_ptrace_ret - ptrace ($gdb_arg1, $gdb_arg2, $gdb_arg3, $gdb_arg4); -], [gdb_cv_func_ptrace_args="$gdb_arg1,$gdb_arg2,$gdb_arg3,$gdb_arg4"; - break 4;]) - for gdb_arg5 in 'int *' 'int' 'long'; do - AC_TRY_COMPILE($gdb_ptrace_headers, [ -extern $gdb_cv_func_ptrace_ret - ptrace ($gdb_arg1, $gdb_arg2, $gdb_arg3, $gdb_arg4, $gdb_arg5); -], [ -gdb_cv_func_ptrace_args="$gdb_arg1,$gdb_arg2,$gdb_arg3,$gdb_arg4,$gdb_arg5"; - break 5;]) - done - done - done - done -done -# Provide a safe default value. -: ${gdb_cv_func_ptrace_args='int,int,long,long'} -])]) -ac_save_IFS=$IFS; IFS=',' -set dummy `echo "$gdb_cv_func_ptrace_args" | sed 's/\*/\*/g'` -IFS=$ac_save_IFS -shift -AC_DEFINE_UNQUOTED(PTRACE_TYPE_ARG1, $[1], - [Define to the type of arg 1 for ptrace.]) -AC_DEFINE_UNQUOTED(PTRACE_TYPE_ARG3, $[3], - [Define to the type of arg 3 for ptrace.]) -AC_DEFINE_UNQUOTED(PTRACE_TYPE_ARG4, $[4], - [Define to the type of arg 4 for ptrace.]) -if test -n "$[5]"; then - AC_DEFINE_UNQUOTED(PTRACE_TYPE_ARG5, $[5], - [Define to the type of arg 5 for ptrace.]) -fi -]) |