Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Enable Rust to use the EHCont security feature of Windows #118013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 22, 2023
Merged

Enable Rust to use the EHCont security feature of Windows #118013

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e11d8d1
Add support for generating the EHCont section
sivadeilra Nov 17, 2023
d582f10
x.py fmt
sivadeilra Nov 17, 2023
9429d68
convert ehcont-guard to an unstable option
sivadeilra Nov 21, 2023
80896cb
update -Cehcont-guard and comment
sivadeilra Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update -Cehcont-guard and comment
  • Loading branch information
@sivadeilra
sivadeilra committed Nov 21, 2023
commit 80896cbe351aa31ddc2f805c71e7eff85495d902
10 changes: 7 additions & 3 deletions src/bootstrap/src/core/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1964,10 +1964,14 @@ impl<'a> Builder<'a> {
rustflags.arg("-Ccontrol-flow-guard");
}

// Same for EHCont Guard (this is not combined with the previous if-statement to make
// merges with upstream easier).
// If EHCont Guard is enabled, pass the `-Zehcont-guard` flag to rustc when compiling the
// standard library, since this might be linked into the final outputs produced by rustc.
// Since this mitigation is only available on Windows, only enable it for the standard
// library in case the compiler is run on a non-Windows platform.
// This is not needed for stage 0 artifacts because these will only be used for building
// the stage 1 compiler.
if cfg!(windows) && mode == Mode::Std && self.config.ehcont_guard && compiler.stage >= 1 {
rustflags.arg("-Cehcont-guard");
rustflags.arg("-Zehcont-guard");
}

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