commit d839ee1dcafc0c3ab8f0bad765152055444cfeba
author Jez Ng <jezng@fb.com> Tue Apr 13 11:45:41 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Tue Apr 13 17:00:59 2021 -0700
tree f0dc3b3f25514dad7156cbfe83c695a8c9a85f2c
parent 4e929c91905acfbbbb6b052fdabc80eebef6bb58

[lld-macho] arm64_32 executables are always PIE

This should fix the assert that's currently breaking the build.

GitOrigin-RevId: 84c52f3a19cb9a822c4a073dede1be1642453a65

MachO/Driver.cpp

diff --git a/MachO/Driver.cpp b/MachO/Driver.cpp
index 397157d..0d4768f 100644
--- a/MachO/Driver.cpp
+++ b/MachO/Driver.cpp
@@ -680,12 +680,15 @@
 static bool isPie(InputArgList &args) {
   if (config->outputType != MH_EXECUTE || args.hasArg(OPT_no_pie))
     return false;
-  if (config->target.Arch == AK_arm64 || config->target.Arch == AK_arm64e)
+  if (config->target.Arch == AK_arm64 || config->target.Arch == AK_arm64e ||
+      config->target.Arch == AK_arm64_32)
     return true;
 
   // TODO: add logic here as we support more archs. E.g. i386 should default
   // to PIE from 10.7
-  assert(config->target.Arch == AK_x86_64 || config->target.Arch == AK_x86_64h);
+  assert(config->target.Arch == AK_x86_64 ||
+         config->target.Arch == AK_x86_64h ||
+         config->target.Arch == AK_arm64_32);
 
   PlatformKind kind = config->target.Platform;
   if (kind == PlatformKind::macOS &&