diff options
38 files changed, 81 insertions, 35 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 57be707..f6898fc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,32 @@ 2015-07-24 Pedro Alves <palves@redhat.com> + * aarch64-linux-nat.c: Include nat/gdb_ptrace.h instead of + sys/ptrace.h. + * alpha-linux-nat.c: Likewise. + * amd64-linux-nat.c: Likewise. + * arm-linux-nat.c: Likewise. + * hppa-linux-nat.c: Likewise. + * i386-linux-nat.c: Likewise. + * ia64-linux-nat.c: Likewise. + * linux-fork.c: Likewise. + * linux-nat.c: Likewise. + * m32r-linux-nat.c: Likewise. + * m68klinux-nat.c: Likewise. + * mips-linux-nat.c: Likewise. + * nat/linux-btrace.c: Likewise. + * nat/linux-ptrace.c: Likewise. + * nat/linux-ptrace.h + * nat/mips-linux-watch.c: Likewise. + * nat/x86-linux-dregs.c: Likewise. + * ppc-linux-nat.c: Likewise. + * s390-linux-nat.c: Likewise. + * spu-linux-nat.c: Likewise. + * tilegx-linux-nat.c: Likewise. + * x86-linux-nat.c: Likewise. + * xtensa-linux-nat.c: Likewise. + +2015-07-24 Pedro Alves <palves@redhat.com> + * ptrace.m4 (ptrace tests): Test in C++ mode. Try with 'enum __ptrace_request as first parameter type instead of int. (PTRACE_TYPE_ARG1): Define. diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c index dae0c15..758b30f 100644 --- a/gdb/aarch64-linux-nat.c +++ b/gdb/aarch64-linux-nat.c @@ -35,7 +35,7 @@ #include "elf/external.h" #include "elf/common.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <sys/utsname.h> #include <asm/ptrace.h> diff --git a/gdb/alpha-linux-nat.c b/gdb/alpha-linux-nat.c index 52fbdad..f735ffc 100644 --- a/gdb/alpha-linux-nat.c +++ b/gdb/alpha-linux-nat.c @@ -23,7 +23,7 @@ #include "alpha-tdep.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <alpha/ptrace.h> #include <sys/procfs.h> diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c index 2e1b081..397f664 100644 --- a/gdb/amd64-linux-nat.c +++ b/gdb/amd64-linux-nat.c @@ -23,7 +23,7 @@ #include "regcache.h" #include "elf/common.h" #include <sys/uio.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <asm/prctl.h> #include <sys/reg.h> #include "gregset.h" diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c index f0ab98c..ff156d0 100644 --- a/gdb/arm-linux-nat.c +++ b/gdb/arm-linux-nat.c @@ -33,7 +33,7 @@ #include <elf/common.h> #include <sys/user.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <sys/utsname.h> #include <sys/procfs.h> diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 664f674..40826ed 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,20 @@ +2015-07-24 Pedro Alves <palves@redhat.c: Likewise.om> + + * linux-aarch64-low.c: Include nat/gdb_ptrace.h instead of + sys/ptrace.h. + * linux-arm-low.c: Likewise. + * linux-cris-low.c: Likewise. + * linux-crisv32-low.c: Likewise. + * linux-low.c: Likewise. + * linux-m68k-low.c: Likewise. + * linux-mips-low.c: Likewise. + * linux-nios2-low.c: Likewise. + * linux-s390-low.c: Likewise. + * linux-sparc-low.c: Likewise. + * linux-tic6x-low.c: Likewise. + * linux-tile-low.c: Likewise. + * linux-x86-low.c: Likewise. + 2015-07-24 Pedro Alves <palves@redhat.com> * config.in: Regenerate. diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index 79eb44c..3a47521 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -26,7 +26,7 @@ #include <signal.h> #include <sys/user.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <asm/ptrace.h> #include <sys/uio.h> diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c index dd77b48..14c96a3 100644 --- a/gdb/gdbserver/linux-arm-low.c +++ b/gdb/gdbserver/linux-arm-low.c @@ -24,7 +24,7 @@ #ifndef ELFMAG0 #include <elf.h> #endif -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <signal.h> /* Defined in auto-generated files. */ diff --git a/gdb/gdbserver/linux-cris-low.c b/gdb/gdbserver/linux-cris-low.c index 4e5e4c0..e0bfa1a 100644 --- a/gdb/gdbserver/linux-cris-low.c +++ b/gdb/gdbserver/linux-cris-low.c @@ -18,7 +18,7 @@ #include "server.h" #include "linux-low.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" /* Defined in auto-generated file reg-cris.c. */ void init_registers_cris (void); diff --git a/gdb/gdbserver/linux-crisv32-low.c b/gdb/gdbserver/linux-crisv32-low.c index 65e6c09..5120863 100644 --- a/gdb/gdbserver/linux-crisv32-low.c +++ b/gdb/gdbserver/linux-crisv32-low.c @@ -18,7 +18,7 @@ #include "server.h" #include "linux-low.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" /* Defined in auto-generated file reg-crisv32.c. */ void init_registers_crisv32 (void); diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 7b43187..9bc9fa3 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -26,7 +26,7 @@ #include "nat/linux-nat.h" #include "nat/linux-waitpid.h" #include "gdb_wait.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include "nat/linux-ptrace.h" #include "nat/linux-procfs.h" #include "nat/linux-personality.h" diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c index 4501904..39c9cc5 100644 --- a/gdb/gdbserver/linux-m68k-low.c +++ b/gdb/gdbserver/linux-m68k-low.c @@ -68,7 +68,7 @@ m68k_cannot_fetch_register (int regno) #ifdef HAVE_PTRACE_GETREGS #include <sys/procfs.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" static void m68k_fill_gregset (struct regcache *regcache, void *buf) diff --git a/gdb/gdbserver/linux-mips-low.c b/gdb/gdbserver/linux-mips-low.c index 1695c4c..d3b01d6 100644 --- a/gdb/gdbserver/linux-mips-low.c +++ b/gdb/gdbserver/linux-mips-low.c @@ -19,7 +19,7 @@ #include "server.h" #include "linux-low.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <endian.h> #include "nat/mips-linux-watch.h" diff --git a/gdb/gdbserver/linux-nios2-low.c b/gdb/gdbserver/linux-nios2-low.c index 7bd3c97..8a7ac28 100644 --- a/gdb/gdbserver/linux-nios2-low.c +++ b/gdb/gdbserver/linux-nios2-low.c @@ -22,7 +22,7 @@ #include "server.h" #include "linux-low.h" #include "elf/common.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <endian.h> #include "gdb_proc_service.h" #include <asm/ptrace.h> diff --git a/gdb/gdbserver/linux-s390-low.c b/gdb/gdbserver/linux-s390-low.c index 5d4ea1f..8a0a689 100644 --- a/gdb/gdbserver/linux-s390-low.c +++ b/gdb/gdbserver/linux-s390-low.c @@ -24,7 +24,7 @@ #include "elf/common.h" #include <asm/ptrace.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <sys/uio.h> #include <elf.h> diff --git a/gdb/gdbserver/linux-sparc-low.c b/gdb/gdbserver/linux-sparc-low.c index 8f5cdbf..796af8a 100644 --- a/gdb/gdbserver/linux-sparc-low.c +++ b/gdb/gdbserver/linux-sparc-low.c @@ -19,7 +19,7 @@ #include "server.h" #include "linux-low.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include "gdb_proc_service.h" diff --git a/gdb/gdbserver/linux-tic6x-low.c b/gdb/gdbserver/linux-tic6x-low.c index 0a0d220..a2ac3ee 100644 --- a/gdb/gdbserver/linux-tic6x-low.c +++ b/gdb/gdbserver/linux-tic6x-low.c @@ -22,7 +22,7 @@ #include "server.h" #include "linux-low.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <endian.h> #include "gdb_proc_service.h" diff --git a/gdb/gdbserver/linux-tile-low.c b/gdb/gdbserver/linux-tile-low.c index 2f72fdb..6aaea6a 100644 --- a/gdb/gdbserver/linux-tile-low.c +++ b/gdb/gdbserver/linux-tile-low.c @@ -21,7 +21,7 @@ #include "linux-low.h" #include <arch/abi.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" /* Defined in auto-generated file reg-tilegx.c. */ void init_registers_tilegx (void); diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c index 484eadb..ec2d906 100644 --- a/gdb/gdbserver/linux-x86-low.c +++ b/gdb/gdbserver/linux-x86-low.c @@ -25,6 +25,7 @@ #include "i387-fp.h" #include "x86-low.h" #include "x86-xstate.h" +#include "nat/gdb_ptrace.h" #include "gdb_proc_service.h" /* Don't include elf/common.h if linux/elf.h got included by @@ -117,7 +118,7 @@ static const char *xmltarget_amd64_linux_no_xml = "@<target>\ #include <sys/reg.h> #include <sys/procfs.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <sys/uio.h> #ifndef PTRACE_GET_THREAD_AREA diff --git a/gdb/hppa-linux-nat.c b/gdb/hppa-linux-nat.c index cfadf73..0694f61 100644 --- a/gdb/hppa-linux-nat.c +++ b/gdb/hppa-linux-nat.c @@ -25,7 +25,7 @@ #include "linux-nat.h" #include <sys/procfs.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <linux/version.h> #include <asm/ptrace.h> diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c index 349ce68..63d2648 100644 --- a/gdb/i386-linux-nat.c +++ b/gdb/i386-linux-nat.c @@ -22,7 +22,7 @@ #include "gdbcore.h" #include "regcache.h" #include "elf/common.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <sys/uio.h> #include "gregset.h" #include "gdb_proc_service.h" diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c index 31b3248..fc17d81 100644 --- a/gdb/ia64-linux-nat.c +++ b/gdb/ia64-linux-nat.c @@ -27,7 +27,7 @@ #include "linux-nat.h" #include <signal.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include "gdb_wait.h" #ifdef HAVE_SYS_REG_H #include <sys/reg.h> diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c index 27603b3..dbaa36e 100644 --- a/gdb/linux-fork.c +++ b/gdb/linux-fork.c @@ -30,7 +30,7 @@ #include "gdbthread.h" #include "source.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include "gdb_wait.h" #include <dirent.h> #include <ctype.h> diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index be429f8..e383d8a 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -28,7 +28,7 @@ #include <unistd.h> #include <sys/syscall.h> #endif -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include "linux-nat.h" #include "nat/linux-ptrace.h" #include "nat/linux-procfs.h" diff --git a/gdb/m32r-linux-nat.c b/gdb/m32r-linux-nat.c index e5e867b..781bb78 100644 --- a/gdb/m32r-linux-nat.c +++ b/gdb/m32r-linux-nat.c @@ -23,7 +23,7 @@ #include "regcache.h" #include "linux-nat.h" #include "target.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <sys/user.h> #include <sys/procfs.h> diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c index 8f89d7b..e6a4ad9 100644 --- a/gdb/m68klinux-nat.c +++ b/gdb/m68klinux-nat.c @@ -30,7 +30,7 @@ #include <sys/dir.h> #include <signal.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <sys/user.h> #include <sys/ioctl.h> #include <fcntl.h> diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c index a36bb63..961cb6f 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -32,7 +32,7 @@ #include "gregset.h" #include <sgidefs.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <asm/ptrace.h> #include "nat/mips-linux-watch.h" diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c index 63fcdc8..88ddc61 100644 --- a/gdb/nat/linux-btrace.c +++ b/gdb/nat/linux-btrace.c @@ -33,7 +33,7 @@ #include <unistd.h> #include <sys/mman.h> #include <sys/user.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <sys/types.h> #include <signal.h> #include <sys/utsname.h> diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c index 1a926f9..f097c8a 100644 --- a/gdb/nat/linux-ptrace.c +++ b/gdb/nat/linux-ptrace.c @@ -22,6 +22,7 @@ #include "linux-waitpid.h" #include "buffer.h" #include "gdb_wait.h" +#include "gdb_ptrace.h" /* Stores the ptrace options supported by the running kernel. A value of -1 means we did not check for features yet. A value diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h index be6c395..41f668c 100644 --- a/gdb/nat/linux-ptrace.h +++ b/gdb/nat/linux-ptrace.h @@ -20,7 +20,7 @@ struct buffer; -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #ifdef __UCLIBC__ #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__)) diff --git a/gdb/nat/mips-linux-watch.c b/gdb/nat/mips-linux-watch.c index 464f709..02d83f6 100644 --- a/gdb/nat/mips-linux-watch.c +++ b/gdb/nat/mips-linux-watch.c @@ -16,7 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "common-defs.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include "mips-linux-watch.h" /* Assuming usable watch registers REGS, return the irw_mask of diff --git a/gdb/nat/x86-linux-dregs.c b/gdb/nat/x86-linux-dregs.c index 9389803..666d86a 100644 --- a/gdb/nat/x86-linux-dregs.c +++ b/gdb/nat/x86-linux-dregs.c @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "common-defs.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <sys/user.h> #include "target/waitstatus.h" #include "nat/x86-linux.h" diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c index 4ed03d0..7514685 100644 --- a/gdb/ppc-linux-nat.c +++ b/gdb/ppc-linux-nat.c @@ -33,7 +33,7 @@ #include "gdb_wait.h" #include <fcntl.h> #include <sys/procfs.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" /* Prototypes for supply_gregset etc. */ #include "gregset.h" diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c index cedc505..94edce8 100644 --- a/gdb/s390-linux-nat.c +++ b/gdb/s390-linux-nat.c @@ -33,7 +33,7 @@ #include "elf/common.h" #include <asm/ptrace.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <asm/types.h> #include <sys/procfs.h> #include <sys/ucontext.h> diff --git a/gdb/spu-linux-nat.c b/gdb/spu-linux-nat.c index a043f53..cb182be 100644 --- a/gdb/spu-linux-nat.c +++ b/gdb/spu-linux-nat.c @@ -30,7 +30,7 @@ #include "gdbthread.h" #include "gdb_bfd.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <asm/ptrace.h> #include <sys/types.h> diff --git a/gdb/tilegx-linux-nat.c b/gdb/tilegx-linux-nat.c index b8f0c76..b9ce47a 100644 --- a/gdb/tilegx-linux-nat.c +++ b/gdb/tilegx-linux-nat.c @@ -23,7 +23,7 @@ #include "regcache.h" #include "linux-nat.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <sys/procfs.h> diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c index 04917d0..34a9257 100644 --- a/gdb/x86-linux-nat.c +++ b/gdb/x86-linux-nat.c @@ -21,7 +21,7 @@ #include "inferior.h" #include "elf/common.h" #include "gdb_proc_service.h" -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <sys/user.h> #include <sys/procfs.h> #include <sys/uio.h> diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c index fa62732..7f530ce 100644 --- a/gdb/xtensa-linux-nat.c +++ b/gdb/xtensa-linux-nat.c @@ -31,7 +31,7 @@ #include "gdb_wait.h" #include <fcntl.h> #include <sys/procfs.h> -#include <sys/ptrace.h> +#include "nat/gdb_ptrace.h" #include <asm/ptrace.h> #include "gregset.h" |