diff options
Diffstat (limited to 'gdb/gdbserver/configure')
| -rwxr-xr-x | gdb/gdbserver/configure | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 87dfda0..ccb9639 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -6442,7 +6442,20 @@ _ACEOF fi -ac_fn_c_check_type "$LINENO" "Elf32_auxv_t" "ac_cv_type_Elf32_auxv_t" "#include <elf.h> +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> " if test "x$ac_cv_type_Elf32_auxv_t" = x""yes; then : @@ -6465,6 +6478,7 @@ _ACEOF fi +esac |