mirror of
https://github.com/void-linux/void-packages.git
synced 2025-10-03 00:55:10 +02:00
03f758dbf7
Turns out the ppc64-musl ELFv2 patch was not being applied at all, and there were two patches that no longer apply and are no longer relevant (the second one reports it's already applied, the first one patches files that don't exist). Remove those patches, and make sure the ppc64 elfv2 patch is applied, because otherwise llvm will emit elfv1 binaries for ppc64-musl and we don't want that. In regards to that, there is also a patch missing in the clang frontend, as otherwise clang will forcibly pass `-mabi=elfv1` internally out of box and it will not work either way, so make sure the correct ABI is passed by clang by default on musl triplets. Also revbump in order to make sure cross-compiling works as expected. [ci skip]
43 lines
2.2 KiB
Diff
43 lines
2.2 KiB
Diff
From 750d323a6060ad92c3d247f85d6555041f55b4a5 Mon Sep 17 00:00:00 2001
|
|
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
|
|
Date: Thu, 4 Oct 2018 15:26:59 -0500
|
|
Subject: [PATCH] Add support for powerpc64-*-linux-musl targets
|
|
|
|
This patch ensures that 64-bit PowerPC musl targets use ELFv2 ABI on both
|
|
endians. It additionally adds a test that big endian PPC64 uses ELFv2 on
|
|
musl.
|
|
---
|
|
lib/Target/PowerPC/PPCTargetMachine.cpp | 4 ++++
|
|
test/CodeGen/PowerPC/ppc64-elf-abi.ll | 1 +
|
|
2 files changed, 5 insertions(+)
|
|
|
|
diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp
|
|
index 34410393ef6..c583fba8cab 100644
|
|
--- a/lib/Target/PowerPC/PPCTargetMachine.cpp
|
|
+++ b/lib/Target/PowerPC/PPCTargetMachine.cpp
|
|
@@ -199,6 +199,10 @@ static PPCTargetMachine::PPCABI computeTargetABI(const Triple &TT,
|
|
case Triple::ppc64le:
|
|
return PPCTargetMachine::PPC_ABI_ELFv2;
|
|
case Triple::ppc64:
|
|
+ // musl uses ELFv2 ABI on both endians.
|
|
+ if (TT.getEnvironment() == Triple::Musl)
|
|
+ return PPCTargetMachine::PPC_ABI_ELFv2;
|
|
+
|
|
return PPCTargetMachine::PPC_ABI_ELFv1;
|
|
default:
|
|
return PPCTargetMachine::PPC_ABI_UNKNOWN;
|
|
diff --git a/test/CodeGen/PowerPC/ppc64-elf-abi.ll b/test/CodeGen/PowerPC/ppc64-elf-abi.ll
|
|
index 1e17930304b..aa594b37b47 100644
|
|
--- a/test/CodeGen/PowerPC/ppc64-elf-abi.ll
|
|
+++ b/test/CodeGen/PowerPC/ppc64-elf-abi.ll
|
|
@@ -1,6 +1,7 @@
|
|
; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv1
|
|
; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv1 < %s | FileCheck %s -check-prefix=CHECK-ELFv1
|
|
; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv2 < %s | FileCheck %s -check-prefix=CHECK-ELFv2
|
|
+; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-musl < %s | FileCheck %s -check-prefix=CHECK-ELFv2
|
|
; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2
|
|
; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu -target-abi elfv1 < %s | FileCheck %s -check-prefix=CHECK-ELFv1
|
|
; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu -target-abi elfv2 < %s | FileCheck %s -check-prefix=CHECK-ELFv2
|
|
--
|
|
2.18.0
|
|
|