auto merge of #17421 : anchovieshat/rust/move_lto, r=thestinger

Closes #12443

7 files changed, 8 insertions, 8 deletions

diff --git a/src/test/compile-fail/issue-11154.rs b/src/test/compile-fail/issue-11154.rs
index aac5eebaf4a..1ff68123374 100644
--- a/src/test/compile-fail/issue-11154.rs
+++ b/src/test/compile-fail/issue-11154.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// compile-flags: -Z lto -C prefer-dynamic
+// compile-flags: -C lto -C prefer-dynamic
 
 // error-pattern: cannot prefer dynamic linking
 
diff --git a/src/test/debuginfo/cross-crate-type-uniquing.rs b/src/test/debuginfo/cross-crate-type-uniquing.rs
index 8f718add2a3..4a29ecff06f 100644
--- a/src/test/debuginfo/cross-crate-type-uniquing.rs
+++ b/src/test/debuginfo/cross-crate-type-uniquing.rs
@@ -14,7 +14,7 @@
 extern crate cross_crate_debuginfo_type_uniquing;
 
 // no-prefer-dynamic
-// compile-flags:-g -Zlto
+// compile-flags:-g -C lto
 
 pub struct C;
 pub fn p() -> C {
diff --git a/src/test/run-make/issue-14500/Makefile b/src/test/run-make/issue-14500/Makefile
index c1087b0f55e..446c6e5c81b 100644
--- a/src/test/run-make/issue-14500/Makefile
+++ b/src/test/run-make/issue-14500/Makefile
@@ -8,7 +8,7 @@
 
 all:
 	$(RUSTC) foo.rs --crate-type=rlib
-	$(RUSTC) bar.rs --crate-type=staticlib -Zlto -L. -o $(TMPDIR)/libbar.a
+	$(RUSTC) bar.rs --crate-type=staticlib -C lto -L. -o $(TMPDIR)/libbar.a
 	$(CC) foo.c -lbar -o $(call RUN_BINFILE,foo) $(EXTRACFLAGS)
 	$(call RUN,foo)
 
diff --git a/src/test/run-make/lto-smoke-c/Makefile b/src/test/run-make/lto-smoke-c/Makefile
index 6c7e9aa1d59..c678a3c472b 100644
--- a/src/test/run-make/lto-smoke-c/Makefile
+++ b/src/test/run-make/lto-smoke-c/Makefile
@@ -4,6 +4,6 @@
 CC := $(CC:-g=)
 
 all:
-	$(RUSTC) foo.rs -Z lto
+	$(RUSTC) foo.rs -C lto
 	$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(EXTRACFLAGS) -lstdc++
 	$(call RUN,bar)
diff --git a/src/test/run-make/lto-smoke/Makefile b/src/test/run-make/lto-smoke/Makefile
index 4652556d344..020252e1f8c 100644
--- a/src/test/run-make/lto-smoke/Makefile
+++ b/src/test/run-make/lto-smoke/Makefile
@@ -2,5 +2,5 @@
 
 all:
 	$(RUSTC) lib.rs
-	$(RUSTC) main.rs -Z lto
+	$(RUSTC) main.rs -C lto
 	$(call RUN,main)
diff --git a/src/test/run-make/lto-syntax-extension/Makefile b/src/test/run-make/lto-syntax-extension/Makefile
index c522f30e2df..5f2b7a701a7 100644
--- a/src/test/run-make/lto-syntax-extension/Makefile
+++ b/src/test/run-make/lto-syntax-extension/Makefile
@@ -14,5 +14,5 @@ all: $(DOTEST)
 dotest:
 	env
 	$(RUSTC) lib.rs
-	$(RUSTC) main.rs -Z lto
+	$(RUSTC) main.rs -C lto
 	$(call RUN,main)
diff --git a/src/test/run-pass/sepcomp-lib-lto.rs b/src/test/run-pass/sepcomp-lib-lto.rs
index 51fd83a54cc..f0b6a505929 100644
--- a/src/test/run-pass/sepcomp-lib-lto.rs
+++ b/src/test/run-pass/sepcomp-lib-lto.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Check that we can use `-Z lto` when linking against libraries that were
+// Check that we can use `-C lto` when linking against libraries that were
 // separately compiled.
 
 // aux-build:sepcomp_lib.rs
-// compile-flags: -Z lto
+// compile-flags: -C lto
 // no-prefer-dynamic
 
 extern crate sepcomp_lib;