[arch-commits] Commit in llvm/trunk (2 files)

[Evangelos Foutras]

    Date: Friday, April 26, 2019 @ 21:04:43
  Author: foutrelis
Revision: 352148

upgpkg: llvm 8.0.0-2

Rebuild with GCC 8.3; fixes segfaults in clang's /usr/bin/modularize.

Some further explanation at the link bellow:

  https://github.com/MaskRay/ccls/issues/363#issuecomment-482625854

Added:
  llvm/trunk/0001-Fix-the-buildbot-issue-introduced-by-r351421.patch
Modified:
  llvm/trunk/PKGBUILD

---------------------------------------------------------+
 0001-Fix-the-buildbot-issue-introduced-by-r351421.patch |   27 ++++++++++++++
 PKGBUILD                                                |    7 +++
 2 files changed, 33 insertions(+), 1 deletion(-)

Added: 0001-Fix-the-buildbot-issue-introduced-by-r351421.patch
===================================================================
--- 0001-Fix-the-buildbot-issue-introduced-by-r351421.patch	                        (rev 0)
+++ 0001-Fix-the-buildbot-issue-introduced-by-r351421.patch	2019-04-26 21:04:43 UTC (rev 352148)
@@ -0,0 +1,27 @@
+From 0b88c7b4a4e23dc5f8973095eb99d274f69a2b25 Mon Sep 17 00:00:00 2001
+From: Sanjin Sijaric <ssijaric at codeaurora.org>
+Date: Fri, 18 Jan 2019 19:34:20 +0000
+Subject: [PATCH] Fix the buildbot issue introduced by r351421
+
+The EXPENSIVE_CHECK x86_64 Windows buildbot is failing due to this change. Fix
+the map access.
+
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351577 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ lib/MC/MCWin64EH.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/MC/MCWin64EH.cpp b/lib/MC/MCWin64EH.cpp
+index 8bc1f08c8875..3ef1514455af 100644
+--- a/lib/MC/MCWin64EH.cpp
++++ b/lib/MC/MCWin64EH.cpp
+@@ -522,7 +522,7 @@ static void ARM64EmitUnwindInfo(MCStreamer &streamer, WinEH::FrameInfo *info) {
+     if (MatchingEpilog) {
+       assert(EpilogInfo.find(MatchingEpilog) != EpilogInfo.end() &&
+              "Duplicate epilog not found");
+-      EpilogInfo[EpilogStart] = EpilogInfo[MatchingEpilog];
++      EpilogInfo[EpilogStart] = EpilogInfo.lookup(MatchingEpilog);
+       // Clear the unwind codes in the EpilogMap, so that they don't get output
+       // in the logic below.
+       EpilogInstrs.clear();

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-26 15:24:02 UTC (rev 352147)
+++ PKGBUILD	2019-04-26 21:04:43 UTC (rev 352148)
@@ -3,7 +3,7 @@
 
 pkgname=('llvm' 'llvm-libs' 'llvm-ocaml')
 pkgver=8.0.0
-pkgrel=1
+pkgrel=2
 _ocaml_ver=4.07.1
 arch=('x86_64')
 url="https://llvm.org/"
@@ -13,9 +13,11 @@
              'python-sphinx' 'python-recommonmark')
 options=('staticlibs')
 source=(https://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
+        0001-Fix-the-buildbot-issue-introduced-by-r351421.patch
         llvm-config.h)
 sha256sums=('8872be1b12c61450cacc82b3d153eab02be2546ef34fa3580ed14137bb26224c'
             'SKIP'
+            '9b519940a1f8e18df54128c00eeb22528b3c449a9cd1320c0959cdb74ea72d16'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
 validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
 validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar at redhat.com>
@@ -23,6 +25,9 @@
 prepare() {
   cd "$srcdir/llvm-$pkgver.src"
   mkdir build
+
+  # Fix a test failure in CodeGen/AArch64/wineh4.mir
+  patch -Np1 -i ../0001-Fix-the-buildbot-issue-introduced-by-r351421.patch
 }
 
 build() {