From fa1e95cc218f2e4453a7d68267ab9937b9aa09b4 Mon Sep 17 00:00:00 2001 From: andreast Date: Tue, 4 Jul 2006 20:58:54 +0000 Subject: [PATCH] 2006-07-04 Andreas Tobler * 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 --- libjava/ChangeLog | 3 +++ libjava/testsuite/lib/libjava.exp | 15 +++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index fd3b6d0..95d783c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,8 @@ 2006-07-04 Andreas Tobler + * testsuite/lib/libjava.exp (libjava_init): Call the GCJ_UNDER_TEST with + the -B$specdir. + PR libgcj/28226: * include/posix.h (_Jv_platform_dladdr): Remove const qualifier. * include/win32.h (_Jv_platform_dladdr): Likewise. diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index 4b1f7ae..5100c8a 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" -- 2.7.4