13 files changed, 24 insertions, 15 deletions
diff --git a/polly/test/CMakeLists.txt b/polly/test/CMakeLists.txt
index c433ebe881d..7d7f781e09a 100644
--- a/polly/test/CMakeLists.txt
+++ b/polly/test/CMakeLists.txt
@@ -33,6 +33,14 @@ else (NOT DEFINED LLVM_MAIN_SRC_DIR)
   set(POLLY_LIB_DIR "${LLVM_LIBS_DIR}")
 endif (NOT DEFINED LLVM_MAIN_SRC_DIR)
 
+MESSAGE(${TARGET_TRIPLE})
+if (${TARGET_TRIPLE} MATCHES "^x86_64*")
+  set(EAT_ERR_ON_X86 " ")
+else (${TARGET_TRIPLE} MATCHES "^x86_64*")
+  # Don't fail the command line
+  set(EAT_ERR_ON_X86 "|| echo \"error is eaten\"")
+endif (${TARGET_TRIPLE} MATCHES "^x86_64*")
+
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
diff --git a/polly/test/CodeGen/do_pluto_matmult.ll b/polly/test/CodeGen/do_pluto_matmult.ll
index a90eb8ad027..34f3c05aa5a 100644
--- a/polly/test/CodeGen/do_pluto_matmult.ll
+++ b/polly/test/CodeGen/do_pluto_matmult.ll
@@ -3,8 +3,8 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -analyze  %s | FileCheck -check-prefix=IMPORT %s
 ; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=valid_reverse -polly-cloog -analyze %s | FileCheck -check-prefix=REVERSE %s > /dev/null
 ; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-import-jscop-postfix=invalid_reverse -polly-cloog -analyze %s 2>&1  | FileCheck -check-prefix=INVALID %s > /dev/null
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -analyze  %s | FileCheck -check-prefix=IMPORT %s 
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-codegen %s | lli | diff %s.result -
+; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-cloog -analyze  %s | FileCheck -check-prefix=IMPORT %s
+; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-codegen %s | lli | diff %s.result -  %EatErrOnX86
 ; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%S -polly-codegen -S %s | FileCheck -check-prefix=CODEGEN %s
 
 
diff --git a/polly/test/CodeGen/loop_with_condition.ll b/polly/test/CodeGen/loop_with_condition.ll
index 5eca76b8ec9..db5b9c18cac 100644
--- a/polly/test/CodeGen/loop_with_condition.ll
+++ b/polly/test/CodeGen/loop_with_condition.ll
@@ -1,6 +1,6 @@
 ; ModuleID = 'loop_with_condition.s'
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli
+; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli %EatErrOnX86
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-pc-linux-gnu"
diff --git a/polly/test/CodeGen/loop_with_condition_2.ll b/polly/test/CodeGen/loop_with_condition_2.ll
index ed90209da22..dd02e58133c 100644
--- a/polly/test/CodeGen/loop_with_condition_2.ll
+++ b/polly/test/CodeGen/loop_with_condition_2.ll
@@ -1,5 +1,5 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli
+; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli %EatErrOnX86
 
 ; ModuleID = 'loop_with_condition_2.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
diff --git a/polly/test/CodeGen/loop_with_condition_ineq.ll b/polly/test/CodeGen/loop_with_condition_ineq.ll
index 1bc936efa5f..d434e4ee6b9 100644
--- a/polly/test/CodeGen/loop_with_condition_ineq.ll
+++ b/polly/test/CodeGen/loop_with_condition_ineq.ll
@@ -1,6 +1,6 @@
 ; ModuleID = 'loop_with_condition_ineq.s'
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli
+; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli %EatErrOnX86
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-pc-linux-gnu"
 
diff --git a/polly/test/CodeGen/loop_with_condition_nested.ll b/polly/test/CodeGen/loop_with_condition_nested.ll
index 6e4e52c9c7c..b686f71ff52 100644
--- a/polly/test/CodeGen/loop_with_condition_nested.ll
+++ b/polly/test/CodeGen/loop_with_condition_nested.ll
@@ -1,5 +1,5 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli
+; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli %EatErrOnX86
 ; ModuleID = 'loop_with_condition_nested.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-pc-linux-gnu"
