From 4d5ea558a87381a53ff6354200b02f0f1305e23b Mon Sep 17 00:00:00 2001 From: andreast Date: Sat, 6 May 2006 20:57:18 +0000 Subject: 2006-05-06 Andreas Tobler * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113587 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/testsuite/lib/libjava.exp | 4 ++-- libjava/testsuite/libjava.jni/jni.exp | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'libjava/testsuite') diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 0094579a705..fa9c0444733 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -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_init { args } { 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 { diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index 1810668111f..6cd677d77aa 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -10,13 +10,17 @@ proc gcj_jni_compile_c_to_so {file {options {}}} { 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 @@ proc gcj_jni_test_one {file} { 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" } -- cgit v1.2.1