llvm7: update ppc64 patches to always use elfv2 on big endian

We need this because we target elfv2 with ppc64 glibc as well,
unlike most distributions.

[ci skip]

srcpkgs/llvm7/files/patches/cfe/cfe-005-ppc64-dynamic-linker-path.patch

@@ -1,13 +1,14 @@
---- clang/lib/Driver/ToolChains/Linux.cpp	2018-12-16 23:52:16.174867512 +0100
+--- a/lib/Driver/ToolChains/Linux.cpp
-+++ clang/lib/Driver/ToolChains/Linux.cpp	2018-12-16 23:56:25.040531791 +0100
++++ b/lib/Driver/ToolChains/Linux.cpp
-@@ -502,12 +502,12 @@
+@@ -590,12 +590,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      Loader = "ld.so.1";
      break;
    case llvm::Triple::ppc64:
 -    LibDir = "lib64";
 +    LibDir = "lib";
      Loader =
-         (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
+-        (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
++        (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2";
      break;
    case llvm::Triple::ppc64le:
 -    LibDir = "lib64";

srcpkgs/llvm7/files/patches/cfe/cfe-006-ppc64-musl-elfv2.patch

@@ -1,30 +1,26 @@
---- clang/lib/Basic/Targets/PPC.h
+--- a/lib/Basic/Targets/PPC.h
-+++ clang/lib/Basic/Targets/PPC.h
++++ b/lib/Basic/Targets/PPC.h
-@@ -358,7 +358,10 @@ public:
+@@ -364,11 +364,10 @@ public:
-       ABI = "elfv2";
+ 
+     if ((Triple.getArch() == llvm::Triple::ppc64le)) {
+       resetDataLayout("e-m:e-i64:64-n32:64");
+-      ABI = "elfv2";
      } else {
        resetDataLayout("E-m:e-i64:64-n32:64");
 -      ABI = "elfv1";
-+      if (Triple.getEnvironment() == llvm::Triple::Musl)
-+        ABI = "elfv2";
-+      else
-+        ABI = "elfv1";
      }
++    ABI = "elfv2";
  
      switch (getTriple().getOS()) {
-diff --git a/tools/clang/lib/Driver/ToolChains/Clang.cpp b/tools/clang/lib/Driver/ToolChains/Clang.cpp
+     case llvm::Triple::FreeBSD:
-index 8e9c4c6a..40817ec3 100644
+--- a/lib/Driver/ToolChains/Clang.cpp
---- clang/lib/Driver/ToolChains/Clang.cpp
++++ b/lib/Driver/ToolChains/Clang.cpp
-+++ clang/lib/Driver/ToolChains/Clang.cpp
+@@ -1745,7 +1745,7 @@ void Clang::AddPPCTargetArgs(const ArgList &Args,
-@@ -1618,7 +1618,10 @@ void Clang::AddPPCTargetArgs(const ArgList &Args,
          break;
        }
  
 -      ABIName = "elfv1";
-+      if (getToolChain().getTriple().getEnvironment() == llvm::Triple::Musl)
++      ABIName = "elfv2";
-+        ABIName = "elfv2";
-+      else
-+        ABIName = "elfv1";
        break;
      }
      case llvm::Triple::ppc64le:

srcpkgs/llvm7/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch

@@ -1,43 +1,27 @@
-From 750d323a6060ad92c3d247f85d6555041f55b4a5 Mon Sep 17 00:00:00 2001
+This patches LLVM to use ELFv2 on ppc64 uncoditionally unless overridden. We
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+need this because unlike most distros we use ELFv2 for both glibc and musl
-Date: Thu, 4 Oct 2018 15:26:59 -0500
+on big endian ppc64.
-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,
+@@ -197,9 +197,9 @@ static PPCTargetMachine::PPCABI computeTargetABI(const Triple &TT,
+ 
+   switch (TT.getArch()) {
    case Triple::ppc64le:
-     return PPCTargetMachine::PPC_ABI_ELFv2;
+-    return PPCTargetMachine::PPC_ABI_ELFv2;
    case Triple::ppc64:
-+    // musl uses ELFv2 ABI on both endians.
+-    return PPCTargetMachine::PPC_ABI_ELFv1;
-+    if (TT.getEnvironment() == Triple::Musl)
++    /* we use elfv2 by default for both endians and both libcs */
-+      return PPCTargetMachine::PPC_ABI_ELFv2;
++    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 @@
+@@ -1,4 +1,5 @@
- ; 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 < %s | FileCheck %s -check-prefix=CHECK-ELFv1
++; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %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=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
-

srcpkgs/llvm7/template

@@ -1,7 +1,7 @@
 # Template file for 'llvm7'
 pkgname=llvm7
 version=7.0.1
-revision=6
+revision=7
 wrksrc="llvm-${version}.src"
 build_style=cmake
 configure_args="