Magellan Linux

Annotation of /trunk/mesa/patches/mesa-10.2.7-llvm35.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2500 - (hide annotations) (download)
Mon Sep 15 07:25:06 2014 UTC (9 years, 9 months ago) by niro
File size: 810 byte(s)
-llvm fixes
1 niro 2500 From 564821c917f4a9d5a0de2ee77b90b0cd85e3d3a6 Mon Sep 17 00:00:00 2001
2     From: Aaron Watry <awatry@gmail.com>
3     Date: Fri, 20 Jun 2014 19:13:30 -0500
4     Subject: gallivm: Fix build after LLVM commit 211259
5    
6     Signed-off-by: Aaron Watry <awatry@gmail.com>
7     Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
8    
9     diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
10     index df26883..413a0c2 100644
11     --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
12     +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
13     @@ -51,7 +51,9 @@
14     #include <llvm/MC/MCInstPrinter.h>
15     #include <llvm/MC/MCRegisterInfo.h>
16    
17     -#if HAVE_LLVM >= 0x0303
18     +#if HAVE_LLVM >= 0x0305
19     +#define OwningPtr std::unique_ptr
20     +#elif HAVE_LLVM >= 0x0303
21     #include <llvm/ADT/OwningPtr.h>
22     #endif
23    
24     --
25     cgit v0.10.2
26