From 011405fb25dfcfd12cba4cce89cf5a906a5e7f6f Mon Sep 17 00:00:00 2001 From: q66 Date: Sat, 21 Dec 2019 01:29:44 +0100 Subject: [PATCH] llvm9: update to 9.0.1 [ci skip] --- .../files/patches/cfe/cfe-005-gcc9.patch | 40 ------------------- ...lang-001-fix-unwind-chain-inclusion.patch} | 0 .../clang-002-add-musl-triples.patch} | 0 ...clang-003-ppc64-dynamic-linker-path.patch} | 0 .../clang-004-ppc64-musl-elfv2.patch} | 0 ...bigpic.patch => llvm-005-ppc-bigpic.patch} | 0 .../patches/llvm/llvm-005-ppc-lrint.patch | 34 ---------------- srcpkgs/llvm9/template | 40 ++++++++++--------- 8 files changed, 21 insertions(+), 93 deletions(-) delete mode 100644 srcpkgs/llvm9/files/patches/cfe/cfe-005-gcc9.patch rename srcpkgs/llvm9/files/patches/{cfe/cfe-001-fix-unwind-chain-inclusion.patch => clang/clang-001-fix-unwind-chain-inclusion.patch} (100%) rename srcpkgs/llvm9/files/patches/{cfe/cfe-002-add-musl-triples.patch => clang/clang-002-add-musl-triples.patch} (100%) rename srcpkgs/llvm9/files/patches/{cfe/cfe-003-ppc64-dynamic-linker-path.patch => clang/clang-003-ppc64-dynamic-linker-path.patch} (100%) rename srcpkgs/llvm9/files/patches/{cfe/cfe-004-ppc64-musl-elfv2.patch => clang/clang-004-ppc64-musl-elfv2.patch} (100%) rename srcpkgs/llvm9/files/patches/llvm/{llvm-006-ppc-bigpic.patch => llvm-005-ppc-bigpic.patch} (100%) delete mode 100644 srcpkgs/llvm9/files/patches/llvm/llvm-005-ppc-lrint.patch diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-005-gcc9.patch b/srcpkgs/llvm9/files/patches/cfe/cfe-005-gcc9.patch deleted file mode 100644 index f600a6657ef..00000000000 --- a/srcpkgs/llvm9/files/patches/cfe/cfe-005-gcc9.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a1445cd0340006d7635101c4c2b27ae51328642c Mon Sep 17 00:00:00 2001 -From: Serge Guelton -Date: Thu, 19 Sep 2019 00:54:40 +0000 -Subject: [PATCH] Initialize all fields in ABIArgInfo. - -Due to usage of an uninitialized fields, we end up with -a Conditional jump or move depends on uninitialised value - -Fixes https://bugs.llvm.org/show_bug.cgi?id=40547 - -Commited on behalf of Martin Liska - -git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@372281 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - include/clang/CodeGen/CGFunctionInfo.h | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/include/clang/CodeGen/CGFunctionInfo.h b/include/clang/CodeGen/CGFunctionInfo.h -index 1f81072e23d0..5069d9af42a3 100644 ---- a/include/clang/CodeGen/CGFunctionInfo.h -+++ b/include/clang/CodeGen/CGFunctionInfo.h -@@ -109,14 +109,12 @@ class ABIArgInfo { - UnpaddedCoerceAndExpandType = T; - } - -- ABIArgInfo(Kind K) -- : TheKind(K), PaddingInReg(false), InReg(false) { -- } -- - public: -- ABIArgInfo() -+ ABIArgInfo(Kind K = Direct) - : TypeData(nullptr), PaddingType(nullptr), DirectOffset(0), -- TheKind(Direct), PaddingInReg(false), InReg(false) {} -+ TheKind(K), PaddingInReg(false), InAllocaSRet(false), -+ IndirectByVal(false), IndirectRealign(false), SRetAfterThis(false), -+ InReg(false), CanBeFlattened(false), SignExt(false) {} - - static ABIArgInfo getDirect(llvm::Type *T = nullptr, unsigned Offset = 0, - llvm::Type *Padding = nullptr, diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-001-fix-unwind-chain-inclusion.patch b/srcpkgs/llvm9/files/patches/clang/clang-001-fix-unwind-chain-inclusion.patch similarity index 100% rename from srcpkgs/llvm9/files/patches/cfe/cfe-001-fix-unwind-chain-inclusion.patch rename to srcpkgs/llvm9/files/patches/clang/clang-001-fix-unwind-chain-inclusion.patch diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-002-add-musl-triples.patch b/srcpkgs/llvm9/files/patches/clang/clang-002-add-musl-triples.patch similarity index 100% rename from srcpkgs/llvm9/files/patches/cfe/cfe-002-add-musl-triples.patch rename to srcpkgs/llvm9/files/patches/clang/clang-002-add-musl-triples.patch diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-003-ppc64-dynamic-linker-path.patch b/srcpkgs/llvm9/files/patches/clang/clang-003-ppc64-dynamic-linker-path.patch similarity index 100% rename from srcpkgs/llvm9/files/patches/cfe/cfe-003-ppc64-dynamic-linker-path.patch rename to srcpkgs/llvm9/files/patches/clang/clang-003-ppc64-dynamic-linker-path.patch diff --git a/srcpkgs/llvm9/files/patches/cfe/cfe-004-ppc64-musl-elfv2.patch b/srcpkgs/llvm9/files/patches/clang/clang-004-ppc64-musl-elfv2.patch similarity index 100% rename from srcpkgs/llvm9/files/patches/cfe/cfe-004-ppc64-musl-elfv2.patch rename to srcpkgs/llvm9/files/patches/clang/clang-004-ppc64-musl-elfv2.patch diff --git a/srcpkgs/llvm9/files/patches/llvm/llvm-006-ppc-bigpic.patch b/srcpkgs/llvm9/files/patches/llvm/llvm-005-ppc-bigpic.patch similarity index 100% rename from srcpkgs/llvm9/files/patches/llvm/llvm-006-ppc-bigpic.patch rename to srcpkgs/llvm9/files/patches/llvm/llvm-005-ppc-bigpic.patch diff --git a/srcpkgs/llvm9/files/patches/llvm/llvm-005-ppc-lrint.patch b/srcpkgs/llvm9/files/patches/llvm/llvm-005-ppc-lrint.patch deleted file mode 100644 index d828342d421..00000000000 --- a/srcpkgs/llvm9/files/patches/llvm/llvm-005-ppc-lrint.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 97e36260709c541044f30092b420238511e13e5b Mon Sep 17 00:00:00 2001 -From: Nemanja Ivanovic -Date: Mon, 28 Oct 2019 16:08:30 -0500 -Subject: [PATCH] [PowerPC] Do not emit HW loop if the body contains calls to - lrint/lround - -These two intrinsics are lowered to calls so should prevent the formation of -CTR loops. In a subsequent patch, we will handle all currently known intrinsics -and prevent the formation of HW loops if any unknown intrinsics are encountered. - -Differential revision: https://reviews.llvm.org/D68841 ---- - .../Target/PowerPC/PPCTargetTransformInfo.cpp | 4 + - llvm/test/CodeGen/PowerPC/pr43527.ll | 75 +++++++++++++++++++ - 2 files changed, 79 insertions(+) - create mode 100644 llvm/test/CodeGen/PowerPC/pr43527.ll - -diff --git a/llvm/lib/Target/PowerPC/PPCTargetTransformInfo.cpp b/llvm/lib/Target/PowerPC/PPCTargetTransformInfo.cpp -index 53c2f0f88d14..ad37e435fa36 100644 ---- llvm/lib/Target/PowerPC/PPCTargetTransformInfo.cpp -+++ llvm/lib/Target/PowerPC/PPCTargetTransformInfo.cpp -@@ -331,8 +331,12 @@ bool PPCTTIImpl::mightUseCTR(BasicBlock *BB, - case Intrinsic::ceil: Opcode = ISD::FCEIL; break; - case Intrinsic::trunc: Opcode = ISD::FTRUNC; break; - case Intrinsic::rint: Opcode = ISD::FRINT; break; -+ case Intrinsic::lrint: Opcode = ISD::LRINT; break; -+ case Intrinsic::llrint: Opcode = ISD::LLRINT; break; - case Intrinsic::nearbyint: Opcode = ISD::FNEARBYINT; break; - case Intrinsic::round: Opcode = ISD::FROUND; break; -+ case Intrinsic::lround: Opcode = ISD::LROUND; break; -+ case Intrinsic::llround: Opcode = ISD::LLROUND; break; - case Intrinsic::minnum: Opcode = ISD::FMINNUM; break; - case Intrinsic::maxnum: Opcode = ISD::FMAXNUM; break; - case Intrinsic::umul_with_overflow: Opcode = ISD::UMULO; break; diff --git a/srcpkgs/llvm9/template b/srcpkgs/llvm9/template index b57eb107039..adfe4cf1fe5 100644 --- a/srcpkgs/llvm9/template +++ b/srcpkgs/llvm9/template @@ -1,7 +1,7 @@ # Template file for 'llvm9' pkgname=llvm9 -version=9.0.0 -revision=4 +version=9.0.1 +revision=1 wrksrc="llvm-${version}.src" build_style=cmake configure_args=" @@ -20,18 +20,20 @@ short_desc="Low Level Virtual Machine" maintainer="q66 " license="NCSA" homepage="https://www.llvm.org" -distfiles="https://releases.llvm.org/${version}/llvm-${version}.src.tar.xz - https://releases.llvm.org/${version}/lldb-${version}.src.tar.xz - https://releases.llvm.org/${version}/lld-${version}.src.tar.xz - https://releases.llvm.org/${version}/cfe-${version}.src.tar.xz - https://releases.llvm.org/${version}/clang-tools-extra-${version}.src.tar.xz - https://releases.llvm.org/${version}/compiler-rt-${version}.src.tar.xz" -checksum="d6a0565cf21f22e9b4353b2eb92622e8365000a9e90a16b09b56f8157eabfe84 - 1e4c2f6a1f153f4b8afa2470d2e99dab493034c1ba8b7ffbbd7600de016d0794 - 31c6748b235d09723fb73fea0c816ed5a3fab0f96b66f8fbc546a0fcc8688f91 - 7ba81eef7c22ca5da688fdf9d88c20934d2d6b40bfe150ffd338900890aa4610 - ea1c86ce352992d7b6f6649bc622f6a2707b9f8b7153e9f9181a35c76aa3ac10 - 56e4cd96dd1d8c346b07b4d6b255f976570c6f2389697347a6c3dcb9e820d10e" +distfiles=" + https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-${version}.src.tar.xz + https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/lldb-${version}.src.tar.xz + https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/lld-${version}.src.tar.xz + https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/clang-${version}.src.tar.xz + https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/clang-tools-extra-${version}.src.tar.xz + https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/compiler-rt-${version}.src.tar.xz" +checksum=" + 00a1ee1f389f81e9979f3a640a01c431b3021de0d42278f6508391a2f0b81c9a + 8a7b9fd795c31a3e3cba6ce1377a2ae5c67376d92888702ce27e26f0971beb09 + 86262bad3e2fd784ba8c5e2158d7aa36f12b85f2515e95bc81d65d75bb9b0c82 + 5778512b2e065c204010f88777d44b95250671103e434f9dc7363ab2e3804253 + b26fd72a78bd7db998a26270ec9ec6a01346651d88fa87b4b323e13049fb6f07 + c2bfab95c9986318318363d7f371a85a95e333bc0b34fbfa52edbd3f5e3a9077" disable_parallel_builds=yes lib32disabled=yes # necessary to override auto default @@ -67,9 +69,9 @@ post_patch() { patch -sNp1 -i ${i} done - cd ${XBPS_BUILDDIR}/cfe-${version}.src - for i in ${FILESDIR}/patches/cfe/cfe-*.patch; do - msg_normal "Applying $i to cfe\n" + cd ${XBPS_BUILDDIR}/clang-${version}.src + for i in ${FILESDIR}/patches/clang/clang-*.patch; do + msg_normal "Applying $i to clang\n" patch -sNp1 -i ${i} done @@ -85,8 +87,8 @@ post_patch() { fi # Move clang files into the llvm source. - if [ -d ${XBPS_BUILDDIR}/cfe-${version}.src ]; then - mv ${XBPS_BUILDDIR}/cfe-${version}.src ${wrksrc}/tools/clang + if [ -d ${XBPS_BUILDDIR}/clang-${version}.src ]; then + mv ${XBPS_BUILDDIR}/clang-${version}.src ${wrksrc}/tools/clang fi # Move clang-tools-extra files into llvm source. if [ -d ${XBPS_BUILDDIR}/clang-tools-extra-${version}.src ]; then