Index: lib/Basic/Targets/OSTargets.h
===================================================================
--- lib/Basic/Targets/OSTargets.h
+++ lib/Basic/Targets/OSTargets.h
@@ -266,7 +266,6 @@
     this->IntPtrType = TargetInfo::SignedLong;
     this->PtrDiffType = TargetInfo::SignedLong;
     this->ProcessIDType = TargetInfo::SignedLong;
-    this->TLSSupported = false;
   }
 };

Index: lib/Driver/ToolChains/Haiku.h
===================================================================
--- lib/Driver/ToolChains/Haiku.h
+++ lib/Driver/ToolChains/Haiku.h
@@ -23,9 +23,7 @@
   Haiku(const Driver &D, const llvm::Triple &Triple,
           const llvm::opt::ArgList &Args);

-  bool isPIEDefault() const override {
-    return getTriple().getArch() == llvm::Triple::x86_64;
-  }
+  bool isPIEDefault() const override { return false; }

   void addLibCxxIncludePaths(
       const llvm::opt::ArgList &DriverArgs,