[llvm-branch-commits] [cfe-branch] r259808 - Merging r259183:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Feb  4 12:20:19 2016
New Revision: 259808

URL: http://llvm.org/viewvc/llvm-project?rev=259808&view=rev
Log:
Merging r259183:
------------------------------------------------------------------------
r259183 | uweigand | 2016-01-29 02:45:23 -0800 (Fri, 29 Jan 2016) | 8 lines

Add target triple to CodeGenOpenCL/pipe_types.cl test case

The test is failing on SystemZ since different IR is being
generated due to platform ABI differences.  Add a target triple.

Fix suggested by Anastasia Stulova.


------------------------------------------------------------------------

Modified:
    cfe/branches/release_38/   (props changed)
    cfe/branches/release_38/test/CodeGenOpenCL/pipe_types.cl

Propchange: cfe/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  4 12:20:19 2016
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:257652,257695,257710,257831,257838,257853,257861,257869-257871,257947,258110,258396,259260,259598
+/cfe/trunk:257652,257695,257710,257831,257838,257853,257861,257869-257871,257947,258110,258396,259183,259260,259598
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_38/test/CodeGenOpenCL/pipe_types.cl
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_38/test/CodeGenOpenCL/pipe_types.cl?rev=259808&r1=259807&r2=259808&view=diff
==============================================================================
--- cfe/branches/release_38/test/CodeGenOpenCL/pipe_types.cl (original)
+++ cfe/branches/release_38/test/CodeGenOpenCL/pipe_types.cl Thu Feb  4 12:20:19 2016
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -emit-llvm -O0 -cl-std=CL2.0 -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm -O0 -cl-std=CL2.0 -o - %s | FileCheck %s
 
 // CHECK: %opencl.pipe_t = type opaque
 typedef unsigned char __attribute__((ext_vector_type(3))) uchar3;