diff options
| author | Hans Wennborg <hans@hanshq.net> | 2016-07-29 18:36:36 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2016-07-29 18:36:36 +0000 |
| commit | 4d46ceafb17fcbedfa05809258b5ab91d06c8294 (patch) | |
| tree | 04b0d895a9f85cf89389398fd297b92bdb47685f | |
| parent | 739e31c3c0099f5be4f02bd67ce5ed8015fb145d (diff) | |
Merging r276983, r277138 and r277141:
------------------------------------------------------------------------
r276983 | sfantao | 2016-07-28 07:56:19 -0700 (Thu, 28 Jul 2016) | 5 lines
[OpenMP] Fix link command pattern in offloading interoperability test.
It was causing a few bots to fail.
------------------------------------------------------------------------
------------------------------------------------------------------------
r277138 | d0k | 2016-07-29 06:07:09 -0700 (Fri, 29 Jul 2016) | 4 lines
Make test not fail on hosts where the default omp library is gomp.
This is the case on some linuxes, just force libomp so we get the
desired results.
------------------------------------------------------------------------
------------------------------------------------------------------------
r277141 | djasper | 2016-07-29 06:45:03 -0700 (Fri, 29 Jul 2016) | 1 line
Add missing '-no-canonical-prefixes' in test.
------------------------------------------------------------------------
llvm-svn: 277193
| -rw-r--r-- | clang/test/Driver/offloading-interoperability.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/Driver/offloading-interoperability.c b/clang/test/Driver/offloading-interoperability.c index f3836ee1cdec..f4592e044b28 100644 --- a/clang/test/Driver/offloading-interoperability.c +++ b/clang/test/Driver/offloading-interoperability.c @@ -5,7 +5,7 @@ // // Verify that CUDA device commands do not get OpenMP flags. // -// RUN: %clang -### -x cuda -target powerpc64le-linux-gnu -std=c++11 --cuda-gpu-arch=sm_35 -fopenmp %s 2>&1 \ +// RUN: %clang -no-canonical-prefixes -### -x cuda -target powerpc64le-linux-gnu -std=c++11 --cuda-gpu-arch=sm_35 -fopenmp=libomp %s 2>&1 \ // RUN: | FileCheck %s --check-prefix NO-OPENMP-FLAGS-FOR-CUDA-DEVICE // // NO-OPENMP-FLAGS-FOR-CUDA-DEVICE: clang{{.*}}" "-cc1" "-triple" "nvptx64-nvidia-cuda" @@ -14,4 +14,4 @@ // NO-OPENMP-FLAGS-FOR-CUDA-DEVICE-NEXT: fatbinary" "--cuda" "-64" // NO-OPENMP-FLAGS-FOR-CUDA-DEVICE-NEXT: clang{{.*}}" "-cc1" "-triple" "powerpc64le--linux-gnu" // NO-OPENMP-FLAGS-FOR-CUDA-DEVICE: -fopenmp -// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE-NEXT: ld" "-z" "relro" "--hash-style=gnu" "--eh-frame-hdr" "-m" "elf64lppc" +// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE-NEXT: ld" {{.*}}"-m" "elf64lppc" |