| 1 | diff -u -r ../gdb-7.8.1/gdb/gdbserver/linux-low.c ./gdb/gdbserver/linux-low.c |
| 2 | --- ../gdb-7.8.1/gdb/gdbserver/linux-low.c 2014-10-29 15:45:50.000000000 -0400 |
| 3 | +++ ./gdb/gdbserver/linux-low.c 2014-12-22 07:51:39.355702157 -0500 |
| 4 | @@ -47,6 +47,7 @@ |
| 5 | #include "filestuff.h" |
| 6 | #include "tracepoint.h" |
| 7 | #include "hostio.h" |
| 8 | +#include <linux/auxvec.h> /* For AT_PHDR and AT_PHNUM defines */ |
| 9 | #ifndef ELFMAG0 |
| 10 | /* Don't include <linux/elf.h> here. If it got included by gdb_proc_service.h |
| 11 | then ELFMAG0 will have been defined. If it didn't get included by |
| 12 | @@ -108,7 +109,6 @@ |
| 13 | # include "linux-btrace.h" |
| 14 | #endif |
| 15 | |
| 16 | -#ifndef HAVE_ELF32_AUXV_T |
| 17 | /* Copied from glibc's elf.h. */ |
| 18 | typedef struct |
| 19 | { |
| 20 | @@ -121,9 +121,7 @@ |
| 21 | on 64-bit platforms and vice versa. */ |
| 22 | } a_un; |
| 23 | } Elf32_auxv_t; |
| 24 | -#endif |
| 25 | |
| 26 | -#ifndef HAVE_ELF64_AUXV_T |
| 27 | /* Copied from glibc's elf.h. */ |
| 28 | typedef struct |
| 29 | { |
| 30 | @@ -136,7 +134,6 @@ |
| 31 | on 64-bit platforms and vice versa. */ |
| 32 | } a_un; |
| 33 | } Elf64_auxv_t; |
| 34 | -#endif |
| 35 | |
| 36 | /* A list of all unknown processes which receive stop signals. Some |
| 37 | other process will presumably claim each of these as forked |