+@@ -8773,9 +8773,18 @@
+
+ const llvm::Triple::ArchType Arch = ToolChain.getArch();
+ const bool isAndroid = ToolChain.getTriple().isAndroid();
+ const bool IsPIE =
+ !Args.hasArg(options::OPT_shared) && !Args.hasArg(options::OPT_static) &&
+- (Args.hasArg(options::OPT_pie) || ToolChain.isPIEDefault());
++ (Args.hasArg(options::OPT_pie) || ToolChain.isPIEDefault()
++ /* Termux modification: Revert
++ http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20150302/124624.html
++ as we really want pie by default: */
++ // On Android every code is PIC so every executable is PIE
++ // Cannot use isPIEDefault here since otherwise
++ // PIE only logic will be enabled during compilation
++ || isAndroid)
++ && !Args.hasArg(options::OPT_nopie);
++
+ const bool HasCRTBeginEndFiles =
+ ToolChain.getTriple().hasEnvironment() ||
+ (ToolChain.getTriple().getVendor() != llvm::Triple::MipsTechnologies);