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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@204230 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2b56fbf..04e7d63 100644 (file)
--- 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 (file)
--- 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" " "