summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>2009-09-27 06:49:33 +0000
committerrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>2009-09-27 06:49:33 +0000
commit295fba81d7ad59f8f3a0e0ccb309b5d99046eadb (patch)
tree447040d312e28c4aba6b8805f1c6913013244950 /libjava
parentbdb4507a2e8c50385dea1bdd5a24812ed3691f73 (diff)
downloadgcc-295fba81d7ad59f8f3a0e0ccb309b5d99046eadb.tar.gz
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
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/Makefile.am2
-rw-r--r--libjava/Makefile.in2
3 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e8ad3b347ce..0a6c90260d5 100644
--- 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 e923fa30c5e..ad4fca2b6a8 100644
--- 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 83c4c606975..8c093738e34 100644
--- 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