Fix library dependencies for -Wl,--as-needed.

gcc/:
	PR bootstrap/40928
	* configure.ac: Use $LIBS for '-ldl', not $LDFLAGS.
	* configure: Regenerate.

libjava/:
	PR libgcj/38298
	* Makefile.am (libgcj_tools_la_LIBADD): Add '-lm'.
	* Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@152215 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0bbadeb..ccad7ca 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       PR bootstrap/40928
+       * configure.ac: Use $LIBS for '-ldl', not $LDFLAGS.
+       * configure: Regenerate.
+
 2009-09-26  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * doc/install.texi: Update minimum MPC version to 0.7.

diff --git a/gcc/configure b/gcc/configure
index ced17cd..dbd10a5 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -24952,7 +24952,7 @@ rm -f core conftest.err conftest.$ac_objext \
   fi
 
   # Check -ldl
-  LDFLAGS="$LDFLAGS -ldl"
+  LIBS="$LIBS -ldl"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ldl" >&5
 $as_echo_n "checking for -ldl... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 3f0ff7d..96b3b5d 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -4228,7 +4228,7 @@ if test x"$enable_plugin" = x"yes"; then
   fi
 
   # Check -ldl
-  LDFLAGS="$LDFLAGS -ldl"
+  LIBS="$LIBS -ldl"
   AC_MSG_CHECKING([for -ldl])
   AC_TRY_LINK(
     [#include <dlfcn.h>],

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e8ad3b3..0a6c902 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       PR libgcj/38298
+       * Makefile.am (libgcj_tools_la_LIBADD): Add '-lm'.
+       * Makefile.in: Regenerate.
+
 2009-09-22  Dave Korn  <dave.korn.cygwin@gmail.com>
 
        * configure.host (enable_libgcj_sublibs_default): New variable,

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index e923fa3..ad4fca2 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -496,7 +496,7 @@ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \
 libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
  -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
  $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) -no-undefined -bindir $(bindir)
-libgcj_tools_la_LIBADD = libgcj.la
+libgcj_tools_la_LIBADD = libgcj.la -lm
 libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec
 if BUILD_SUBLIBS
 libgcj_tools_la_DEPENDENCIES += libgcj-noncore.la

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 83c4c60..8c09373 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -1187,7 +1187,7 @@ libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
  -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
  $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) -no-undefined -bindir $(bindir)
 
-libgcj_tools_la_LIBADD = libgcj.la
+libgcj_tools_la_LIBADD = libgcj.la -lm
 libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_22)
 libgcj_tools_la_LINK = $(LIBLINK) $(libgcj_tools_la_LDFLAGS)
 libjvm_la_SOURCES = jni-libjvm.cc