Auto merge of #88354 - Jmc18134:hint-space-pauth-opt, r=nagisa
Add codegen option for branch protection and pointer authentication on AArch64 The branch-protection codegen option enables the use of hint-space pointer authentication code for AArch64 targets.
This commit is contained in:
commit
d331cb710f
13 changed files with 202 additions and 6 deletions
|
@ -843,6 +843,30 @@ impl Passes {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Hash, Debug, PartialEq)]
|
||||
pub enum PAuthKey {
|
||||
A,
|
||||
B,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Hash, Debug, PartialEq)]
|
||||
pub struct PacRet {
|
||||
pub leaf: bool,
|
||||
pub key: PAuthKey,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Hash, Debug, PartialEq)]
|
||||
pub struct BranchProtection {
|
||||
pub bti: bool,
|
||||
pub pac_ret: Option<PacRet>,
|
||||
}
|
||||
|
||||
impl Default for BranchProtection {
|
||||
fn default() -> Self {
|
||||
BranchProtection { bti: false, pac_ret: None }
|
||||
}
|
||||
}
|
||||
|
||||
pub const fn default_lib_output() -> CrateType {
|
||||
CrateType::Rlib
|
||||
}
|
||||
|
@ -2497,9 +2521,9 @@ impl PpMode {
|
|||
crate mod dep_tracking {
|
||||
use super::LdImpl;
|
||||
use super::{
|
||||
CFGuard, CrateType, DebugInfo, ErrorOutputType, InstrumentCoverage, LinkerPluginLto,
|
||||
LocationDetail, LtoCli, OptLevel, OutputType, OutputTypes, Passes, SourceFileHashAlgorithm,
|
||||
SwitchWithOptPath, SymbolManglingVersion, TrimmedDefPaths,
|
||||
BranchProtection, CFGuard, CrateType, DebugInfo, ErrorOutputType, InstrumentCoverage,
|
||||
LinkerPluginLto, LocationDetail, LtoCli, OptLevel, OutputType, OutputTypes, Passes,
|
||||
SourceFileHashAlgorithm, SwitchWithOptPath, SymbolManglingVersion, TrimmedDefPaths,
|
||||
};
|
||||
use crate::lint;
|
||||
use crate::options::WasiExecModel;
|
||||
|
@ -2593,6 +2617,7 @@ crate mod dep_tracking {
|
|||
OutputType,
|
||||
RealFileName,
|
||||
LocationDetail,
|
||||
BranchProtection,
|
||||
);
|
||||
|
||||
impl<T1, T2> DepTrackingHash for (T1, T2)
|
||||
|
|
|
@ -415,6 +415,8 @@ mod desc {
|
|||
pub const parse_gcc_ld: &str = "one of: no value, `lld`";
|
||||
pub const parse_stack_protector: &str =
|
||||
"one of (`none` (default), `basic`, `strong`, or `all`)";
|
||||
pub const parse_branch_protection: &str =
|
||||
"a `,` separated combination of `bti`, `b-key`, `pac-ret`, or `leaf`";
|
||||
}
|
||||
|
||||
mod parse {
|
||||
|
@ -955,6 +957,32 @@ mod parse {
|
|||
}
|
||||
true
|
||||
}
|
||||
|
||||
crate fn parse_branch_protection(slot: &mut BranchProtection, v: Option<&str>) -> bool {
|
||||
match v {
|
||||
Some(s) => {
|
||||
for opt in s.split(',') {
|
||||
match opt {
|
||||
"bti" => slot.bti = true,
|
||||
"pac-ret" if slot.pac_ret.is_none() => {
|
||||
slot.pac_ret = Some(PacRet { leaf: false, key: PAuthKey::A })
|
||||
}
|
||||
"leaf" => match slot.pac_ret.as_mut() {
|
||||
Some(pac) => pac.leaf = true,
|
||||
_ => return false,
|
||||
},
|
||||
"b-key" => match slot.pac_ret.as_mut() {
|
||||
Some(pac) => pac.key = PAuthKey::B,
|
||||
_ => return false,
|
||||
},
|
||||
_ => return false,
|
||||
};
|
||||
}
|
||||
}
|
||||
_ => return false,
|
||||
}
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
options! {
|
||||
|
@ -1096,6 +1124,8 @@ options! {
|
|||
(default: no)"),
|
||||
borrowck: String = ("migrate".to_string(), parse_string, [UNTRACKED],
|
||||
"select which borrowck is used (`mir` or `migrate`) (default: `migrate`)"),
|
||||
branch_protection: BranchProtection = (BranchProtection::default(), parse_branch_protection, [TRACKED],
|
||||
"set options for branch target identification and pointer authentication on AArch64"),
|
||||
cgu_partitioning_strategy: Option<String> = (None, parse_opt_string, [TRACKED],
|
||||
"the codegen unit partitioning strategy to use"),
|
||||
chalk: bool = (false, parse_bool, [TRACKED],
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue