Commit a25bf5b3 by Andreas Tobler Committed by Andreas Tobler

libjava.exp (libjava_init): Call the GCJ_UNDER_TEST with the -B$specdir.

2006-07-04  Andreas Tobler  <a.tobler@schweiz.ch>

	* testsuite/lib/libjava.exp (libjava_init): Call the GCJ_UNDER_TEST with
	the -B$specdir.

From-SVN: r115188
parent aef0f050
2006-07-04 Andreas Tobler <a.tobler@schweiz.ch> 2006-07-04 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/lib/libjava.exp (libjava_init): Call the GCJ_UNDER_TEST with
the -B$specdir.
PR libgcj/28226: PR libgcj/28226:
* include/posix.h (_Jv_platform_dladdr): Remove const qualifier. * include/posix.h (_Jv_platform_dladdr): Remove const qualifier.
* include/win32.h (_Jv_platform_dladdr): Likewise. * include/win32.h (_Jv_platform_dladdr): Likewise.
......
...@@ -166,8 +166,13 @@ proc libjava_init { args } { ...@@ -166,8 +166,13 @@ proc libjava_init { args } {
# Find the libgcj jar file. # Find the libgcj jar file.
set tmp [eval exec "$GCJ_UNDER_TEST -v 2>@ stdout"] # FIXME: This finds libgcj.spec for the default multilib.
regexp " version \[^\n\r\]*" $tmp version # 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] set libjava_version [lindex $version 1]
verbose "version: $libjava_version" verbose "version: $libjava_version"
...@@ -175,13 +180,7 @@ proc libjava_init { args } { ...@@ -175,13 +180,7 @@ proc libjava_init { args } {
set libgcj_jar [glob $objdir/../libgcj-$libjava_version.jar] set libgcj_jar [glob $objdir/../libgcj-$libjava_version.jar]
verbose "jar file is $libgcj_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. # 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 regexp -- "Thread model: (\[^\n\]+)\n" $text ignore model
set libjava_uses_threads [expr {! ($model == "no" set libjava_uses_threads [expr {! ($model == "no"
|| $model == "none" || $model == "none"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment