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

libstdc++.exp (libstdc++_init): Set v3-libgomp. 

2008-07-31  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/lib/libstdc++.exp (libstdc++_init): Set v3-libgomp.
	(check_v3_target_parallel_mode): Robustify, just follow the
	structure of testsuite/Makefile.am.

From-SVN: r138428
This commit is contained in:
Paolo Carlini 2008-07-31 18:43:08 +00:00 committed by Paolo Carlini
parent 88e2c8107b
commit 93cc82d1f3
2 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2008-07-31 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/lib/libstdc++.exp (libstdc++_init): Set v3-libgomp.
(check_v3_target_parallel_mode): Robustify, just follow the
structure of testsuite/Makefile.am.
2008-07-29 Paolo Carlini <paolo.carlini@oracle.com> 2008-07-29 Paolo Carlini <paolo.carlini@oracle.com>
* include/debug/set.h: Minor formatting fixes. * include/debug/set.h: Minor formatting fixes.

31
libstdc++-v3/testsuite/lib/libstdc++.exp
View File

@ -81,7 +81,7 @@ proc v3-copy-files {srcfiles} {
# Called once, during runtest.exp setup. # Called once, during runtest.exp setup.
proc libstdc++_init { testfile } { proc libstdc++_init { testfile } {
global env global env
global v3-sharedlib global v3-sharedlib v3-libgomp
global srcdir blddir objdir tool_root_dir global srcdir blddir objdir tool_root_dir
global cc cxx cxxflags cxxpchflags cxxldflags global cc cxx cxxflags cxxpchflags cxxldflags
global includes global includes
@ -135,10 +135,13 @@ proc libstdc++_init { testfile } {
v3track gccdir 3 v3track gccdir 3
# Locate libgomp. This is only required for parallel mode. # Locate libgomp. This is only required for parallel mode.
set v3-libgomp 0
set libgompdir [lookfor_file $blddir/../libgomp .libs/libgomp.so] set libgompdir [lookfor_file $blddir/../libgomp .libs/libgomp.so]
if {$libgompdir != ""} { if {$libgompdir != ""} {
set v3-libgomp 1
set libgompdir [file dirname $libgompdir] set libgompdir [file dirname $libgompdir]
append ld_library_path_tmp ":${libgompdir}" append ld_library_path_tmp ":${libgompdir}"
verbose -log "libgomp support detected"
} }
v3track libgompdir 3 v3track libgompdir 3
@ -968,7 +971,7 @@ proc check_v3_target_debug_mode { } {
proc check_v3_target_parallel_mode { } { proc check_v3_target_parallel_mode { } {
global cxxflags global cxxflags
global DEFAULT_CXXFLAGS global v3-libgomp
global et_parallel_mode global et_parallel_mode
global tool global tool
@ -993,29 +996,9 @@ proc check_v3_target_parallel_mode { } {
} else { } else {
set et_parallel_mode 0 set et_parallel_mode 0
# Set up and compile a C++ test program that depends # If 'make check-parallel' is running the test succeeds.
# on parallel mode working. if { ${v3-libgomp} == 1 && [regexp "libgomp" $cxxflags] } {
set src parallel_mode[pid].cc
set exe parallel_mode[pid].exe
set f [open $src "w"]
puts $f "#include <omp.h>"
puts $f "int main()"
puts $f "{ return 0; }"
close $f
set cxxflags_saved $cxxflags
set cxxflags "$cxxflags $DEFAULT_CXXFLAGS -Werror"
set lines [v3_target_compile $src $exe executable ""]
set cxxflags $cxxflags_saved
file delete $src
if [string match "" $lines] {
# No error message, compilation succeeded.
set et_parallel_mode 1 set et_parallel_mode 1
} else {
verbose "check_v3_target_parallel_mode: compilation failed" 2
} }
} }
verbose "check_v3_target_parallel_mode: $et_parallel_mode" 2 verbose "check_v3_target_parallel_mode: $et_parallel_mode" 2