1 files changed, 29 insertions, 0 deletions
diff --git a/user/rust/0015-Use-ELFv2-ABI-on-powerpc64-musl-LLVM-half.patch b/user/rust/0015-Use-ELFv2-ABI-on-powerpc64-musl-LLVM-half.patch
new file mode 100644
index 000000000..72743d01d
--- /dev/null
+++ b/user/rust/0015-Use-ELFv2-ABI-on-powerpc64-musl-LLVM-half.patch
@@ -0,0 +1,29 @@
+From 91000b21e3a9938a66b7a9d12281b807004eefcc Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Wed, 8 Aug 2018 22:06:09 -0500
+Subject: [PATCH 15/28] Use ELFv2 ABI on powerpc64 musl (LLVM half)
+
+---
+ src/rustllvm/PassWrapper.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp
+index 85fbc4bf37..15c3ab18d9 100644
+--- a/src/rustllvm/PassWrapper.cpp
++++ b/src/rustllvm/PassWrapper.cpp
+@@ -399,6 +399,12 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(
+     Options.ThreadModel = ThreadModel::Single;
+   }
+ 
++  // See https://reviews.llvm.org/D52013
++  if (Trip.getArch() == llvm::Triple::ArchType::ppc64 &&
++      Trip.getEnvironment() == llvm::Triple::EnvironmentType::Musl) {
++    Options.MCOptions.ABIName = "elfv2";
++  }
++
+ #if LLVM_VERSION_GE(6, 0)
+   Optional<CodeModel::Model> CM;
+ #else
+-- 
+2.18.0
+