diff options
| author | Brad Gibson <b2b@humanenginuity.com> | 2018-07-29 20:03:15 -0700 |
|---|---|---|
| committer | Brad Gibson <b2b@humanenginuity.com> | 2018-07-29 22:13:12 -0700 |
| commit | 56016cb1e02ece29f25c619b297f9c9797db821c (patch) | |
| tree | 70dd7a5658527a54769c7603e6e17bfe27985f86 /src/test/run-pass/thinlto | |
| parent | 6a78c0a10f2e719117fe4bb929bfb38549acfeec (diff) | |
| parent | 866a713258915e6cbb212d135f751a6a8c9e1c0a (diff) | |
| download | rust-56016cb1e02ece29f25c619b297f9c9797db821c.tar.gz rust-56016cb1e02ece29f25c619b297f9c9797db821c.zip | |
resolved upstream merge conflicts
Diffstat (limited to 'src/test/run-pass/thinlto')
| -rw-r--r-- | src/test/run-pass/thinlto/all-crates.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/thinlto/dylib-works.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/thinlto/msvc-imp-present.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/thinlto/thin-lto-inlines.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/thinlto/thin-lto-inlines2.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/thinlto/weak-works.rs | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/src/test/run-pass/thinlto/all-crates.rs b/src/test/run-pass/thinlto/all-crates.rs index 772a9ec8293..8d68202d711 100644 --- a/src/test/run-pass/thinlto/all-crates.rs +++ b/src/test/run-pass/thinlto/all-crates.rs @@ -10,7 +10,6 @@ // compile-flags: -Clto=thin // no-prefer-dynamic -// min-llvm-version 4.0 fn main() { println!("hello!"); diff --git a/src/test/run-pass/thinlto/dylib-works.rs b/src/test/run-pass/thinlto/dylib-works.rs index 3f54519d0d8..06df40f6142 100644 --- a/src/test/run-pass/thinlto/dylib-works.rs +++ b/src/test/run-pass/thinlto/dylib-works.rs @@ -9,7 +9,6 @@ // except according to those terms. // aux-build:dylib.rs -// min-llvm-version 4.0 extern crate dylib; diff --git a/src/test/run-pass/thinlto/msvc-imp-present.rs b/src/test/run-pass/thinlto/msvc-imp-present.rs index 8329c7032f1..95cff2a2862 100644 --- a/src/test/run-pass/thinlto/msvc-imp-present.rs +++ b/src/test/run-pass/thinlto/msvc-imp-present.rs @@ -10,7 +10,6 @@ // aux-build:msvc-imp-present.rs // compile-flags: -Z thinlto -C codegen-units=8 -// min-llvm-version: 4.0 // no-prefer-dynamic // On MSVC we have a "hack" where we emit symbols that look like `_imp_$name` diff --git a/src/test/run-pass/thinlto/thin-lto-inlines.rs b/src/test/run-pass/thinlto/thin-lto-inlines.rs index 7a71dd2bc51..41ca983af51 100644 --- a/src/test/run-pass/thinlto/thin-lto-inlines.rs +++ b/src/test/run-pass/thinlto/thin-lto-inlines.rs @@ -9,7 +9,6 @@ // except according to those terms. // compile-flags: -Z thinlto -C codegen-units=8 -O -// min-llvm-version 4.0 // ignore-emscripten can't inspect instructions on emscripten // We want to assert here that ThinLTO will inline across codegen units. There's diff --git a/src/test/run-pass/thinlto/thin-lto-inlines2.rs b/src/test/run-pass/thinlto/thin-lto-inlines2.rs index 6020f72415d..3c0e904662a 100644 --- a/src/test/run-pass/thinlto/thin-lto-inlines2.rs +++ b/src/test/run-pass/thinlto/thin-lto-inlines2.rs @@ -10,7 +10,6 @@ // compile-flags: -C codegen-units=8 -O -C lto=thin // aux-build:thin-lto-inlines-aux.rs -// min-llvm-version 4.0 // no-prefer-dynamic // ignore-emscripten can't inspect instructions on emscripten diff --git a/src/test/run-pass/thinlto/weak-works.rs b/src/test/run-pass/thinlto/weak-works.rs index b9719e04f34..0a1b7307a46 100644 --- a/src/test/run-pass/thinlto/weak-works.rs +++ b/src/test/run-pass/thinlto/weak-works.rs @@ -10,7 +10,6 @@ // compile-flags: -C codegen-units=8 -Z thinlto // ignore-windows -// min-llvm-version 4.0 #![feature(linkage)] |