diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-06-05 07:30:35 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-06-05 07:30:35 (GMT) |
| commit | 02f21e8bf37deaab1a836f4afd11c5fc8ee30220 (patch) | |
| tree | 14f8612734a1b2e44e50afc90e9a7651d2339cd5 /patches/gdb/8.0/200-allow-android.patch | |
| parent | ed1d2d6a0e826b172454bae988de79945a67fe24 (diff) | |
| parent | 6aaa2a1a67d2f105bac21750b02142201052393f (diff) | |
Merge pull request #734 from stilor/upgrades
Upgrades (a bunch of)
Diffstat (limited to 'patches/gdb/8.0/200-allow-android.patch')
| -rw-r--r-- | patches/gdb/8.0/200-allow-android.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/patches/gdb/8.0/200-allow-android.patch b/patches/gdb/8.0/200-allow-android.patch new file mode 100644 index 0000000..7954477 --- /dev/null +++ b/patches/gdb/8.0/200-allow-android.patch @@ -0,0 +1,42 @@ +diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure gdb-7.12.1/gdb/gdbserver/configure +--- gdb-7.12.1.orig/gdb/gdbserver/configure 2017-05-14 17:02:46.742711695 -0700 ++++ gdb-7.12.1/gdb/gdbserver/configure 2017-05-14 17:03:22.147058607 -0700 +@@ -6671,17 +6671,6 @@ fi + + + case "${target}" in +- *-android*) +- # Starting with NDK version 9, <elf.h> actually includes definitions +- # of Elf32_auxv_t and Elf64_auxv_t. But sadly, <elf.h> includes +- # <sys/exec_elf.h> which defines some of the ELF types incorrectly, +- # leading to conflicts with the defintions from <linux/elf.h>. +- # This makes it impossible for us to include both <elf.h> and +- # <linux/elf.h>, which means that, in practice, we do not have +- # access to Elf32_auxv_t and Elf64_auxv_t on this platform. +- # Therefore, do not try to auto-detect availability, as it would +- # get it wrong on this platform. +- ;; + *) + ac_fn_c_check_type "$LINENO" "Elf32_auxv_t" "ac_cv_type_Elf32_auxv_t" "#include <elf.h> + +diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure.ac gdb-7.12.1/gdb/gdbserver/configure.ac +--- gdb-7.12.1.orig/gdb/gdbserver/configure.ac 2017-05-14 17:02:46.742711695 -0700 ++++ gdb-7.12.1/gdb/gdbserver/configure.ac 2017-05-14 17:03:53.219361720 -0700 +@@ -179,17 +179,6 @@ AC_CHECK_TYPES(socklen_t, [], [], + ]) + + case "${target}" in +- *-android*) +- # Starting with NDK version 9, <elf.h> actually includes definitions +- # of Elf32_auxv_t and Elf64_auxv_t. But sadly, <elf.h> includes +- # <sys/exec_elf.h> which defines some of the ELF types incorrectly, +- # leading to conflicts with the defintions from <linux/elf.h>. +- # This makes it impossible for us to include both <elf.h> and +- # <linux/elf.h>, which means that, in practice, we do not have +- # access to Elf32_auxv_t and Elf64_auxv_t on this platform. +- # Therefore, do not try to auto-detect availability, as it would +- # get it wrong on this platform. +- ;; + *) + AC_CHECK_TYPES([Elf32_auxv_t, Elf64_auxv_t], [], [], + #include <elf.h> |