diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index 5052cf436e3b610b097f322d711e63437906a823..952c96fbfea5156d40e1dba87b2d3d2d1ec88241 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-11  Ian Lance Taylor  <iant@google.com>
+
+	* configure.ac: Do not use dl_iterate_phdr on Solaris 10.
+	* configure: Rebuild.
+
 2012-10-10  Ian Lance Taylor  <iant@google.com>
 
 	* elf.c: Rename all Elf typedefs to start with b_elf, and be all
diff --git a/libbacktrace/configure b/libbacktrace/configure
index 8d34856e693edcdd196a15931a97c0e95096b192..9a88e8e48e8b31010b2c0ba31d7b4004807e46ad 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 083a086c85a35fae5241594b56bc3a6c484ec648..9633afd5ac305c6fb952c3031cb820e55f5598d8 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])