diff options
| author | Michael Woerister <michaelwoerister@posteo> | 2018-08-06 11:16:28 +0200 |
|---|---|---|
| committer | Michael Woerister <michaelwoerister@posteo> | 2018-08-08 13:40:23 +0200 |
| commit | 3a7005037726263c0beffd0efc3d5d147b2a86b4 (patch) | |
| tree | 04a46edf3164675a2bcaa21f1e11a5ff2ef8c3d8 /src/test | |
| parent | b27a161939620626ca5fdcb9f4dd486a6ed1e827 (diff) | |
| download | rust-3a7005037726263c0beffd0efc3d5d147b2a86b4.tar.gz rust-3a7005037726263c0beffd0efc3d5d147b2a86b4.zip | |
Address review comments for #53031 and fix some merge fallout.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/codegen/no-dllimport-w-cross-lang-lto.rs | 2 | ||||
| -rw-r--r-- | src/test/codegen/target-cpu-on-functions.rs | 4 | ||||
| -rw-r--r-- | src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/test/codegen/no-dllimport-w-cross-lang-lto.rs b/src/test/codegen/no-dllimport-w-cross-lang-lto.rs index 025e7cbf179..0d5d02206a6 100644 --- a/src/test/codegen/no-dllimport-w-cross-lang-lto.rs +++ b/src/test/codegen/no-dllimport-w-cross-lang-lto.rs @@ -13,7 +13,7 @@ // no-prefer-dynamic // only-msvc -// compile-flags: -C no-prepopulate-passes -Z cross-lang-lto +// compile-flags: -Z cross-lang-lto #![crate_type = "rlib"] diff --git a/src/test/codegen/target-cpu-on-functions.rs b/src/test/codegen/target-cpu-on-functions.rs index c2765a46caa..1a6ab22e568 100644 --- a/src/test/codegen/target-cpu-on-functions.rs +++ b/src/test/codegen/target-cpu-on-functions.rs @@ -11,8 +11,10 @@ // This test makes sure that functions get annotated with the proper // "target-cpu" attribute in LLVM. +// no-prefer-dynamic +// ignore-tidy-linelength // only-x86_64 -// compile-flags: -C no-prepopulate-passes -C panic=abort +// compile-flags: -C no-prepopulate-passes -C panic=abort -Z cross-lang-lto -Cpasses=name-anon-globals #![crate_type = "staticlib"] diff --git a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile index de42c6e0eb5..0a6f226a027 100644 --- a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile +++ b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile @@ -11,7 +11,7 @@ all: staticlib.rs upstream.rs $(RUSTC) staticlib.rs -Z cross-lang-lto -Ccodegen-units=1 -L. -o $(TMPDIR)/staticlib.a (cd $(TMPDIR); llvm-ar x ./staticlib.a) # Make sure the upstream object file was included - ls upstream.*.rcgu.o + ls $(TMPDIR)/upstream.*.rcgu.o # Cleanup rm $(TMPDIR)/* @@ -20,4 +20,4 @@ all: staticlib.rs upstream.rs $(RUSTC) upstream.rs -Z cross-lang-lto -Ccodegen-units=1 -Clto=thin $(RUSTC) staticlib.rs -Z cross-lang-lto -Ccodegen-units=1 -Clto=thin -L. -o $(TMPDIR)/staticlib.a (cd $(TMPDIR); llvm-ar x ./staticlib.a) - ls upstream.*.rcgu.o + ls $(TMPDIR)/upstream.*.rcgu.o |