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

[Evangelos Foutras]

    Date: Friday, March 16, 2018 @ 15:53:40
  Author: foutrelis
Revision: 319528

upgpkg: llvm 6.0.0-4

Add missing header to InstructionCombining.cpp; fixes Crystal build
which failed with "undefined reference to 'LLVMInitializeInstCombine'"

https://bugs.llvm.org/show_bug.cgi?id=35947

Added:
  llvm/trunk/PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch
Modified:
  llvm/trunk/PKGBUILD

------------------------------------------------------------+
 PKGBUILD                                                   |    7 ++
 PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch |   28 +++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-16 15:05:15 UTC (rev 319527)
+++ PKGBUILD	2018-03-16 15:53:40 UTC (rev 319528)
@@ -4,7 +4,7 @@
 
 pkgname=('llvm' 'llvm-libs' 'llvm-ocaml')
 pkgver=6.0.0
-pkgrel=3
+pkgrel=4
 _ocaml_ver=4.06.0
 arch=('x86_64')
 url="https://llvm.org/"
@@ -13,6 +13,7 @@
              "ocaml=$_ocaml_ver" 'ocaml-ctypes' 'ocaml-findlib')
 options=('staticlibs')
 source=(https://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
+        PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch
         PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch
         PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch
         D44391-export-LLVM_DYLIB_COMPONENTS-in-LLVMConfig.cmake.patch
@@ -20,6 +21,7 @@
         llvm-config.h)
 sha256sums=('1ff53c915b4e761ef400b803f07261ade637b0c269d99569f18040f3dcee4408'
             'SKIP'
+            '7d0082d1c641873c1d45c2f076b9533fbc43002d605336afa92198b8830a5bcb'
             '5a90833c15c4981e7accd405290491d7930f991d30943d7ae9e4e338149731ff'
             'da80b59c9abe9fe864ff8dc42132c5aa135a79d342fd147ae6f54e2621e009fa'
             '96e2f3ca8b7d1bdbe2606a1eebb12c57b39838d1bcc15e40388e8d59649a9f4a'
@@ -32,6 +34,9 @@
   cd "$srcdir/llvm-$pkgver.src"
   mkdir build
 
+  # https://bugs.llvm.org/show_bug.cgi?id=35947
+  patch -Np1 -i ../PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch
+
   # https://bugs.llvm.org/show_bug.cgi?id=36417
   patch -Np1 -i ../PR36417-DebugInfo-discard-invalid-DBG_VALUE-instructions.patch
   patch -Np1 -i ../PR36417-fixup-for-rL326769-RegState-Debug-is-being-truncated.patch

Added: PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch
===================================================================
--- PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch	                        (rev 0)
+++ PR35947-export-LLVMInitializeInstCombine-as-extern-C.patch	2018-03-16 15:53:40 UTC (rev 319528)
@@ -0,0 +1,28 @@
+From 7c9054610e354340f9474dcd13a927f929912d1d Mon Sep 17 00:00:00 2001
+From: Eugene Zelenko <eugene.zelenko at gmail.com>
+Date: Tue, 6 Mar 2018 23:06:13 +0000
+Subject: [PATCH] [Transforms] Add missing header for InstructionCombining.cpp,
+ in order to export LLVMInitializeInstCombine as extern "C". Fixes PR35947.
+
+Patch by Brenton Bostick.
+
+Differential revision: https://reviews.llvm.org/D44140
+
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@326843 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ lib/Transforms/InstCombine/InstructionCombining.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/Transforms/InstCombine/InstructionCombining.cpp b/lib/Transforms/InstCombine/InstructionCombining.cpp
+index a3b2fe9e5d22..7ec73433e8f6 100644
+--- a/lib/Transforms/InstCombine/InstructionCombining.cpp
++++ b/lib/Transforms/InstCombine/InstructionCombining.cpp
+@@ -34,6 +34,7 @@
+ //===----------------------------------------------------------------------===//
+ 
+ #include "InstCombineInternal.h"
++#include "llvm-c/Initialization.h"
+ #include "llvm/ADT/APInt.h"
+ #include "llvm/ADT/ArrayRef.h"
+ #include "llvm/ADT/DenseMap.h"