diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-10-11 06:07:46 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-10-11 06:07:46 +0000 |
| commit | 11597b8939720fb5246c41482d873bce2ef8235e (patch) | |
| tree | 5e68deee8c43ec66acf35f8eca89f5cc71ff81d7 /user/rust/0015-Use-ELFv2-ABI-on-powerpc64-musl-LLVM-half.patch | |
| parent | 3c5a215212a76932481c316d1259f4dc15c061fa (diff) | |
| parent | 2323b0da26e293bb4d5a7a4ad8afed85a599d11d (diff) | |
| download | packages-11597b8939720fb5246c41482d873bce2ef8235e.tar.gz packages-11597b8939720fb5246c41482d873bce2ef8235e.tar.bz2 packages-11597b8939720fb5246c41482d873bce2ef8235e.tar.xz packages-11597b8939720fb5246c41482d873bce2ef8235e.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.29.1 plus fixes for i586, ppc32
See merge request !85
Diffstat (limited to 'user/rust/0015-Use-ELFv2-ABI-on-powerpc64-musl-LLVM-half.patch')
| -rw-r--r-- | user/rust/0015-Use-ELFv2-ABI-on-powerpc64-musl-LLVM-half.patch | 29 |
1 files changed, 0 insertions, 29 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 deleted file mode 100644 index 72743d01d..000000000 --- a/user/rust/0015-Use-ELFv2-ABI-on-powerpc64-musl-LLVM-half.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - |