[llvm-branch-commits] [llvm-branch] r214252 - Merging r213880:

[Hans Wennborg]

Author: hans
Date: Tue Jul 29 18:39:40 2014
New Revision: 214252

URL: http://llvm.org/viewvc/llvm-project?rev=214252&view=rev
Log:
Merging r213880:
------------------------------------------------------------------------
r213880 | mren | 2014-07-24 10:18:33 -0700 (Thu, 24 Jul 2014) | 1 line

Try to fix the bots. If this does not work, I am going to move it to X86 directory.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_35/   (props changed)
    llvm/branches/release_35/test/Transforms/SimplifyCFG/switch-table-bug.ll

Propchange: llvm/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 29 18:39:40 2014
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,213653,213749,213815,213847,213894,213915
+/llvm/trunk:155241,213653,213749,213815,213847,213880,213894,213915

Modified: llvm/branches/release_35/test/Transforms/SimplifyCFG/switch-table-bug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_35/test/Transforms/SimplifyCFG/switch-table-bug.ll?rev=214252&r1=214251&r2=214252&view=diff
==============================================================================
--- llvm/branches/release_35/test/Transforms/SimplifyCFG/switch-table-bug.ll (original)
+++ llvm/branches/release_35/test/Transforms/SimplifyCFG/switch-table-bug.ll Tue Jul 29 18:39:40 2014
@@ -1,6 +1,6 @@
-; RUN: opt -S -simplifycfg < %s | FileCheck %s
+; RUN: opt -S -simplifycfg < %s -mtriple=x86_64-apple-darwin12.0.0 | FileCheck %s
 ; rdar://17735071
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-apple-darwin12.0.0"
 
 ; When tableindex can't fit into i2, we should extend the type to i3.