diff --git a/polly/test/CodeGen/reduction_2.ll b/polly/test/CodeGen/reduction_2.ll
index d1a791888fc..51a38da9eba 100644
--- a/polly/test/CodeGen/reduction_2.ll
+++ b/polly/test/CodeGen/reduction_2.ll
@@ -1,5 +1,5 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli
+; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli %EatErrOnX86
 ; ModuleID = 'reduction_2.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/polly/test/CodeGen/sequential_loops.ll b/polly/test/CodeGen/sequential_loops.ll
index bc80f9707d2..6893a836caf 100644
--- a/polly/test/CodeGen/sequential_loops.ll
+++ b/polly/test/CodeGen/sequential_loops.ll
@@ -1,5 +1,5 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli -
+; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli - %EatErrOnX86
 ; ModuleID = 'sequential_loops.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-pc-linux-gnu"
diff --git a/polly/test/CodeGen/single_do_loop_int_max_iterations.ll b/polly/test/CodeGen/single_do_loop_int_max_iterations.ll
index 588bb4adb10..b2fa1e61bad 100644
--- a/polly/test/CodeGen/single_do_loop_int_max_iterations.ll
+++ b/polly/test/CodeGen/single_do_loop_int_max_iterations.ll
@@ -1,7 +1,7 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze  -S %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -O3 %s | lli
-; RUN: opt %loadPolly %defaultOpts -polly-codegen -O3 %s | lli
-; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%d -polly-codegen %s | lli
+; RUN: opt %loadPolly %defaultOpts -O3 %s | lli %EatErrOnX86
+; RUN: opt %loadPolly %defaultOpts -polly-codegen -O3 %s | lli %EatErrOnX86
+; RUN: opt %loadPolly %defaultOpts -polly-import-jscop -polly-import-jscop-dir=%d -polly-codegen %s | lli %EatErrOnX86
 ; ModuleID = 'single_do_loop_int_max_iterations.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/polly/test/CodeGen/single_do_loop_scev_replace.ll b/polly/test/CodeGen/single_do_loop_scev_replace.ll
index 1121aacb9b2..7fdfad62af9 100644
--- a/polly/test/CodeGen/single_do_loop_scev_replace.ll
+++ b/polly/test/CodeGen/single_do_loop_scev_replace.ll
@@ -1,6 +1,6 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts %s | lli
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli
+; RUN: opt %loadPolly %defaultOpts %s | lli %EatErrOnX86
+; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli %EatErrOnX86
 ; ModuleID = 'single_do_loop_scev_replace.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/polly/test/CodeGen/single_loop.ll b/polly/test/CodeGen/single_loop.ll
index d5a9f5d98ae..7bb2675645f 100644
--- a/polly/test/CodeGen/single_loop.ll
+++ b/polly/test/CodeGen/single_loop.ll
@@ -1,5 +1,5 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli -
+; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli - %EatErrOnX86
 ; ModuleID = 'single_loop.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/polly/test/CodeGen/single_loop_param.ll b/polly/test/CodeGen/single_loop_param.ll
index 149351f86d3..02b45845bd1 100644
--- a/polly/test/CodeGen/single_loop_param.ll
+++ b/polly/test/CodeGen/single_loop_param.ll
@@ -1,5 +1,5 @@
 ; RUN: opt %loadPolly %defaultOpts -polly-cloog -analyze %s | FileCheck %s
-; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli -
+; RUN: opt %loadPolly %defaultOpts -polly-codegen %s | lli - %EatErrOnX86
 ; ModuleID = 'single_loop_param.s'
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
 target triple = "x86_64-pc-linux-gnu"
diff --git a/polly/test/lit.site.cfg.in b/polly/test/lit.site.cfg.in
index 64f140cdcae..9f366caa1d8 100644
--- a/polly/test/lit.site.cfg.in
+++ b/polly/test/lit.site.cfg.in
@@ -22,6 +22,7 @@ config.substitutions.append(('%loadPolly', '-load '
                              + config.polly_lib_dir + '/LLVMPolly@LLVM_SHLIBEXT@'))
 config.substitutions.append(('%defaultOpts', ' -basicaa -polly-prepare -polly-region-simplify -scev-aa '))
 config.substitutions.append(('%polybenchOpts', ' -O3 -loop-simplify -indvars '))
+config.substitutions.append(('%EatErrOnX86', '@EAT_ERR_ON_X86@'))
 
 # Let the main config do the real work.
 lit.load_config(config, "@POLLY_SOURCE_DIR@/test/lit.cfg")