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

libjava.exp (libjava_arguments): Remove unneeded variables. 

* lib/libjava.exp (libjava_arguments): Remove unneeded variables.
(test_libjava_from_source): Likewise.
(test_libjava_from_javac): Likewise.

From-SVN: r71101
This commit is contained in:
Jeff Sturm 2003-09-05 01:47:27 +00:00
parent 3f571a7869
commit cf0aaf32c6
1 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,9 +307,6 @@ proc gcj_cleanup {args} {
proc libjava_arguments {{mode compile}} { proc libjava_arguments {{mode compile}} {
global base_dir global base_dir
global LIBJAVA global LIBJAVA
global LIBGC
global LIBQTHREADS
global LIBZ
global srcdir subdir objdir global srcdir subdir objdir
global TOOL_OPTIONS global TOOL_OPTIONS
global GCJ_UNDER_TEST global GCJ_UNDER_TEST
@ -326,35 +323,14 @@ proc libjava_arguments {{mode compile}} {
set libjava [libjava_find_lib libjava gcj] set libjava [libjava_find_lib libjava gcj]
} }
if [info exists LIBGC] {
set libgc $LIBGC;
} else {
set libgc [libjava_find_lib boehm-gc gcjgc]
}
if [info exists LIBQTHREADS] {
set libqthreads $LIBQTHREADS
} else {
set libqthreads [libjava_find_lib qthreads gcjcoop]
}
if [info exists LIBZ] {
set libz $LIBZ
} else {
set libz [libjava_find_lib zlib zgcj]
}
verbose "using LIBJAVA = $libjava" 2 verbose "using LIBJAVA = $libjava" 2
verbose "using LIBGC = $libgc" 2
verbose "using LIBQTHREADS = $libqthreads" 2
verbose "using LIBZ = $libz" 2
set args "" set args ""
# Basically we want to build up a colon separated path list from # Basically we want to build up a colon separated path list from
# the value of $libjava. # the value of $libjava.
set lpath {} set lpath {}
foreach dir [list $libjava $libgc $libz] { foreach dir [list $libjava] {
foreach item [split $dir " "] { foreach item [split $dir " "] {
switch -glob -- $item { switch -glob -- $item {
"-L*" { "-L*" {
@ -572,8 +548,6 @@ proc libjava_invoke {errname testName optName executable inpfile resultfile args
# #
proc test_libjava_from_source { options srcfile compile_args inpfile resultfile exec_args } { proc test_libjava_from_source { options srcfile compile_args inpfile resultfile exec_args } {
global base_dir global base_dir
global LIBJAVA
global LIBGC
global srcdir subdir objdir global srcdir subdir objdir
global TOOL_OPTIONS global TOOL_OPTIONS
global GCJ_UNDER_TEST global GCJ_UNDER_TEST
@ -679,8 +653,6 @@ proc test_libjava_from_source { options srcfile compile_args inpfile resultfile
# #
proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile exec_args } { proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile exec_args } {
global base_dir global base_dir
global LIBJAVA
global LIBGC
global srcdir subdir objdir global srcdir subdir objdir
global TOOL_OPTIONS global TOOL_OPTIONS
global GCJ_UNDER_TEST global GCJ_UNDER_TEST