diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 31f66e6a04dae5aa66d2bf0d5c09521f1bd223e8..cd1bbf954494e563cde1d990a94723e639c83998 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-23  David Daney  <ddaney@avtrex.com>
+
+	* configure.host (disable_dladdr): Remove variable and its
+	documentation.
+	* configure.ac: Do not test for disable_dladdr.
+	* configure: Regenerate.
+
 2006-01-18  Tom Tromey  <tromey@redhat.com>
 
 	* jni.cc (_Jv_JNI_AttachCurrentThread): Return environment if it
diff --git a/libjava/configure b/libjava/configure
index 7fd9e774159493b667af3ac32b43b2606dadd04c..daddd9d429cb6a2d32f999f92149be0946221970 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -9989,19 +9989,14 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dladdr" >&5
 echo "${ECHO_T}$ac_cv_lib_dl_dladdr" >&6
 if test $ac_cv_lib_dl_dladdr = yes; then
 
-     if test "x${disable_dladdr}" = "xyes"; then
-       #Broken dladdr().
-       true
-     else
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_DLADDR 1
 _ACEOF
 
-     fi
-
 fi
 
+
    if test x"$build" = x"$host"; then
      echo "$as_me:$LINENO: checking for /proc/self/exe" >&5
 echo $ECHO_N "checking for /proc/self/exe... $ECHO_C" >&6
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 26a7ef5e2e92cd2a865fb1ad5fe44cc951cf0a01..d882e50f4b79bda411282dfc5faae5dd5b5f8b97 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -901,13 +901,8 @@ else
    AC_CHECK_FUNCS(inet_aton inet_addr, break)
    AC_CHECK_HEADERS(execinfo.h unistd.h dlfcn.h) 
    AC_CHECK_LIB(dl, dladdr, [
-     if test "x${disable_dladdr}" = "xyes"; then
-       #Broken dladdr().
-       true
-     else
-       AC_DEFINE(HAVE_DLADDR, 1, [Define if you have dladdr()])
-     fi
-   ])
+       AC_DEFINE(HAVE_DLADDR, 1, [Define if you have dladdr()])])
+
    if test x"$build" = x"$host"; then
      AC_CHECK_FILES(/proc/self/exe, [
        AC_DEFINE(HAVE_PROC_SELF_EXE, 1, [Define if you have /proc/self/exe])])
diff --git a/libjava/configure.host b/libjava/configure.host
index 41429d3cd1153fb3b27f484d61b2d66db0bf42e8..759001f0256f41b0bc52e5e1af1b59126359589b 100644
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -28,8 +28,6 @@
 #			pthread_self calls by caching thread IDs in a hashtable
 #   can_unwind_signal   Set to "yes" if the EH unwinder supports throwing
 #			from a signal handler.
-#   disable_dladdr      Set to "yes" if dladdr should not be used
-#                       (i.e it is broken).
 #   fallback_backtrace_h  Header to use for fallback backtrace implementation
 #			  (only for targets that don't support DWARF2 unwind)
 #   descriptor_h	Header to use for looking past function descriptors
@@ -44,7 +42,6 @@ enable_hash_synchronization_default=no
 sysdeps_dir=generic
 slow_pthread_self=
 can_unwind_signal=no
-disable_dladdr=
 fallback_backtrace_h=sysdep/generic/backtrace.h
 
 case "${target_optspace}:${host}" in
@@ -251,7 +248,6 @@ EOF
 	case "${host}" in
 	    mipsel*-linux* | mipsisa32el*-linux*)
 		enable_hash_synchronization_default=yes
-		disable_dladdr=yes
 	    ;;
 	esac
 	;;
diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in
index 990b88562fb068235c84d4e6d7380e1c59969989..6f74e321def21c195e94cb7199c028fc91f46c90 100644
--- a/libjava/include/config.h.in
+++ b/libjava/include/config.h.in
@@ -49,9 +49,6 @@
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
 
-/* Define if your platform has a working backtrace() function. */
-#undef HAVE_BACKTRACE
-
 /* Define if Boehm GC in use. */
 #undef HAVE_BOEHM_GC