diff options
| author | Mike Leany <55358344+mikeleany@users.noreply.github.com> | 2021-10-14 12:10:20 -0600 |
|---|---|---|
| committer | Mike Leany <55358344+mikeleany@users.noreply.github.com> | 2021-10-14 12:10:20 -0600 |
| commit | 11d54dc1c61f74aa4cfa704ed97bf6c853a731e5 (patch) | |
| tree | 7d461152bc0d33600fc98553ad9ab0669a21d25c | |
| parent | 3a1879299e8742e9193569152bef3f997c51e0ea (diff) | |
| download | rust-11d54dc1c61f74aa4cfa704ed97bf6c853a731e5.tar.gz rust-11d54dc1c61f74aa4cfa704ed97bf6c853a731e5.zip | |
Fix issue where PIC was added to the wrong target.
Should be for x86_64_unknown_none, but aarch64_unknown_none was inadvertently updated instead.
| -rw-r--r-- | compiler/rustc_target/src/spec/aarch64_unknown_none.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_target/src/spec/x86_64_unknown_none.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_none.rs b/compiler/rustc_target/src/spec/aarch64_unknown_none.rs index d74cd9edc59..9d365279010 100644 --- a/compiler/rustc_target/src/spec/aarch64_unknown_none.rs +++ b/compiler/rustc_target/src/spec/aarch64_unknown_none.rs @@ -14,7 +14,7 @@ pub fn target() -> Target { linker: Some("rust-lld".to_owned()), features: "+strict-align,+neon,+fp-armv8".to_string(), executables: true, - relocation_model: RelocModel::Pic, + relocation_model: RelocModel::Static, disable_redzone: true, max_atomic_width: Some(128), panic_strategy: PanicStrategy::Abort, diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/x86_64_unknown_none.rs index 89ed0ea5327..722409dd168 100644 --- a/compiler/rustc_target/src/spec/x86_64_unknown_none.rs +++ b/compiler/rustc_target/src/spec/x86_64_unknown_none.rs @@ -18,7 +18,7 @@ pub fn target() -> Target { position_independent_executables: true, static_position_independent_executables: true, relro_level: RelroLevel::Full, - relocation_model: RelocModel::Static, + relocation_model: RelocModel::Pic, linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld), linker: Some("rust-lld".to_owned()), features: |
