--- libjava/testsuite/libjava.jni/jni.exp.orig	2015-06-25 17:56:36 UTC
+++ libjava/testsuite/libjava.jni/jni.exp
@@ -274,6 +274,11 @@ proc gcj_jni_get_cxxflags_invocation {} 
     eval lappend cxxflags "-shared-libgcc -lgcj $libiconv"
   }
 
+  # BSDSUniX needs -liconv linked, otherwise we get some unresolved.
+  if { [istarget "*-*-bsdsunix*"] } {
+    eval lappend cxxflags "$libiconv"
+  }
+
   # FreeBSD needs -liconv linked, otherwise we get some unresolved.
   if { [istarget "*-*-freebsd*"] } {
     eval lappend cxxflags "$libiconv"