gdb/

	* configure.ac: Always set RDYNAMIC at least as `-rdynamic'.
	* configure: Regenerate.

1 files changed, 34 insertions, 56 deletions

diff --git a/gdb/configure b/gdb/configure
index 7f9c51a..f557aa1 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -14186,20 +14186,19 @@ $as_echo "$gdb_cv_bigtoc" >&6; }
   ;;
 esac
 
-if test "${gdb_native}" = yes; then
-   if test "$GCC" = "yes" ; then
-      # The dynamically loaded libthread_db needs access to symbols in the gdb
-      # executable.  Older GNU ld supports --export-dynamic but --dynamic-list
-      # may not be supported there.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the dynamic export flag" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the dynamic export flag" >&5
 $as_echo_n "checking for the dynamic export flag... " >&6; }
-      old_LDFLAGS="$LDFLAGS"
-      # Older GNU ld supports --export-dynamic but --dynamic-list it does not.
-      RDYNAMIC="-Wl,--dynamic-list=${srcdir}/proc-service.list"
-      LDFLAGS="$LDFLAGS $RDYNAMIC"
-      dynamic_list=false
-      if test "${have_libpython}" = no; then
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+dynamic_list=false
+if test "${gdb_native}" = yes; then
+   # The dynamically loaded libthread_db needs access to symbols in the gdb
+   # executable.  Older GNU ld supports --export-dynamic but --dynamic-list
+   # may not be supported there.
+   old_LDFLAGS="$LDFLAGS"
+   # Older GNU ld supports --export-dynamic but --dynamic-list it does not.
+   RDYNAMIC="-Wl,--dynamic-list=${srcdir}/proc-service.list"
+   LDFLAGS="$LDFLAGS $RDYNAMIC"
+   if test "${have_libpython}" = no; then
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -14215,14 +14214,14 @@ if ac_fn_c_try_link "$LINENO"; then :
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-      else
-	# Workaround http://bugs.python.org/issue4434 where static
-	# libpythonX.Y.a would get its symbols required for
-	# pythonX.Y/lib-dynload/*.so modules hidden by -Wl,--dynamic-list.
-	# Problem does not happen for the recommended libpythonX.Y.so linkage.
-	old_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $PYTHON_CFLAGS"
-	if test "$cross_compiling" = yes; then :
+   else
+     # Workaround http://bugs.python.org/issue4434 where static
+     # libpythonX.Y.a would get its symbols required for
+     # pythonX.Y/lib-dynload/*.so modules hidden by -Wl,--dynamic-list.
+     # Problem does not happen for the recommended libpythonX.Y.so linkage.
+     old_CFLAGS="$CFLAGS"
+     CFLAGS="$CFLAGS $PYTHON_CFLAGS"
+     if test "$cross_compiling" = yes; then :
   true
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14232,10 +14231,10 @@ int
 main ()
 {
 int err;
-	     Py_Initialize ();
-	     err = PyRun_SimpleString ("import itertools\n");
-	     Py_Finalize ();
-	     return err == 0 ? 0 : 1;
+          Py_Initialize ();
+          err = PyRun_SimpleString ("import itertools\n");
+          Py_Finalize ();
+          return err == 0 ? 0 : 1;
   ;
   return 0;
 }
@@ -14247,41 +14246,20 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-	CFLAGS="$old_CFLAGS"
-      fi
-      if $dynamic_list;then
-	found="-Wl,--dynamic-list"
-	RDYNAMIC='-Wl,--dynamic-list=$(srcdir)/proc-service.list'
-      else
-	RDYNAMIC="-rdynamic"
-	LDFLAGS="$old_LDFLAGS $RDYNAMIC"
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  found="-rdynamic"
+     CFLAGS="$old_CFLAGS"
+   fi
+   LDFLAGS="$old_LDFLAGS"
+fi
+if $dynamic_list; then
+  found="-Wl,--dynamic-list"
+  RDYNAMIC='-Wl,--dynamic-list=$(srcdir)/proc-service.list'
 else
-  found="no"
-		     # Error on its usage by .mh file.
-		     RDYNAMIC="no-rdynamic-available"
+  found="-rdynamic"
+  RDYNAMIC="-rdynamic"
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-      fi
 
-      LDFLAGS="$old_LDFLAGS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found" >&5
 $as_echo "$found" >&6; }
-   fi
-fi
 
 
 if test ${build} = ${host} -a ${host} = ${target} ; then