diff options
| author | Tobias Burnus <burnus@net-b.de> | 2013-10-30 21:29:06 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2013-10-30 21:29:06 +0100 |
| commit | adffea1e08111232b9eb24baf9c6d4b76404e035 (patch) | |
| tree | 02064e6ed70ce542ac7d0f150c93ac1313848578 /gcc | |
| parent | 8f24613d021f267f24d39f51b5423c308060b42c (diff) | |
| download | gcc-adffea1e08111232b9eb24baf9c6d4b76404e035.zip gcc-adffea1e08111232b9eb24baf9c6d4b76404e035.tar.gz gcc-adffea1e08111232b9eb24baf9c6d4b76404e035.tar.bz2 | |
revert: cilk-plus.exp: Add the libcilkrts library path to the compile flags.
2013-10-30 Tobias Burnus <burnus@net-b.de>
Revert:
2013-10-30 Tobias Burnus <burnus@net-b.de>
* gcc.dg/cilk-plus/cilk-plus.exp: Add the libcilkrts library
path to the compile flags.
From-SVN: r204230
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp | 19 |
2 files changed, 8 insertions, 18 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2b56fbf..04e7d63 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2013-10-30 Tobias Burnus <burnus@net-b.de> + + Revert: + 2013-10-30 Tobias Burnus <burnus@net-b.de> + * gcc.dg/cilk-plus/cilk-plus.exp: Add the libcilkrts library + path to the compile flags. + 2013-10-30 Cong Hou <congh@google.com> * gcc.target/i386/vect-abs-s8.c: New test. diff --git a/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp b/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp index 0a9d19b..a8f00d4 100644 --- a/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp +++ b/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp @@ -26,24 +26,7 @@ if { ![check_effective_target_cilkplus] } { verbose "$tool $libdir" 1 set library_var [get_multilibs] # Pointing the ld_library_path to the Cilk Runtime library binaries. -if { $gccpath != "" } { - if { [file exists "${gccpath}/libcilkrts/.libs/libcilkrts.a"] - || [file exists "${gccpath}/libcilkrts/.libs/libcilkrts.${shlib_ext}"] } { - append flags " -B${gccpath}/libcilkrts/ " - append flags " -L${gccpath}/libcilkrts/.libs " - append ld_library_path ":${gccpath}/libcilkrts/.libs" - } -} else { - global tool_root_dir - - set libcilkrts [lookfor_file ${tool_root_dir} libcilkrts] - if { $libcilkrts != "" } { - append flags "-L${libcilkrts} " - append ld_library_path ":${libcilkrts}" - } -} - -set_ld_library_path_env_vars +set ld_library_path "${library_var}/libcilkrts/.libs" dg-init dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus" " " |