From 006811bc02fe28060a8557b1f17a129440c975d4 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sun, 25 Oct 2020 21:08:49 -0400 Subject: 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 --- gdb/ChangeLog | 5 +++ gdb/acinclude.m4 | 2 +- gdb/ptrace.m4 | 90 ------------------------------------------------- gdbserver/ChangeLog | 4 +++ gdbserver/acinclude.m4 | 2 +- gdbsupport/ChangeLog | 6 ++++ gdbsupport/Makefile.in | 2 +- gdbsupport/acinclude.m4 | 2 +- gdbsupport/ptrace.m4 | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 109 insertions(+), 94 deletions(-) delete mode 100644 gdb/ptrace.m4 create mode 100644 gdbsupport/ptrace.m4 diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2606f87..d4d13c0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-10-25 Simon Marchi + + * acinclude.m4: Update ptrace.m4 path. + * ptrace.m4: Moved to gdbsupport. + 2020-10-24 Simon Marchi * symfile-mem.c (add_vsyscall_page): Use inferior parameter diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index 6fbc88b..9aa32e6 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 0fcd855..0000000 --- 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 . - -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 -#if HAVE_SYS_PTRACE_H -# include -#endif -#if HAVE_UNISTD_H -# include -#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 -]) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 74391ed..a7eebfd 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2020-10-25 Simon Marchi + + * acinclude.m4: Update ptrace.m4 path. + 2020-10-24 Simon Marchi * config.in: Re-generate. diff --git a/gdbserver/acinclude.m4 b/gdbserver/acinclude.m4 index a49be8d..f02a63c 100644 --- a/gdbserver/acinclude.m4 +++ b/gdbserver/acinclude.m4 @@ -27,7 +27,7 @@ dnl For libiberty_INIT. m4_include(../gdb/libiberty.m4) dnl For GDB_AC_PTRACE. -m4_include(../gdb/ptrace.m4) +m4_include(../gdbsupport/ptrace.m4) m4_include(../gdb/ax_cxx_compile_stdcxx.m4) diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index cd05d6a..759eea1 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,3 +1,9 @@ +2020-10-25 Simon Marchi + + * Makefile.in: Re-generate. + * acinclude.m4: Update ptrace.m4 path. + * ptrace.m4: Move here. + 2020-10-08 Andrew Burgess * tdesc.h (allocate_target_description): Update return type. diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in index 044ef15..ccfc27f 100644 --- a/gdbsupport/Makefile.in +++ b/gdbsupport/Makefile.in @@ -123,7 +123,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/codeset.m4 \ $(top_srcdir)/../config/ax_pthread.m4 \ $(top_srcdir)/../gdb/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/../gdb/libiberty.m4 $(top_srcdir)/selftest.m4 \ - $(top_srcdir)/../gdb/ptrace.m4 $(top_srcdir)/warning.m4 \ + $(top_srcdir)/ptrace.m4 $(top_srcdir)/warning.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/gdbsupport/acinclude.m4 b/gdbsupport/acinclude.m4 index 4c86c4f..cc9c2dc 100644 --- a/gdbsupport/acinclude.m4 +++ b/gdbsupport/acinclude.m4 @@ -4,7 +4,7 @@ m4_include([../config/ax_pthread.m4]) m4_include([../gdb/ax_cxx_compile_stdcxx.m4]) m4_include([../gdb/libiberty.m4]) m4_include([selftest.m4]) -m4_include([../gdb/ptrace.m4]) +m4_include([ptrace.m4]) dnl This gets AM_GDB_WARNINGS. m4_include(warning.m4) diff --git a/gdbsupport/ptrace.m4 b/gdbsupport/ptrace.m4 new file mode 100644 index 0000000..0fcd855 --- /dev/null +++ b/gdbsupport/ptrace.m4 @@ -0,0 +1,90 @@ +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 . + +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 +#if HAVE_SYS_PTRACE_H +# include +#endif +#if HAVE_UNISTD_H +# include +#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 +]) -- cgit v1.1