[llvm-branch-commits] [cfe-branch] r242526 - Merging r242422:

[Hans Wennborg]

Author: hans
Date: Fri Jul 17 10:39:40 2015
New Revision: 242526

URL: http://llvm.org/viewvc/llvm-project?rev=242526&view=rev
Log:
Merging r242422:
------------------------------------------------------------------------
r242422 | tra | 2015-07-16 10:24:18 -0700 (Thu, 16 Jul 2015) | 2 lines

Fixed an error in cuda-options.cu test:
  -target option must be used without '='.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_37/   (props changed)
    cfe/branches/release_37/test/Driver/cuda-options.cu

Propchange: cfe/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 17 10:39:40 2015
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:242244,242293
+/cfe/trunk:242244,242293,242422
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_37/test/Driver/cuda-options.cu
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_37/test/Driver/cuda-options.cu?rev=242526&r1=242525&r2=242526&view=diff
==============================================================================
--- cfe/branches/release_37/test/Driver/cuda-options.cu (original)
+++ cfe/branches/release_37/test/Driver/cuda-options.cu Fri Jul 17 10:39:40 2015
@@ -4,7 +4,7 @@
 // REQUIRES: nvptx-registered-target
 
 // Simple compilation case:
-// RUN: %clang -### -target=x86_64-linux-gnu -c %s 2>&1 \
+// RUN: %clang -### -target x86_64-linux-gnu -c %s 2>&1 \
 // Compile device-side to PTX assembly and make sure we use it on the host side.
 // RUN:   | FileCheck -check-prefix CUDA-D1 \
 // Then compile host side and incorporate device code.
@@ -13,7 +13,7 @@
 // RUN:   -check-prefix CUDA-NL %s
 
 // Typical compilation + link case:
-// RUN: %clang -### -target=x86_64-linux-gnu %s 2>&1 \
+// RUN: %clang -### -target x86_64-linux-gnu %s 2>&1 \
 // Compile device-side to PTX assembly and make sure we use it on the host side
 // RUN:   | FileCheck -check-prefix CUDA-D1 \
 // Then compile host side and incorporate device code.
@@ -22,7 +22,7 @@
 // RUN:   -check-prefix CUDA-L %s
 
 // Verify that -cuda-no-device disables device-side compilation and linking
-// RUN: %clang -### -target=x86_64-linux-gnu --cuda-host-only %s 2>&1 \
+// RUN: %clang -### -target x86_64-linux-gnu --cuda-host-only %s 2>&1 \
 // Make sure we didn't run device-side compilation.
 // RUN:   | FileCheck -check-prefix CUDA-ND \
 // Then compile host side and make sure we don't attempt to incorporate GPU code.
@@ -31,7 +31,7 @@
 // RUN:    -check-prefix CUDA-NL %s
 
 // Verify that -cuda-no-host disables host-side compilation and linking
-// RUN: %clang -### -target=x86_64-linux-gnu --cuda-device-only %s 2>&1 \
+// RUN: %clang -### -target x86_64-linux-gnu --cuda-device-only %s 2>&1 \
 // Compile device-side to PTX assembly
 // RUN:   | FileCheck -check-prefix CUDA-D1 \
 // Make sure there are no host cmpilation or linking.
@@ -39,7 +39,7 @@
 
 // Verify that with -S we compile host and device sides to assembly
 // and incorporate device code on the host side.
-// RUN: %clang -### -target=x86_64-linux-gnu -S -c %s 2>&1 \
+// RUN: %clang -### -target x86_64-linux-gnu -S -c %s 2>&1 \
 // Compile device-side to PTX assembly
 // RUN:   | FileCheck -check-prefix CUDA-D1 \
 // Then compile host side and incorporate GPU code.
@@ -49,7 +49,7 @@
 
 // Verify that --cuda-gpu-arch option passes correct GPU
 // archtecture info to device compilation.
-// RUN: %clang -### -target=x86_64-linux-gnu --cuda-gpu-arch=sm_35 -c %s 2>&1 \
+// RUN: %clang -### -target x86_64-linux-gnu --cuda-gpu-arch=sm_35 -c %s 2>&1 \
 // Compile device-side to PTX assembly.
 // RUN:   | FileCheck -check-prefix CUDA-D1 -check-prefix CUDA-D1-SM35 \
 // Then compile host side and incorporate GPU code.
@@ -59,7 +59,7 @@
 
 // Verify that there is device-side compilation per --cuda-gpu-arch args
 // and that all results are included on the host side.
-// RUN: %clang -### -target=x86_64-linux-gnu --cuda-gpu-arch=sm_35 --cuda-gpu-arch=sm_30 -c %s 2>&1 \
+// RUN: %clang -### -target x86_64-linux-gnu --cuda-gpu-arch=sm_35 --cuda-gpu-arch=sm_30 -c %s 2>&1 \
 // Compile both device-sides to PTX assembly
 // RUN:   | FileCheck \
 // RUN: -check-prefix CUDA-D1 -check-prefix CUDA-D1-SM35 \