gcc.exp (gcc_target_compile): Add support for random runtime
* lib/gcc.exp (gcc_target_compile): Add support for random runtime * lib/g++.exp (g++_target_compile): Likewise. libraries. * gcc.dg/cilk-plus/cilk-plus.exp: Improve support for runtime libraries. Remove debugging. * g++.dg/cilk-plus/cilk-plus.exp: Add support to find runtime libraries. Remove -O0, redundant with default. From-SVN: r204887
This commit is contained in:
parent
d3f4ff8b51
commit
b7ce44d17e
|
@ -1,3 +1,13 @@
|
|||
2013-11-15 Mike Stump <mikestump@comcast.net>
|
||||
|
||||
* lib/gcc.exp (gcc_target_compile): Add support for random runtime
|
||||
* lib/g++.exp (g++_target_compile): Likewise.
|
||||
libraries.
|
||||
* gcc.dg/cilk-plus/cilk-plus.exp: Improve support for runtime
|
||||
libraries. Remove debugging.
|
||||
* g++.dg/cilk-plus/cilk-plus.exp: Add support to find runtime
|
||||
libraries. Remove -O0, redundant with default.
|
||||
|
||||
2013-11-15 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
* c-c++-common/cpp/ucnid-2011-1.c: New test.
|
||||
|
|
|
@ -29,14 +29,19 @@ g++-dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/PS/*.c]]
|
|||
g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] ""
|
||||
dg-finish
|
||||
|
||||
set library_var [get_multilibs]
|
||||
# Pointing the ld_library_path to the Cilk Runtime library binaries.
|
||||
set ld_library_path "${library_var}/libcilkrts/.libs"
|
||||
|
||||
global TEST_EXTRA_LIBS
|
||||
set TEST_EXTRA_LIBS "-L${library_var}/libcilkrts/.libs"
|
||||
|
||||
dg-init
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O0 -fcilkplus" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O1 -fcilkplus" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O2 -ftree-vectorize -fcilkplus" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O3 -fcilkplus" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -g -fcilkplus" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -g -O0 -fcilkplus" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -g -O1 -fcilkplus" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -g -O2 -ftree-vectorize -fcilkplus" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -g -O3 -fcilkplus" " "
|
||||
|
@ -56,3 +61,5 @@ dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/AN/*.cc]] " -g -O2
|
|||
dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/AN/*.cc]] " -g -O3 -fcilkplus" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/AN/*.cc]] " -O3 -ftree-vectorize -fcilkplus -g" " "
|
||||
dg-finish
|
||||
|
||||
unset TEST_EXTRA_LIBS
|
||||
|
|
|
@ -24,13 +24,12 @@ if { ![check_effective_target_cilkplus] } {
|
|||
return;
|
||||
}
|
||||
|
||||
verbose "$tool $libdir" 1
|
||||
set library_var [get_multilibs]
|
||||
# Pointing the ld_library_path to the Cilk Runtime library binaries.
|
||||
set ld_library_path "${library_var}/libcilkrts/.libs"
|
||||
|
||||
set ALWAYS_CFLAGS ""
|
||||
lappend ALWAYS_CFLAGS "-L${library_var}/libcilkrts/.libs"
|
||||
global TEST_EXTRA_LIBS
|
||||
set TEST_EXTRA_LIBS "-L${library_var}/libcilkrts/.libs"
|
||||
|
||||
dg-init
|
||||
|
||||
|
@ -51,14 +50,15 @@ dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -f
|
|||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -O3 -std=c99" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -g -O0 -std=c99" " "
|
||||
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -g -fcilkplus $ALWAYS_CFLAGS " " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O1 -fcilkplus $ALWAYS_CFLAGS" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O2 -std=c99 -fcilkplus $ALWAYS_CFLAGS" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O2 -ftree-vectorize -fcilkplus $ALWAYS_CFLAGS" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O3 -g -fcilkplus $ALWAYS_CFLAGS" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -g -fcilkplus" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O1 -fcilkplus" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O2 -std=c99 -fcilkplus" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O2 -ftree-vectorize -fcilkplus" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O3 -g -fcilkplus" " "
|
||||
if { [check_effective_target_lto] } {
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O3 -flto -g -fcilkplus $ALWAYS_CFLAGS" " "
|
||||
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O3 -flto -g -fcilkplus" " "
|
||||
}
|
||||
|
||||
|
||||
dg-finish
|
||||
|
||||
unset TEST_EXTRA_LIBS
|
||||
|
|
|
@ -294,6 +294,11 @@ proc g++_target_compile { source dest type options } {
|
|||
lappend options "ldflags=${wrap_flags}"
|
||||
}
|
||||
|
||||
global TEST_EXTRA_LIBS
|
||||
if [info exists TEST_EXTRA_LIBS] {
|
||||
lappend options "ldflags=$TEST_EXTRA_LIBS"
|
||||
}
|
||||
|
||||
lappend options "additional_flags=[libio_include_flags]"
|
||||
lappend options "compiler=$GXX_UNDER_TEST"
|
||||
lappend options "timeout=[timeout_value]"
|
||||
|
|
|
@ -134,6 +134,11 @@ proc gcc_target_compile { source dest type options } {
|
|||
lappend options "ldflags=$wrap_flags"
|
||||
}
|
||||
|
||||
global TEST_EXTRA_LIBS
|
||||
if [info exists TEST_EXTRA_LIBS] {
|
||||
lappend options "ldflags=$TEST_EXTRA_LIBS"
|
||||
}
|
||||
|
||||
if [target_info exists gcc,stack_size] {
|
||||
lappend options "additional_flags=-DSTACK_SIZE=[target_info gcc,stack_size]"
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue