procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jni.exp (gcj_jni_compile_c_to_so): Add check for HP-UX and add appropriate extension for shared libraries, sl.

Browse source 
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.

From-SVN: r113587
This commit is contained in:
Andreas Tobler 2006-05-06 22:57:18 +02:00
parent ed1a08a759
commit b3638b64c3
3 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libjava/ChangeLog
View file

@ -1,3 +1,12 @@
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.
2006-05-05 Tom Tromey <tromey@redhat.com>
PR libgcj/27294:
@ -10,7 +19,7 @@
* java/lang/Class.java (getClassLoader(Class)): New.
forName(String, Class): New.
* java/lang/natClass.cc (getClassLoader(Class)): New.
2006-05-02 Andrew Haley <aph@redhat.com>
* prims.cc (_Jv_NewMultiArray): Check for phantom class.
@ -73,7 +82,7 @@
NullPointerException every time.
* include/java-interp.h (_Jv_ResolvedMethod): Remove vtable_index
field.
* include/execution.h (resolve_method): Remove vtable_index argument.
* include/execution.h (resolve_method): Remove vtable_index argument.
2006-04-28 Andreas Tobler <a.tobler@schweiz.ch>

4
libjava/testsuite/lib/libjava.exp
View file

@ -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 {

15
libjava/testsuite/libjava.jni/jni.exp
View file

@ -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"
}