From 27a35675ce6e0ff5269c872a29e09fe73924a54a Mon Sep 17 00:00:00 2001
From: andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 18 Jun 2004 20:56:56 +0000
Subject: [PATCH] 2004-06-18 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Add lgcc_s for
darwin.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83360 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 5 +++++
libjava/testsuite/libjava.jni/jni.exp | 12 ++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 20b07262023e..b77c9a90a98b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-18 Andreas Tobler <a.tobler@schweiz.ch>
+
+ * testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Add lgcc_s for
+ darwin.
+
2004-06-18 Ranjit Mathew <rmathew@hotmail.com>
* prims.cc (_Jv_CreateJavaVM): Install SEGV and FPE handlers,
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index b1f6d4e34f46..838b83324de7 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -11,7 +11,7 @@ proc gcj_jni_compile_c_to_so {file {options {}}} {
set options ""
# apple uses a different extension for shared/dynamic libraries
-# so we check against powerpc-apple-darwin and set them to
+# so we check against powerpc-apple-darwin and set them to
# dylib, else we assume it's .so
if { [ regexp {powerpc-apple-darwin} $host_triplet] } {
@@ -131,7 +131,15 @@ proc gcj_jni_test_one {file} {
lappend cxxflaglist "-L$cxxldlibflags"
}
- lappend cxxflaglist "-lstdc++"
+ # Darwin does not yet have a libgcc_s.dylib library.
+ # So we add it here. If the libgcc_s is installed, the libstdc++
+ # would pick it up.
+ if { [ regexp {powerpc-apple-darwin} $host_triplet] } {
+ lappend cxxflaglist "-lgcc_s -lstdc++"
+ } else {
+ lappend cxxflaglist "-lstdc++"
+ }
+
set cxxflags [join $cxxflaglist]
}
--
GitLab