From 11d54dc1c61f74aa4cfa704ed97bf6c853a731e5 Mon Sep 17 00:00:00 2001
From: Mike Leany <55358344+mikeleany@users.noreply.github.com>
Date: Thu, 14 Oct 2021 12:10:20 -0600
Subject: [PATCH] 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.
---
 compiler/rustc_target/src/spec/aarch64_unknown_none.rs | 2 +-
 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 d74cd9edc59e2..9d3652790108c 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 89ed0ea532740..722409dd168ce 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: