From 5551b12c31a9de37316de9aa8174ad56645ac440 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 11 Oct 2012 16:43:47 +0000 Subject: [PATCH] configure.ac: Do not use dl_iterate_phdr on Solaris 10. * configure.ac: Do not use dl_iterate_phdr on Solaris 10. * configure: Rebuild. From-SVN: r192371 --- libbacktrace/ChangeLog | 5 +++++ libbacktrace/configure | 6 ++++++ libbacktrace/configure.ac | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index 5052cf436e3b..952c96fbfea5 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,3 +1,8 @@ +2012-10-11 Ian Lance Taylor + + * configure.ac: Do not use dl_iterate_phdr on Solaris 10. + * configure: Rebuild. + 2012-10-10 Ian Lance Taylor * elf.c: Rename all Elf typedefs to start with b_elf, and be all diff --git a/libbacktrace/configure b/libbacktrace/configure index 8d34856e693e..9a88e8e48e8b 100755 --- a/libbacktrace/configure +++ b/libbacktrace/configure @@ -12213,6 +12213,12 @@ else fi rm -f conftest* + case "${host}" in + *-*-solaris2.10*) + # Avoid dl_iterate_phdr on Solaris 10, where it is in the + # header file but is only in -ldl. + have_dl_iterate_phdr=no ;; + esac else ac_fn_c_check_func "$LINENO" "dl_iterate_phdr" "ac_cv_func_dl_iterate_phdr" if test "x$ac_cv_func_dl_iterate_phdr" = x""yes; then : diff --git a/libbacktrace/configure.ac b/libbacktrace/configure.ac index 083a086c85a3..9633afd5ac30 100644 --- a/libbacktrace/configure.ac +++ b/libbacktrace/configure.ac @@ -235,6 +235,12 @@ else # When built as a GCC target library, we can't do a link test. AC_EGREP_HEADER([dl_iterate_phdr], [link.h], [have_dl_iterate_phdr=yes], [have_dl_iterate_phdr=no]) + case "${host}" in + *-*-solaris2.10*) + # Avoid dl_iterate_phdr on Solaris 10, where it is in the + # header file but is only in -ldl. + have_dl_iterate_phdr=no ;; + esac else AC_CHECK_FUNC([dl_iterate_phdr], [have_dl_iterate_phdr=yes], [have_dl_iterate_phdr=no])