This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: [patch] add HP-UX shared lib extension to libjava.exp
- From: Andreas Tobler <toa at pop dot agri dot ch>
- To: tromey at redhat dot com
- Cc: Java Patches <java-patches at gcc dot gnu dot org>
- Date: Sat, 06 May 2006 22:53:02 +0200
- Subject: Re: [patch] add HP-UX shared lib extension to libjava.exp
- References: <445BAF7B.60906@pop.agri.ch> <m31wv6dh1n.fsf@localhost.localdomain>
Tom Tromey wrote:
"Andreas" == Andreas Tobler <toa@pop.agri.ch> writes:
Andreas> 2006-05-05 Andreas Tobler <a.tobler@schweiz.ch>
Andreas> * testsuite/lib/libjava.exp (libjava_find_lib): Add sl to the shared
Andreas> library extensions.
Ok.
You may also want to fix up libjava.jni/jni.exp.
Bah, I have this one since months in my tree.
Here the updated patch.
Thanks for review Tom!
Andreas
2006-05-06 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Add check for
HP-UX and add appropriate extension for shared libraries, sl.
(gcj_jni_test_one): Likewise.
* testsuite/lib/libjava.exp (libjava_find_lib): Add sl to the shared
library extensions.
Index: testsuite/lib/libjava.exp
===================================================================
--- testsuite/lib/libjava.exp (revision 113576)
+++ testsuite/lib/libjava.exp (working copy)
@@ -1,4 +1,4 @@
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software Foundation
proc load_gcc_lib { filename } {
global srcdir
@@ -242,7 +242,7 @@
proc libjava_find_lib {dir name} {
global base_dir
set gp [get_multilibs]
- foreach extension {so dll dylib a} {
+ foreach extension {so dll dylib sl a} {
foreach sub {.libs _libs} {
if {$gp != ""} {
if {[file exists $gp/$dir/$sub/lib${name}.${extension}]} then {
Index: testsuite/libjava.jni/jni.exp
===================================================================
--- testsuite/libjava.jni/jni.exp (revision 113576)
+++ testsuite/libjava.jni/jni.exp (working copy)
@@ -10,13 +10,17 @@
set options_cxx $options
set options ""
-# apple uses a different extension for shared/dynamic libraries
+# Apple uses a different extension for shared/dynamic libraries
# so we check against powerpc-apple-darwin and set them to
-# dylib, else we assume it's .so
+# dylib.
+# HP-UX uses sl, so we check this too, otherwise we take so.
if { [istarget "*-*-darwin*"] } {
set so_extension "dylib"
set so_flag "-dynamiclib"
+ } elseif { [istarget "hppa*-hp-hpux*"] } {
+ set so_extension "sl"
+ set so_flag "-shared"
} else {
set so_extension "so"
set so_flag "-shared"
@@ -76,12 +80,15 @@
global host_triplet
global INTERPRETER
-# apple uses a different extension for shared/dynamic libraries
+# Apple uses a different extension for shared/dynamic libraries
# so we check against powerpc-apple-darwin and set them to
-# dylib, else we assume it's .so
+# dylib.
+# HP-UX uses sl, so we check this too, otherwise we take so.
if { [istarget "*-*-darwin*"] } {
set so_extension "dylib"
+ } elseif { [istarget "hppa*-hp-hpux*"] } {
+ set so_extension "sl"
} else {
set so_extension "so"
}