@@ -210,7 +210,6 @@ proc libgomp_target_compile { source dest type options } {
lappend options "additional_flags=[libio_include_flags]"
lappend options "timeout=[timeout_value]"
- lappend options "compiler=$GCC_UNDER_TEST"
set options [concat $libgomp_compile_options $options]
@@ -4,6 +4,7 @@ load_gcc_lib gcc-dg.exp
global shlib_ext
set shlib_ext [get_shlib_extension]
+#TODO
set lang_link_flags "-lstdc++"
set lang_test_file_found 0
set lang_library_path "../libstdc++-v3/src/.libs"
@@ -41,6 +42,11 @@ if { $blddir != "" } {
}
if { $lang_test_file_found } {
+ if ![info exists GXX_UNDER_TEST] then {
+ set GXX_UNDER_TEST $GCC_UNDER_TEST
+ }
+ lappend libgomp_compile_options "compiler=$GXX_UNDER_TEST"
+
# Gather a list of all tests.
set tests [lsort [glob -nocomplain $srcdir/$subdir/*.C]]
@@ -23,6 +23,8 @@ dg-init
# Turn on OpenMP.
lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
+lappend libgomp_compile_options "compiler=$GCC_UNDER_TEST"
+
# Gather a list of all tests.
set tests [lsort [find $srcdir/$subdir *.c]]
@@ -7,6 +7,7 @@ global ALWAYS_CFLAGS
set shlib_ext [get_shlib_extension]
set lang_library_path "../libgfortran/.libs"
+#TODO
set lang_link_flags "-lgfortran"
if [info exists lang_include_flags] then {
unset lang_include_flags
@@ -44,6 +45,11 @@ if { $blddir != "" } {
}
if { $lang_test_file_found } {
+ if ![info exists GFORTRAN_UNDER_TEST] then {
+ set GFORTRAN_UNDER_TEST $GCC_UNDER_TEST
+ }
+ lappend libgomp_compile_options "compiler=$GFORTRAN_UNDER_TEST"
+
# Gather a list of all tests.
set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]]
@@ -48,6 +48,8 @@ dg-init
# Turn on OpenMP.
lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
+lappend libgomp_compile_options "compiler=$GCC_UNDER_TEST"
+
# Gather a list of all tests.
set tests [lsort [find $srcdir/$subdir *.c]]