FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Andreas Tobler 2006-07-04 22:58:54 +02:00 • committed by Andreas Tobler
parent aef0f05060
commit a25bf5b381
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libjava/ChangeLog
View file

@ -1,5 +1,8 @@
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:
* include/posix.h (_Jv_platform_dladdr): Remove const qualifier.
* include/win32.h (_Jv_platform_dladdr): Likewise.

15
libjava/testsuite/lib/libjava.exp
View file

@ -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"