Annotation of /trunk/mesa/patches/mesa-10.2.7-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch
Parent Directory | Revision Log
Revision 2500 -
(hide annotations)
(download)
Mon Sep 15 07:25:06 2014 UTC (10 years ago) by niro
File size: 1129 byte(s)
Mon Sep 15 07:25:06 2014 UTC (10 years ago) by niro
File size: 1129 byte(s)
-llvm fixes
1 | niro | 2500 | From 22c970946535956abac321585598425ad5cc82c5 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com> | ||
3 | Date: Wed, 14 May 2014 12:55:50 +0100 | ||
4 | Subject: [PATCH 1/2] gallivm: Disable workaround for PR12833 on LLVM 3.2+. | ||
5 | |||
6 | Fixed upstream. | ||
7 | |||
8 | (cherry picked from commit 172ef0c5a5a97c211702eb4033eeaac20993350e) | ||
9 | --- | ||
10 | src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | ||
14 | index d85adfb..45c985d 100644 | ||
15 | --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | ||
16 | +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | ||
17 | @@ -321,11 +321,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, | ||
18 | builder.setJITMemoryManager(JITMemoryManager::CreateDefaultMemManager()); | ||
19 | |||
20 | ExecutionEngine *JIT; | ||
21 | -#if 0 | ||
22 | +#if HAVE_LLVM >= 0x0302 | ||
23 | JIT = builder.create(); | ||
24 | #else | ||
25 | /* | ||
26 | - * Workaround http://llvm.org/bugs/show_bug.cgi?id=12833 | ||
27 | + * Workaround http://llvm.org/PR12833 | ||
28 | */ | ||
29 | StringRef MArch = ""; | ||
30 | StringRef MCPU = ""; | ||
31 | -- | ||
32 | 2.1.0 | ||
33 |