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

libgomp.exp (libgomp_target_compile): If $source matches regex $lang_source_re, add $lang_include_flags to options.

Browse Source 
* testsuite/lib/libgomp.exp (libgomp_target_compile): If $source
	matches regex $lang_source_re, add $lang_include_flags to options.
	* testsuite/libgomp.c/c.exp: Unset lang_include_flags.
	* testsuite/libgomp.c++/c++.exp: Likewise.
	* testsuite/libgomp.fortran/fortran.exp: Likewise.  Set lang_source_re
	and lang_include_flags instead of adding -fintrinsic-modules-path= to
	ALWAYS_CFLAGS.
	* testsuite/libgomp.graphite/graphite.exp: Unset lang_include_flags.

From-SVN: r212268
This commit is contained in:
Jakub Jelinek 2014-07-03 20:45:35 +02:00 committed by Jakub Jelinek
parent 9e5f78f114
commit f707da16f7
6 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libgomp/ChangeLog
View File

@ -1,3 +1,14 @@
2014-07-03 Jakub Jelinek <jakub@redhat.com>
* testsuite/lib/libgomp.exp (libgomp_target_compile): If $source
matches regex $lang_source_re, add $lang_include_flags to options.
* testsuite/libgomp.c/c.exp: Unset lang_include_flags.
* testsuite/libgomp.c++/c++.exp: Likewise.
* testsuite/libgomp.fortran/fortran.exp: Likewise. Set lang_source_re
and lang_include_flags instead of adding -fintrinsic-modules-path= to
ALWAYS_CFLAGS.
* testsuite/libgomp.graphite/graphite.exp: Unset lang_include_flags.
2014-07-03 Thomas Schwinge <thomas@codesourcery.com>
* testsuite/libgomp.fortran/fortran.exp: Explain

6
libgomp/testsuite/lib/libgomp.exp
View File

@ -184,6 +184,8 @@ proc libgomp_target_compile { source dest type options } {
global lang_test_file
global lang_library_path
global lang_link_flags
global lang_include_flags
global lang_source_re
if { [info exists lang_test_file] } {
if { $blddir != "" } {
@ -193,6 +195,10 @@ proc libgomp_target_compile { source dest type options } {
lappend options "ldflags=-L${blddir}/${lang_library_path}"
}
lappend options "ldflags=${lang_link_flags}"
if { [info exists lang_include_flags] \
&& [regexp ${lang_source_re} ${source}] } {
lappend options "additional_flags=${lang_include_flags}"
}
}
if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } {

3
libgomp/testsuite/libgomp.c++/c++.exp
View File

@ -7,6 +7,9 @@ set shlib_ext [get_shlib_extension]
set lang_link_flags "-lstdc++"
set lang_test_file_found 0
set lang_library_path "../libstdc++-v3/src/.libs"
if [info exists lang_include_flags] then {
unset lang_include_flags
}
# Initialize dg.
dg-init

3
libgomp/testsuite/libgomp.c/c.exp
View File

@ -5,6 +5,9 @@ if [info exists lang_library_path] then {
if [info exists lang_test_file] then {
unset lang_test_file
}
if [info exists lang_include_flags] then {
unset lang_include_flags
}
load_lib libgomp-dg.exp
load_gcc_lib gcc-dg.exp

6
libgomp/testsuite/libgomp.fortran/fortran.exp
View File

@ -8,6 +8,9 @@ global ALWAYS_CFLAGS
set shlib_ext [get_shlib_extension]
set lang_library_path "../libgfortran/.libs"
set lang_link_flags "-lgfortran"
if [info exists lang_include_flags] then {
unset lang_include_flags
}
set lang_test_file_found 0
set quadmath_library_path "../libquadmath/.libs"
@ -19,7 +22,8 @@ dg-init
lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
if { $blddir != "" } {
lappend ALWAYS_CFLAGS "additional_flags=-fintrinsic-modules-path=${blddir}"
set lang_source_re {^.*\.[fF](|90|95|03|08)$}
set lang_include_flags "-fintrinsic-modules-path=${blddir}"
# Look for a static libgfortran first.
if [file exists "${blddir}/${lang_library_path}/libgfortran.a"] {
set lang_test_file "${lang_library_path}/libgfortran.a"

3
libgomp/testsuite/libgomp.graphite/graphite.exp
View File

@ -21,6 +21,9 @@ if [info exists lang_library_path] then {
if [info exists lang_test_file] then {
unset lang_test_file
}
if [info exists lang_include_flags] then {
unset lang_include_flags
}
load_lib libgomp-dg.exp
load_gcc_lib gcc-dg.exp