bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rollup merge of #88820 - hlopko:add_pie_relocation_model, r=petrochenkov

Browse source 
Add `pie` as another `relocation-model` value

MCP: https://github.com/rust-lang/compiler-team/issues/461
This commit is contained in:
Manish Goregaokar 2021-10-01 09:18:16 -07:00 • committed by GitHub
commit 6f1e930581
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 147 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_target/src/spec/mod.rs
View file

@ -288,6 +288,7 @@ impl ToJson for MergeFunctions {
pub enum RelocModel {
Static,
Pic,
Pie,
DynamicNoPic,
Ropi,
Rwpi,
@ -301,6 +302,7 @@ impl FromStr for RelocModel {
Ok(match s {
"static" => RelocModel::Static,
"pic" => RelocModel::Pic,
"pie" => RelocModel::Pie,
"dynamic-no-pic" => RelocModel::DynamicNoPic,
"ropi" => RelocModel::Ropi,
"rwpi" => RelocModel::Rwpi,
@ -315,6 +317,7 @@ impl ToJson for RelocModel {
match *self {
RelocModel::Static => "static",
RelocModel::Pic => "pic",
RelocModel::Pie => "pie",
RelocModel::DynamicNoPic => "dynamic-no-pic",
RelocModel::Ropi => "ropi",
RelocModel::Rwpi => "rwpi",