diff options
| author | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-04 20:58:54 +0000 |
|---|---|---|
| committer | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-04 20:58:54 +0000 |
| commit | fa1e95cc218f2e4453a7d68267ab9937b9aa09b4 (patch) | |
| tree | ff570a4cd181cc5aa48f20d4c1d58745b67bcabc /libjava/testsuite/lib/libjava.exp | |
| parent | b8efaf8290a87bd0953a0623968dbcc3df75375e (diff) | |
| download | ppe42-gcc-fa1e95cc218f2e4453a7d68267ab9937b9aa09b4.tar.gz ppe42-gcc-fa1e95cc218f2e4453a7d68267ab9937b9aa09b4.zip | |
2006-07-04 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/lib/libjava.exp (libjava_init): Call the GCJ_UNDER_TEST with
the -B$specdir.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115188 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/testsuite/lib/libjava.exp')
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 4b1f7ae2df4..5100c8a7b49 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -166,8 +166,13 @@ proc libjava_init { args } { # Find the libgcj jar file. - set tmp [eval exec "$GCJ_UNDER_TEST -v 2>@ stdout"] - regexp " version \[^\n\r\]*" $tmp version + # FIXME: This finds libgcj.spec for the default multilib. + # If thread models differ between multilibs, this has to be moved + # to libjava_arguments + set specdir [libjava_find_spec] + + set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] + regexp " version \[^\n\r\]*" $text version set libjava_version [lindex $version 1] verbose "version: $libjava_version" @@ -175,13 +180,7 @@ proc libjava_init { args } { set libgcj_jar [glob $objdir/../libgcj-$libjava_version.jar] verbose "jar file is $libgcj_jar" - # FIXME: This finds libgcj.spec for the default multilib. - # If thread models differ between multilibs, this has to be moved - # to libjava_arguments - set specdir [libjava_find_spec] - # The -B is so we find libgcj.spec. - set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] regexp -- "Thread model: (\[^\n\]+)\n" $text ignore model set libjava_uses_threads [expr {! ($model == "no" || $model == "none" |
