Skip to content

Commit f455e46

Browse files
committedJun 20, 2020
Auto merge of #73550 - RalfJung:rollup-5huj1k1, r=RalfJung
Rollup of 9 pull requests Successful merges: - #72600 (Properly encode AnonConst into crate metadata) - #73055 (remove leftover mentions of `skol` and `int` from the compiler) - #73058 (Support sanitizers on aarch64-unknown-linux-gnu) - #73171 (RISC-V Emulated Testing) - #73404 (Update CFGuard syntax) - #73444 (ci: disable alt build during try builds) - #73471 (Prevent attacker from manipulating FPU tag word used in SGX enclave) - #73539 (Deprecate `Vec::remove_item`) - #73543 (Clean up E0695 explanation) Failed merges: r? @ghost
2 parents 033013c + bb0016b commit f455e46

File tree

57 files changed

+545
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+545
-299
lines changed
 

‎.github/workflows/ci.yml

-4
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,6 @@ jobs:
152152
- name: dist-x86_64-linux
153153
os: ubuntu-latest-xl
154154
env: {}
155-
- name: dist-x86_64-linux-alt
156-
env:
157-
IMAGE: dist-x86_64-linux
158-
os: ubuntu-latest-xl
159155
timeout-minutes: 600
160156
runs-on: "${{ matrix.os }}"
161157
steps:

‎src/bootstrap/builder.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ impl<'a> Builder<'a> {
12061206
);
12071207
}
12081208

1209-
// If Control Flow Guard is enabled, pass the `control_flow_guard=checks` flag to rustc
1209+
// If Control Flow Guard is enabled, pass the `control-flow-guard` flag to rustc
12101210
// when compiling the standard library, since this might be linked into the final outputs
12111211
// produced by rustc. Since this mitigation is only available on Windows, only enable it
12121212
// for the standard library in case the compiler is run on a non-Windows platform.
@@ -1217,7 +1217,7 @@ impl<'a> Builder<'a> {
12171217
&& self.config.control_flow_guard
12181218
&& compiler.stage >= 1
12191219
{
1220-
rustflags.arg("-Zcontrol_flow_guard=checks");
1220+
rustflags.arg("-Zcontrol-flow-guard");
12211221
}
12221222

12231223
// For `cargo doc` invocations, make rustdoc print the Rust version into the docs

0 commit comments

Comments
 (0)