From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27718 invoked by alias); 6 May 2006 20:53:15 -0000 Received: (qmail 27710 invoked by uid 22791); 6 May 2006 20:53:14 -0000 X-Spam-Check-By: sourceware.org Received: from exsmtp01.agrinet.ch (HELO exsmtp01.agrinet.ch) (81.221.250.200) by sourceware.org (qpsmtpd/0.31) with ESMTP; Sat, 06 May 2006 20:53:12 +0000 Received: from smtp.messaging.ch ([10.50.250.214]) by exsmtp01.agrinet.ch with Microsoft SMTPSVC(6.0.3790.211); Sat, 6 May 2006 22:53:09 +0200 Received: from [192.168.225.5] ([80.219.227.180]) by smtp.messaging.ch with id Vwtf1U0013uA8oG0000000 for java-patches@gcc.gnu.org; Sat, 06 May 2006 22:53:40 +0200 X-IMP: RBL SPAMCOP: 0.00,RBL SORBS: 0.10,RBL MAPS_ORDB: 0.00,RBL SBL+XBL: 0.00,URL RHS: 0.00,URL SURBL: 0.00 Message-ID: <445D0CAE.4080201@pop.agri.ch> Date: Sat, 06 May 2006 20:53:00 -0000 From: Andreas Tobler User-Agent: Thunderbird 1.5.0.2 (Macintosh/20060308) MIME-Version: 1.0 To: tromey@redhat.com CC: Java Patches Subject: Re: [patch] add HP-UX shared lib extension to libjava.exp References: <445BAF7B.60906@pop.agri.ch> In-Reply-To: Content-Type: multipart/mixed; boundary="------------000405040904080807000005" X-IsSubscribed: yes Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org X-SW-Source: 2006-q2/txt/msg00123.txt.bz2 This is a multi-part message in MIME format. --------------000405040904080807000005 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 735 Tom Tromey wrote: >>>>>> "Andreas" == Andreas Tobler writes: > > Andreas> 2006-05-05 Andreas Tobler > 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 * 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. --------------000405040904080807000005 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0"; name="pa-java-ts.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="pa-java-ts.diff" Content-length: 2152 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" } --------------000405040904080807000005--