From 9e00cf2f68cda966e2619af9d7eb61e51ce97f55 Mon Sep 17 00:00:00 2001
From: geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 1 Sep 2006 19:52:10 +0000
Subject: [PATCH] * testsuite/libjava.jni/jni.exp
(gcj_jni_invocation_test_one): Pass -lgcj to linker for C++ files on
Darwin.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116639 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 5 +++++
libjava/testsuite/libjava.jni/jni.exp | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b19398e24196..9a949d0d0913 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-01 Geoffrey Keating <geoffk@apple.com>
+
+ * testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one):
+ Pass -lgcj to linker for C++ files on Darwin.
+
2006-09-01 Keith Seitz <keiths@redhat.com>
* jvmti.cc (THREAD_DEFAULT_TO_CURRENT): Encapsulate in do..while loop.
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index 0ed8a5aaba28..317c5ae57e51 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -257,8 +257,9 @@ proc gcj_jni_invocation_test_one {file} {
# find the libgcc used by libffi.dylib. We could pass the
# -dylib_file option, but that's complicated, and it's much easier
# to just make the linker find libgcc using -L options.
+ # Similar logic applies to libgcj.
if { [istarget "*-*-darwin*"] } {
- set cxxflags "-L../.libs -shared-libgcc -ljvm -liconv"
+ set cxxflags "-L../.libs -shared-libgcc -ljvm -lgcj -liconv"
} else {
global LIBJAVA
if [info exists LIBJAVA] {
--
GitLab