3 files changed, 12 insertions, 14 deletions
diff --git a/tests/cases/entry3.ll b/tests/cases/entry3.ll
index a20c6843..6888d0a8 100644
--- a/tests/cases/entry3.ll
+++ b/tests/cases/entry3.ll
@@ -1,25 +1,25 @@
 ; ModuleID = '/tmp/tmpKnA2D3/a.out.bc'
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128"
-target triple = "i386-pc-linux-gnu"
+target datalayout = "e-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-p:32:32:32-v128:32:32"
+target triple = "le32-unknown-nacl"
 
 @.str = private unnamed_addr constant [11 x i8] c"getgid=%d\0A\00", align 1
 @.str1 = private unnamed_addr constant [6 x i8] c"f=%d\0A\00", align 1
 
 define internal i32 @_Z1fii(i32, i32) noinline {
 entry:
-  %3 = tail call i32 @getgid()
-  %4 = icmp eq i32 %3, 0
-  br i1 %4, label %cond.b, label %cond.a
+  %a3 = tail call i32 @getgid()
+  %a4 = icmp eq i32 %a3, 0
+  br i1 %a4, label %cond.b, label %cond.a
 
 cond.a:
-  %6 = tail call i32 @getgid()
+  %a6 = tail call i32 @getgid()
   br label %cond.end
 
 cond.b:
   br label %cond.end
 
 cond.end:
-  %.0 = phi i32 [ 0, %cond.b ], [ 1, %1 ]
+  %.0 = phi i32 [ 0, %cond.b ], [ 1, %cond.a ]
   ret i32 %.0
 }
 
diff --git a/tests/cases/phi24_ta2.ll b/tests/cases/phi24_ta2.ll
index 2d9b6646..18577fee 100644
--- a/tests/cases/phi24_ta2.ll
+++ b/tests/cases/phi24_ta2.ll
@@ -1,9 +1,6 @@
 
-;;; trunc i32 into i24, needs $0 on target variable name
-
-; ModuleID = '/tmp/tmpvqlBv2/a.out.bc'
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128"
-target triple = "i386-pc-linux-gnu"
+target datalayout = "e-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-p:32:32:32-v128:32:32"
+target triple = "le32-unknown-nacl"
 
 %union.U4 = type { i32 }
 %union.U3 = type { i8* }
diff --git a/tests/test_core.py b/tests/test_core.py
index 7ada3f53..9b072b90 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -4971,9 +4971,10 @@ def process(filename):
         if '' not in shortname: continue
         if os.environ.get('EMCC_FAST_COMPILER') == '1' and os.path.basename(shortname) in [
           'structparam', 'uadd_overflow_ta2', 'extendedprecision', 'issue_39', 'emptystruct', 'phinonexist', 'quotedlabel', 'oob_ta2', # invalid ir
-          'structphiparam', # pnacl limitation in ExpandStructRegs
+          'structphiparam', 'callwithstructural_ta2', # pnacl limitation in ExpandStructRegs
           'legalizer_ta2', '514_ta2', # pnacl limitation in not legalizing i104, i96, etc.
-          'longjmp_tiny', 'longjmp_tiny_phi', 'indirectbrphi', 'ptrtoint_blockaddr', # current fastcomp limitations FIXME
+          'longjmp_tiny', 'longjmp_tiny_phi', 'indirectbrphi', 'ptrtoint_blockaddr', 'quoted', # current fastcomp limitations FIXME
+          'sillyfuncast', # TODO very very soon XXX
         ]: continue
         if '_ta2' in shortname and not Settings.USE_TYPED_ARRAYS == 2:
           print self.skip('case "%s" only relevant for ta2' % shortname)