OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libjava.exp (libjava_init): Use the same target check for Darwin. 

2005-03-11  Andreas Tobler  <a.tobler@schweiz.ch>

	* testsuite/lib/libjava.exp (libjava_init): Use the same target
	check for Darwin.
	(libjava_arguments): Likewise.

	* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Likewise.
	(gcj_jni_test_one): Likewise.
	(gcj_jni_invocation_compile_c_to_binary): Likewise.
	Add flags to keep the Darwin linker quiet.
	(gcj_jni_invocation_test_one): Use the same target check for Darwin.
	Add -liconv for Darwin.

From-SVN: r96311
This commit is contained in:
Andreas Tobler 2005-03-11 22:33:56 +01:00 committed by Andreas Tobler
parent f817d5d470
commit a96cf7633a
3 changed files with 30 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,16 @@
2005-03-11 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/lib/libjava.exp (libjava_init): Use the same target
check for Darwin.
(libjava_arguments): Likewise.
* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Likewise.
(gcj_jni_test_one): Likewise.
(gcj_jni_invocation_compile_c_to_binary): Likewise.
Add flags to keep the Darwin linker quiet.
(gcj_jni_invocation_test_one): Use the same target check for Darwin.
Add -liconv for Darwin.
2005-03-11 Tom Tromey <tromey@redhat.com>
* gnu/gcj/tools/gcj_dbtool/Main.java (main): Handle '-p'.

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

@ -197,8 +197,8 @@ proc libjava_init { args } {
# Finally, add the gcc build directory so that we can find the
# shared libgcc. This, like much of dejagnu, is hideous.
set libjava_libgcc_s_path {}
if { [string match "powerpc-*-darwin*" $target_triplet] } {
if { [istarget "*-*-darwin*"] } {
set so_extension "dylib"
} else {
set so_extension "so"

21
libjava/testsuite/libjava.jni/jni.exp
View File

@ -14,7 +14,7 @@ proc gcj_jni_compile_c_to_so {file {options {}}} {
# so we check against powerpc-apple-darwin and set them to
# dylib, else we assume it's .so
if { [ regexp {powerpc-apple-darwin} $host_triplet] } {
if { [istarget "*-*-darwin*"] } {
set so_extension "dylib"
set so_flag "-dynamiclib"
} else {
@ -77,10 +77,10 @@ proc gcj_jni_test_one {file} {
global INTERPRETER
# apple uses a different extension for shared/dynamic libraries
# so we check against powerpc-apple-darwin and set them to
# so we check against powerpc-apple-darwin and set them to
# dylib, else we assume it's .so
if { [ regexp {powerpc-apple-darwin} $host_triplet] } {
if { [istarget "*-*-darwin*"] } {
set so_extension "dylib"
} else {
set so_extension "so"
@ -134,12 +134,12 @@ proc gcj_jni_test_one {file} {
# Darwin does not yet have a libgcc_s.dylib library.
# So we add it here. If the libgcc_s is installed, the libstdc++
# would pick it up.
if { [ regexp {powerpc-apple-darwin} $host_triplet] } {
if { [istarget "*-*-darwin*"] } {
lappend cxxflaglist "-lgcc_s -lstdc++"
} else {
lappend cxxflaglist "-lstdc++"
}
set cxxflags [join $cxxflaglist]
}
@ -194,6 +194,10 @@ proc gcj_jni_invocation_compile_c_to_binary {file {options {}}} {
set filename [file tail $file]
set name [file rootname $filename]
# Set some darwin specific options
if { [istarget "*-*-darwin*"] } {
lappend options "additional_flags=-multiply_defined suppress"
}
# Find the generated header.
lappend options "additional_flags=-I. -I.."
@ -238,7 +242,12 @@ proc gcj_jni_invocation_test_one {file} {
pass "bytecompile $file"
set cfile [file rootname $file].c
set cxxflags "-L../.libs -lgcj"
# Darwin needs -liconv linked, otherwise we get some unresolved.
if { [istarget "*-*-darwin*"] } {
set cxxflags "-L../.libs -lgcj -liconv"
} else {
set cxxflags "-L../.libs -lgcj"
}
if {! [gcj_jni_invocation_compile_c_to_binary $cfile $cxxflags]} {
# FIXME