sailer pushed to ghdl (master). "patch to build llvm backend with llvm 3.6"

[notifications at fedoraproject.org]

From 10a9ebd08c59713f38ff1c5a95d8344942cfbbec Mon Sep 17 00:00:00 2001
From: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Mon, 8 Jun 2015 13:28:08 +0200
Subject: patch to build llvm backend with llvm 3.6


diff --git a/ghdl-llvm36.diff b/ghdl-llvm36.diff
new file mode 100644
index 0000000..68b361d
--- /dev/null
+++ b/ghdl-llvm36.diff
@@ -0,0 +1,22 @@
+--- ./src/ortho/llvm/llvm-cbindings.cpp.xx	2015-06-06 22:14:15.303908540 +0200
++++ ./src/ortho/llvm/llvm-cbindings.cpp	2015-06-06 22:14:47.670826004 +0200
+@@ -50,7 +50,7 @@
+ void
+ LLVMMDNodeReplaceOperandWith_extra (LLVMValueRef N, unsigned i, LLVMValueRef V) {
+   MDNode *MD = cast<MDNode>(unwrap(N));
+-  MD->replaceOperandWith (i, unwrap(V));
++  MD->replaceOperandWith (i, ValueAsMetadata::get(unwrap(V)));
+ }
+ 
+ void *LLVMGetPointerToFunction(LLVMExecutionEngineRef EE, LLVMValueRef Func)
+--- ./src/ortho/llvm/ortho_code_main.adb.xx	2015-06-06 22:28:25.603010956 +0200
++++ ./src/ortho/llvm/ortho_code_main.adb	2015-06-06 22:28:58.081931596 +0200
+@@ -209,8 +209,6 @@
+    InitializeNativeTarget;
+    InitializeNativeAsmPrinter;
+ 
+-   LinkInJIT;
+-
+    Module := ModuleCreateWithName (Module_Name'Address);
+ 
+    if Output = null and then Exec_Func /= null then
diff --git a/ghdl.spec b/ghdl.spec
index 86a1dd2..02177cc 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -66,6 +66,8 @@ Patch105: ghdl-grtadac.patch
 Patch106: ghdl-ppc64abort.patch
 # http://gcc.gnu.org/ml/gcc-patches/2012-10/msg02505.html
 Patch112: ghdl-mcode32bit.patch
+# https://mail.gna.org/public/ghdl-discuss/2015-06/msg00008.html
+Patch113: ghdl-llvm36.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -289,6 +291,7 @@ popd
 %if %{with llvm}
 cp -r ghdl-updates-code ghdl-updates-code-llvm
 pushd ghdl-updates-code-llvm
+%patch113 -p0 -b .llvm36
 %if "%{?_lib}" == "lib64"
 perl -i -pe 's,^libdirsuffix=.*$,libdirsuffix=lib64/ghdl/llvm,' configure
 %else
@@ -343,7 +346,8 @@ popd
 %if %{with llvm}
 pushd ghdl-updates-code-llvm
 ./configure --prefix=/usr --with-llvm=/usr
-make
+# FIXME: disable library debug info for now because it doesn't work with LLVM 3.6
+make LIB_CFLAGS=
 popd
 %endif
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ghdl.git/commit/?h=master&id=10a9ebd08c59713f38ff1c5a95d8344942cfbbec