68 lines
2.3 KiB
Diff
68 lines
2.3 KiB
Diff
|
From 8a1f3d066d9c6f97a55958f8d638ae98957e8962 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Josh Stone <jistone@redhat.com>
|
||
|
|
Date: Tue, 30 Jan 2018 16:47:30 -0800
|
||
|
|
Subject: [PATCH 1/2] Enable stack-probe tests with system LLVM >= 5.0
|
||
|
|
|
||
|
|
---
|
||
|
|
src/test/codegen/stack-probes.rs | 2 +-
|
||
|
|
src/test/run-pass/stack-probes-lto.rs | 2 +-
|
||
|
|
src/test/run-pass/stack-probes.rs | 2 +-
|
||
|
|
src/tools/compiletest/src/header.rs | 2 +-
|
||
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/test/codegen/stack-probes.rs b/src/test/codegen/stack-probes.rs
|
||
|
|
index 5b26dade9aff..4a489f1edb3b 100644
|
||
|
|
--- a/src/test/codegen/stack-probes.rs
|
||
|
|
+++ b/src/test/codegen/stack-probes.rs
|
||
|
|
@@ -15,7 +15,7 @@
|
||
|
|
// ignore-wasm
|
||
|
|
// ignore-emscripten
|
||
|
|
// ignore-windows
|
||
|
|
-// no-system-llvm
|
||
|
|
+// min-system-llvm-version 5.0
|
||
|
|
// compile-flags: -C no-prepopulate-passes
|
||
|
|
|
||
|
|
#![crate_type = "lib"]
|
||
|
|
diff --git a/src/test/run-pass/stack-probes-lto.rs b/src/test/run-pass/stack-probes-lto.rs
|
||
|
|
index 78a1019578e3..33d4c63582e8 100644
|
||
|
|
--- a/src/test/run-pass/stack-probes-lto.rs
|
||
|
|
+++ b/src/test/run-pass/stack-probes-lto.rs
|
||
|
|
@@ -14,7 +14,7 @@
|
||
|
|
// ignore-emscripten no processes
|
||
|
|
// ignore-musl FIXME #31506
|
||
|
|
// ignore-pretty
|
||
|
|
-// no-system-llvm
|
||
|
|
+// min-system-llvm-version 5.0
|
||
|
|
// compile-flags: -C lto
|
||
|
|
// no-prefer-dynamic
|
||
|
|
|
||
|
|
diff --git a/src/test/run-pass/stack-probes.rs b/src/test/run-pass/stack-probes.rs
|
||
|
|
index bb9471e1b48b..6fbb85dda15a 100644
|
||
|
|
--- a/src/test/run-pass/stack-probes.rs
|
||
|
|
+++ b/src/test/run-pass/stack-probes.rs
|
||
|
|
@@ -13,7 +13,7 @@
|
||
|
|
// ignore-wasm
|
||
|
|
// ignore-emscripten no processes
|
||
|
|
// ignore-musl FIXME #31506
|
||
|
|
-// no-system-llvm
|
||
|
|
+// min-system-llvm-version 5.0
|
||
|
|
|
||
|
|
use std::mem;
|
||
|
|
use std::process::Command;
|
||
|
|
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
|
||
|
|
index 1f736e33c8b2..6908f3b5cf28 100644
|
||
|
|
--- a/src/tools/compiletest/src/header.rs
|
||
|
|
+++ b/src/tools/compiletest/src/header.rs
|
||
|
|
@@ -163,7 +163,7 @@ impl EarlyProps {
|
||
|
|
.expect("Malformed llvm version directive");
|
||
|
|
// Ignore if using system LLVM and actual version
|
||
|
|
// is smaller the minimum required version
|
||
|
|
- !(config.system_llvm && &actual_version[..] < min_version)
|
||
|
|
+ config.system_llvm && &actual_version[..] < min_version
|
||
|
|
} else {
|
||
|
|
false
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.14.3
|
||
|
|
|