From 442025fd9bd8c1a3ed85f7840ecac59d782df227 Mon Sep 17 00:00:00 2001
From: daney <daney@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 23 Jan 2006 18:21:07 +0000
Subject: [PATCH] * configure.host (disable_dladdr): Remove variable and
its documentation. * configure.ac: Do not test for disable_dladdr.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110137 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 7 +++++++
libjava/configure | 7 +------
libjava/configure.ac | 9 ++-------
libjava/configure.host | 4 ----
libjava/include/config.h.in | 3 ---
5 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 31f66e6a04da..cd1bbf954494 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 7fd9e7741594..daddd9d429cb 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 26a7ef5e2e92..d882e50f4b79 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 41429d3cd115..759001f0256f 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 990b88562fb0..6f74e321def2 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
--
GitLab