diff mbox

[gomp4,2/3] OpenACC 2.0 support for libgomp - new tests

Message ID 87fve8gp5l.fsf@kepler.schwinge.homeip.net
State New
Headers show

Commit Message

Thomas Schwinge Oct. 28, 2014, 4 p.m. UTC
Hi!

Committed in r216804:

commit 4f9566b3e2954218c0d9ce3c585e14e539f0c1af
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Tue Oct 28 15:57:48 2014 +0000

    libgomp: Don't refer to CUDA installation in /opt/nvidia/cuda-5.5/.
    
    	libgomp/
    	* testsuite/libgomp.oacc-c/c.exp (ld_library_path, ALWAYS_CFLAGS):
    	Don't refer to CUDA installation in /opt/nvidia/cuda-5.5/.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@216804 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libgomp/ChangeLog.gomp                 | 3 +++
 libgomp/testsuite/libgomp.oacc-c/c.exp | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)



Grüße,
 Thomas
diff mbox

Patch

diff --git libgomp/ChangeLog.gomp libgomp/ChangeLog.gomp
index fda1cbc..5879e20 100644
--- libgomp/ChangeLog.gomp
+++ libgomp/ChangeLog.gomp
@@ -1,5 +1,8 @@ 
 2014-10-28  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* testsuite/libgomp.oacc-c/c.exp (ld_library_path, ALWAYS_CFLAGS):
+	Don't refer to CUDA installation in /opt/nvidia/cuda-5.5/.
+
 	* oacc-init.c: Don't use <sys/queue.h>'s SLIST_*.
 	* plugin-nvptx.c: Likewise.
 
diff --git libgomp/testsuite/libgomp.oacc-c/c.exp libgomp/testsuite/libgomp.oacc-c/c.exp
index 553c225..318f78e 100644
--- libgomp/testsuite/libgomp.oacc-c/c.exp
+++ libgomp/testsuite/libgomp.oacc-c/c.exp
@@ -31,7 +31,6 @@  set tests [lsort [find $srcdir/$subdir *.c]]
 
 set ld_library_path $always_ld_library_path
 append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
-append ld_library_path ":/opt/nvidia/cuda-5.5/lib64"
 set_ld_library_path_env_vars
 
 # Todo: get list of accelerators from configure options --enable-accelerator.
@@ -58,11 +57,6 @@  foreach accel $accels {
 	    # Copy ptx file (TEMPORARY)
 	    remote_download host $srcdir/libgomp.oacc-c/subr.ptx
 
-	    # Where cuda.h lives
-	    # Todo: get that from configure option --with-cuda-driver.
-	    lappend ALWAYS_CFLAGS "additional_flags=-I/opt/nvidia/cuda-5.5/include"
-	    lappend ALWAYS_CFLAGS "additional_flags=-L/opt/nvidia/cuda-5.5/lib64"
-
 	    # Where timer.h lives
 	    lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}"
 	    set acc_mem_shared 0