[arch-commits] Commit in mesa/repos (12 files)

Laurent Carlier lcarlier at archlinux.org
Sat Sep 20 07:25:40 UTC 2014


    Date: Saturday, September 20, 2014 @ 09:25:40
  Author: lcarlier
Revision: 222146

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  mesa/repos/testing-i686/
  mesa/repos/testing-i686/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch
    (from rev 222145, mesa/trunk/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch)
  mesa/repos/testing-i686/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch
    (from rev 222145, mesa/trunk/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch)
  mesa/repos/testing-i686/LICENSE
    (from rev 222145, mesa/trunk/LICENSE)
  mesa/repos/testing-i686/PKGBUILD
    (from rev 222145, mesa/trunk/PKGBUILD)
  mesa/repos/testing-i686/llvm35.patch
    (from rev 222145, mesa/trunk/llvm35.patch)
  mesa/repos/testing-x86_64/
  mesa/repos/testing-x86_64/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch
    (from rev 222145, mesa/trunk/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch)
  mesa/repos/testing-x86_64/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch
    (from rev 222145, mesa/trunk/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch)
  mesa/repos/testing-x86_64/LICENSE
    (from rev 222145, mesa/trunk/LICENSE)
  mesa/repos/testing-x86_64/PKGBUILD
    (from rev 222145, mesa/trunk/PKGBUILD)
  mesa/repos/testing-x86_64/llvm35.patch
    (from rev 222145, mesa/trunk/llvm35.patch)

--------------------------------------------------------------------------------+
 testing-i686/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch     |   33 +
 testing-i686/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch   |   77 ++++
 testing-i686/LICENSE                                                           |   82 ++++
 testing-i686/PKGBUILD                                                          |  175 ++++++++++
 testing-i686/llvm35.patch                                                      |   26 +
 testing-x86_64/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch   |   33 +
 testing-x86_64/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch |   77 ++++
 testing-x86_64/LICENSE                                                         |   82 ++++
 testing-x86_64/PKGBUILD                                                        |  175 ++++++++++
 testing-x86_64/llvm35.patch                                                    |   26 +
 10 files changed, 786 insertions(+)

Copied: mesa/repos/testing-i686/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch (from rev 222145, mesa/trunk/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch)
===================================================================
--- testing-i686/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch	                        (rev 0)
+++ testing-i686/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch	2014-09-20 07:25:40 UTC (rev 222146)
@@ -0,0 +1,33 @@
+From 22c970946535956abac321585598425ad5cc82c5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca at vmware.com>
+Date: Wed, 14 May 2014 12:55:50 +0100
+Subject: [PATCH 1/2] gallivm: Disable workaround for PR12833 on LLVM 3.2+.
+
+Fixed upstream.
+
+(cherry picked from commit 172ef0c5a5a97c211702eb4033eeaac20993350e)
+---
+ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index d85adfb..45c985d 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -321,11 +321,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
+    builder.setJITMemoryManager(JITMemoryManager::CreateDefaultMemManager());
+ 
+    ExecutionEngine *JIT;
+-#if 0
++#if HAVE_LLVM >= 0x0302
+    JIT = builder.create();
+ #else
+    /*
+-    * Workaround http://llvm.org/bugs/show_bug.cgi?id=12833
++    * Workaround http://llvm.org/PR12833
+     */
+    StringRef MArch = "";
+    StringRef MCPU = "";
+-- 
+2.1.0
+

Copied: mesa/repos/testing-i686/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch (from rev 222145, mesa/trunk/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch)
===================================================================
--- testing-i686/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch	                        (rev 0)
+++ testing-i686/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch	2014-09-20 07:25:40 UTC (rev 222146)
@@ -0,0 +1,77 @@
+From ebe30fd4d4a90219431b6947f233473b2cf518a5 Mon Sep 17 00:00:00 2001
+From: Roland Scheidegger <sroland at vmware.com>
+Date: Thu, 19 Jun 2014 03:27:26 +0200
+Subject: [PATCH 2/2] gallivm: set mcpu when initializing llvm execution engine
+
+Previously llvm detected cpu features automatically when the execution engine
+was created (based on host cpu). This is no longer the case, which meant llvm
+was then not able to emit some of the intrinsics we used as we didn't specify
+any sse attributes (only on avx supporting systems this was not a problem since
+despite at least some llvm versions enabling it anyway we always set this
+manually). So, instead of trying to figure out which MAttrs to set just set
+MCPU.
+
+This fixes https://bugs.freedesktop.org/show_bug.cgi?id=77493.
+
+Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
+Tested-by: Vinson Lee <vlee at freedesktop.org>
+(cherry picked from commit cad60420d5ea36a4b6fa2e6c91317f71423aa63e)
+---
+ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 24 ++++++++++++++++++++++--
+ 1 file changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index 45c985d..395ac7b 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -59,6 +59,7 @@
+ #include <llvm/ExecutionEngine/JITMemoryManager.h>
+ #endif
+ #include <llvm/Support/CommandLine.h>
++#include <llvm/Support/Host.h>
+ #include <llvm/Support/PrettyStackTrace.h>
+ 
+ #if HAVE_LLVM >= 0x0300
+@@ -309,8 +310,8 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
+       /*
+        * AVX feature is not automatically detected from CPUID by the X86 target
+        * yet, because the old (yet default) JIT engine is not capable of
+-       * emitting the opcodes.  But as we're using MCJIT here, it is safe to
+-       * add set this attribute.
++       * emitting the opcodes. On newer llvm versions it is and at least some
++       * versions (tested with 3.3) will emit avx opcodes without this anyway.
+        */
+       MAttrs.push_back("+avx");
+       if (util_cpu_caps.has_f16c) {
+@@ -318,9 +319,28 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
+       }
+       builder.setMAttrs(MAttrs);
+    }
++
++#if HAVE_LLVM >= 0x0305
++   StringRef MCPU = llvm::sys::getHostCPUName();
++   /*
++    * The cpu bits are no longer set automatically, so need to set mcpu manually.
++    * Note that the MAttrs set above will be sort of ignored (since we should
++    * not set any which would not be set by specifying the cpu anyway).
++    * It ought to be safe though since getHostCPUName() should include bits
++    * not only from the cpu but environment as well (for instance if it's safe
++    * to use avx instructions which need OS support). According to
++    * http://llvm.org/bugs/show_bug.cgi?id=19429 however if I understand this
++    * right it may be necessary to specify older cpu (or disable mattrs) though
++    * when not using MCJIT so no instructions are generated which the old JIT
++    * can't handle. Not entirely sure if we really need to do anything yet.
++    */
++   builder.setMCPU(MCPU);
++#endif
++
+    builder.setJITMemoryManager(JITMemoryManager::CreateDefaultMemManager());
+ 
+    ExecutionEngine *JIT;
++
+ #if HAVE_LLVM >= 0x0302
+    JIT = builder.create();
+ #else
+-- 
+2.1.0
+

Copied: mesa/repos/testing-i686/LICENSE (from rev 222145, mesa/trunk/LICENSE)
===================================================================
--- testing-i686/LICENSE	                        (rev 0)
+++ testing-i686/LICENSE	2014-09-20 07:25:40 UTC (rev 222146)
@@ -0,0 +1,82 @@
+Disclaimer
+
+Mesa is a 3-D graphics library with an API which is very similar to
+that of OpenGL*
+To the extent that Mesa utilizes the OpenGL command syntax or state
+machine, it is being used with authorization from Silicon Graphics,
+Inc.(SGI). However, the author does not possess an OpenGL license
+from SGI, and makes no claim that Mesa is in any way a compatible
+replacement for OpenGL or associated with SGI. Those who want a
+licensed implementation of OpenGL should contact a licensed
+vendor.
+
+Please do not refer to the library as MesaGL (for legal
+reasons). It's just Mesa or The Mesa 3-D graphics
+library
+
+* OpenGL is a trademark of Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+The Mesa distribution consists of several components.  Different copyrights
+and licenses apply to different components.  For example, GLUT is copyrighted
+by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
+device drivers are copyrighted by their authors.  See below for a list of
+Mesa's main components and the license for each.
+
+The core Mesa library is licensed according to the terms of the MIT license.
+This allows integration with the XFree86, Xorg and DRI projects.
+
+The default Mesa license is as follows:
+
+Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Attention, Contributors
+
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary components of the Mesa distribution
+and their respective licenses.
+
+
+Mesa Component Licenses
+
+Component         Location               Primary Author      License
+----------------------------------------------------------------------------
+Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
+
+Device drivers    src/mesa/drivers/*     See drivers         See drivers
+
+Ext headers       include/GL/glext.h     SGI                 SGI Free B
+                  include/GL/glxext.h
+
+GLUT              src/glut/              Mark Kilgard        Mark's copyright
+
+Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
+
+SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
+
+demo programs     progs/demos/           various             see source files
+
+X demos           progs/xdemos/          Brian Paul          see source files
+
+SGI demos         progs/samples/         SGI                 SGI copyright
+
+RedBook demos     progs/redbook/         SGI                 SGI copyright

Copied: mesa/repos/testing-i686/PKGBUILD (from rev 222145, mesa/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2014-09-20 07:25:40 UTC (rev 222146)
@@ -0,0 +1,175 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=mesa
+pkgname=('opencl-mesa' 'mesa-dri' 'mesa-vdpau' 'mesa' 'mesa-libgl')
+pkgver=10.3.0
+pkgrel=1
+arch=('i686' 'x86_64')
+makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
+             'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd'
+             'libomxil-bellagio' 'libclc' 'clang')
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+#source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2{,.sig}
+source=(ftp://ftp.freedesktop.org/pub/mesa/10.3/MesaLib-${pkgver}.tar.bz2{,.sig}
+        LICENSE)
+sha256sums=('0283bfe710fa449ed82e465cfa09612a269e19abb7e0382082608062ce7960b5'
+            'SKIP'
+            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
+
+build() {
+  cd ${srcdir}/?esa-*
+
+  autoreconf -vfi # our automake is far too new for their build system :)
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+    --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
+    --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
+    --with-egl-platforms=x11,drm,wayland \
+    --enable-llvm-shared-libs \
+    --enable-egl \
+    --disable-gallium-egl \
+    --disable-gallium-gbm \
+    --enable-gbm \
+    --enable-gallium-llvm \
+    --enable-shared-glapi \
+    --enable-glx \
+    --enable-glx-tls \
+    --enable-dri \
+    --enable-osmesa \
+    --enable-gles1 \
+    --enable-gles2 \
+    --enable-texture-float \
+    --enable-xa \
+    --enable-vdpau \
+    --enable-omx \
+    --enable-opencl --enable-opencl-icd \
+    --with-clang-libdir=/usr/lib
+
+    # --help
+    # --disable-gallium-egl : not well maintained/expose more bugs, so prefer egl_dri2 (FS#40096)
+    # --disable-gallium-gbm : FS#41337 only useful with gallium-egl
+
+  make
+
+  # fake installation
+  mkdir $srcdir/fakeinstall
+  make DESTDIR=${srcdir}/fakeinstall install
+}
+
+package_opencl-mesa() {
+  pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
+  depends=('mesa-libgl' "mesa=${pkgver}" 'libcl' 'libclc' 'clang')
+  optdepends=('opencl-headers: headers necessary for OpenCL development')
+  
+  install -m755 -d ${pkgdir}/etc
+  mv -v ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/
+  
+  install -m755 -d ${pkgdir}/usr/lib
+  mv -v ${srcdir}/fakeinstall/usr/lib/lib*OpenCL* ${pkgdir}/usr/lib/
+  mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe ${pkgdir}/usr/lib/
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/"
+}
+
+package_mesa-dri() {
+  pkgdesc="Mesa DRI drivers"
+  depends=('mesa-libgl' "mesa=${pkgver}" 'libtxc_dxtn')
+  conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
+  provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
+  replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
+
+  install -m755 -d ${pkgdir}/etc
+  mv -v ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc
+  
+  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+  # ati-dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{r200,r300,r600,radeon{,si}}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
+  # nouveau-dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau{,_vieux}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
+  # intel-dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
+  # svga-dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
+   
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-dri"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-dri/"
+}
+
+package_mesa-vdpau() {
+  pkgdesc="Mesa VDPAU drivers"
+  depends=("mesa=${pkgver}")
+
+  install -m755 -d ${pkgdir}/usr/lib
+  mv -v ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib
+   
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/"
+}
+
+package_mesa() {
+  pkgdesc="an open-source implementation of the OpenGL specification"
+  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' 
+           'libomxil-bellagio' 'llvm-libs' 'libgl')
+  optdepends=('opengl-man-pages: for the OpenGL API man pages')
+  provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+  conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+  replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+
+  install -m755 -d ${pkgdir}/usr/lib
+  mv -v ${srcdir}/fakeinstall/usr/lib/bellagio  ${pkgdir}/usr/lib
+  mv -v ${srcdir}/fakeinstall/usr/lib/lib{OSMesa,gbm,glapi,wayland-egl,xatracker}.so* ${pkgdir}/usr/lib/
+  # FS#41337
+  #mv -v ${srcdir}/fakeinstall/usr/lib/gbm/gbm_gallium_drm* ${pkgdir}/usr/lib/gbm/
+
+  # swrast
+  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{kms_,}swrast_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
+
+  mv -v ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
+  mv -v ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
+  
+  install -m755 -d ${pkgdir}/usr/lib/mesa
+  # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
+  mv -v ${srcdir}/fakeinstall/usr/lib/libGL.so* 	${pkgdir}/usr/lib/mesa/
+  mv -v ${srcdir}/fakeinstall/usr/lib/libEGL.so* 	${pkgdir}/usr/lib/mesa/
+  mv -v ${srcdir}/fakeinstall/usr/lib/libGLES*.so*	${pkgdir}/usr/lib/mesa/
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
+}
+
+package_mesa-libgl() {
+  pkgdesc="Mesa 3-D graphics library"
+  depends=("mesa=${pkgver}")
+  provides=("libgl=${pkgver}")
+  replaces=('libgl')
+ 
+  # See FS#26284
+  install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
+  ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
+
+  ln -s /usr/lib/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0
+  ln -s libGL.so.1.2.0	             ${pkgdir}/usr/lib/libGL.so.1
+  ln -s libGL.so.1.2.0               ${pkgdir}/usr/lib/libGL.so
+
+  ln -s /usr/lib/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0
+  ln -s libEGL.so.1.0.0	              ${pkgdir}/usr/lib/libEGL.so.1
+  ln -s libEGL.so.1.0.0               ${pkgdir}/usr/lib/libEGL.so
+
+  ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0
+  ln -s libGLESv1_CM.so.1.1.0	            ${pkgdir}/usr/lib/libGLESv1_CM.so.1
+  ln -s libGLESv1_CM.so.1.1.0               ${pkgdir}/usr/lib/libGLESv1_CM.so
+
+  ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0
+  ln -s libGLESv2.so.2.0.0               ${pkgdir}/usr/lib/libGLESv2.so.2
+  ln -s libGLESv2.so.2.0.0               ${pkgdir}/usr/lib/libGLESv2.so
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
+}

Copied: mesa/repos/testing-i686/llvm35.patch (from rev 222145, mesa/trunk/llvm35.patch)
===================================================================
--- testing-i686/llvm35.patch	                        (rev 0)
+++ testing-i686/llvm35.patch	2014-09-20 07:25:40 UTC (rev 222146)
@@ -0,0 +1,26 @@
+From 564821c917f4a9d5a0de2ee77b90b0cd85e3d3a6 Mon Sep 17 00:00:00 2001
+From: Aaron Watry <awatry at gmail.com>
+Date: Fri, 20 Jun 2014 19:13:30 -0500
+Subject: gallivm: Fix build after LLVM commit 211259
+
+Signed-off-by: Aaron Watry <awatry at gmail.com>
+Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+index df26883..413a0c2 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+@@ -51,7 +51,9 @@
+ #include <llvm/MC/MCInstPrinter.h>
+ #include <llvm/MC/MCRegisterInfo.h>
+ 
+-#if HAVE_LLVM >= 0x0303
++#if HAVE_LLVM >= 0x0305
++#define OwningPtr std::unique_ptr
++#elif HAVE_LLVM >= 0x0303
+ #include <llvm/ADT/OwningPtr.h>
+ #endif
+ 
+-- 
+cgit v0.10.2
+

Copied: mesa/repos/testing-x86_64/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch (from rev 222145, mesa/trunk/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch)
===================================================================
--- testing-x86_64/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch	                        (rev 0)
+++ testing-x86_64/0001-gallivm-Disable-workaround-for-PR12833-on-LLVM-3.2.patch	2014-09-20 07:25:40 UTC (rev 222146)
@@ -0,0 +1,33 @@
+From 22c970946535956abac321585598425ad5cc82c5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca at vmware.com>
+Date: Wed, 14 May 2014 12:55:50 +0100
+Subject: [PATCH 1/2] gallivm: Disable workaround for PR12833 on LLVM 3.2+.
+
+Fixed upstream.
+
+(cherry picked from commit 172ef0c5a5a97c211702eb4033eeaac20993350e)
+---
+ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index d85adfb..45c985d 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -321,11 +321,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
+    builder.setJITMemoryManager(JITMemoryManager::CreateDefaultMemManager());
+ 
+    ExecutionEngine *JIT;
+-#if 0
++#if HAVE_LLVM >= 0x0302
+    JIT = builder.create();
+ #else
+    /*
+-    * Workaround http://llvm.org/bugs/show_bug.cgi?id=12833
++    * Workaround http://llvm.org/PR12833
+     */
+    StringRef MArch = "";
+    StringRef MCPU = "";
+-- 
+2.1.0
+

Copied: mesa/repos/testing-x86_64/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch (from rev 222145, mesa/trunk/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch)
===================================================================
--- testing-x86_64/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch	                        (rev 0)
+++ testing-x86_64/0002-gallivm-set-mcpu-when-initializing-llvm-execution-en.patch	2014-09-20 07:25:40 UTC (rev 222146)
@@ -0,0 +1,77 @@
+From ebe30fd4d4a90219431b6947f233473b2cf518a5 Mon Sep 17 00:00:00 2001
+From: Roland Scheidegger <sroland at vmware.com>
+Date: Thu, 19 Jun 2014 03:27:26 +0200
+Subject: [PATCH 2/2] gallivm: set mcpu when initializing llvm execution engine
+
+Previously llvm detected cpu features automatically when the execution engine
+was created (based on host cpu). This is no longer the case, which meant llvm
+was then not able to emit some of the intrinsics we used as we didn't specify
+any sse attributes (only on avx supporting systems this was not a problem since
+despite at least some llvm versions enabling it anyway we always set this
+manually). So, instead of trying to figure out which MAttrs to set just set
+MCPU.
+
+This fixes https://bugs.freedesktop.org/show_bug.cgi?id=77493.
+
+Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
+Tested-by: Vinson Lee <vlee at freedesktop.org>
+(cherry picked from commit cad60420d5ea36a4b6fa2e6c91317f71423aa63e)
+---
+ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 24 ++++++++++++++++++++++--
+ 1 file changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index 45c985d..395ac7b 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -59,6 +59,7 @@
+ #include <llvm/ExecutionEngine/JITMemoryManager.h>
+ #endif
+ #include <llvm/Support/CommandLine.h>
++#include <llvm/Support/Host.h>
+ #include <llvm/Support/PrettyStackTrace.h>
+ 
+ #if HAVE_LLVM >= 0x0300
+@@ -309,8 +310,8 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
+       /*
+        * AVX feature is not automatically detected from CPUID by the X86 target
+        * yet, because the old (yet default) JIT engine is not capable of
+-       * emitting the opcodes.  But as we're using MCJIT here, it is safe to
+-       * add set this attribute.
++       * emitting the opcodes. On newer llvm versions it is and at least some
++       * versions (tested with 3.3) will emit avx opcodes without this anyway.
+        */
+       MAttrs.push_back("+avx");
+       if (util_cpu_caps.has_f16c) {
+@@ -318,9 +319,28 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
+       }
+       builder.setMAttrs(MAttrs);
+    }
++
++#if HAVE_LLVM >= 0x0305
++   StringRef MCPU = llvm::sys::getHostCPUName();
++   /*
++    * The cpu bits are no longer set automatically, so need to set mcpu manually.
++    * Note that the MAttrs set above will be sort of ignored (since we should
++    * not set any which would not be set by specifying the cpu anyway).
++    * It ought to be safe though since getHostCPUName() should include bits
++    * not only from the cpu but environment as well (for instance if it's safe
++    * to use avx instructions which need OS support). According to
++    * http://llvm.org/bugs/show_bug.cgi?id=19429 however if I understand this
++    * right it may be necessary to specify older cpu (or disable mattrs) though
++    * when not using MCJIT so no instructions are generated which the old JIT
++    * can't handle. Not entirely sure if we really need to do anything yet.
++    */
++   builder.setMCPU(MCPU);
++#endif
++
+    builder.setJITMemoryManager(JITMemoryManager::CreateDefaultMemManager());
+ 
+    ExecutionEngine *JIT;
++
+ #if HAVE_LLVM >= 0x0302
+    JIT = builder.create();
+ #else
+-- 
+2.1.0
+

Copied: mesa/repos/testing-x86_64/LICENSE (from rev 222145, mesa/trunk/LICENSE)
===================================================================
--- testing-x86_64/LICENSE	                        (rev 0)
+++ testing-x86_64/LICENSE	2014-09-20 07:25:40 UTC (rev 222146)
@@ -0,0 +1,82 @@
+Disclaimer
+
+Mesa is a 3-D graphics library with an API which is very similar to
+that of OpenGL*
+To the extent that Mesa utilizes the OpenGL command syntax or state
+machine, it is being used with authorization from Silicon Graphics,
+Inc.(SGI). However, the author does not possess an OpenGL license
+from SGI, and makes no claim that Mesa is in any way a compatible
+replacement for OpenGL or associated with SGI. Those who want a
+licensed implementation of OpenGL should contact a licensed
+vendor.
+
+Please do not refer to the library as MesaGL (for legal
+reasons). It's just Mesa or The Mesa 3-D graphics
+library
+
+* OpenGL is a trademark of Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+The Mesa distribution consists of several components.  Different copyrights
+and licenses apply to different components.  For example, GLUT is copyrighted
+by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
+device drivers are copyrighted by their authors.  See below for a list of
+Mesa's main components and the license for each.
+
+The core Mesa library is licensed according to the terms of the MIT license.
+This allows integration with the XFree86, Xorg and DRI projects.
+
+The default Mesa license is as follows:
+
+Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Attention, Contributors
+
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary components of the Mesa distribution
+and their respective licenses.
+
+
+Mesa Component Licenses
+
+Component         Location               Primary Author      License
+----------------------------------------------------------------------------
+Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
+
+Device drivers    src/mesa/drivers/*     See drivers         See drivers
+
+Ext headers       include/GL/glext.h     SGI                 SGI Free B
+                  include/GL/glxext.h
+
+GLUT              src/glut/              Mark Kilgard        Mark's copyright
+
+Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
+
+SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
+
+demo programs     progs/demos/           various             see source files
+
+X demos           progs/xdemos/          Brian Paul          see source files
+
+SGI demos         progs/samples/         SGI                 SGI copyright
+
+RedBook demos     progs/redbook/         SGI                 SGI copyright

Copied: mesa/repos/testing-x86_64/PKGBUILD (from rev 222145, mesa/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2014-09-20 07:25:40 UTC (rev 222146)
@@ -0,0 +1,175 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=mesa
+pkgname=('opencl-mesa' 'mesa-dri' 'mesa-vdpau' 'mesa' 'mesa-libgl')
+pkgver=10.3.0
+pkgrel=1
+arch=('i686' 'x86_64')
+makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
+             'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd'
+             'libomxil-bellagio' 'libclc' 'clang')
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+#source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2{,.sig}
+source=(ftp://ftp.freedesktop.org/pub/mesa/10.3/MesaLib-${pkgver}.tar.bz2{,.sig}
+        LICENSE)
+sha256sums=('0283bfe710fa449ed82e465cfa09612a269e19abb7e0382082608062ce7960b5'
+            'SKIP'
+            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
+
+build() {
+  cd ${srcdir}/?esa-*
+
+  autoreconf -vfi # our automake is far too new for their build system :)
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+    --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
+    --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
+    --with-egl-platforms=x11,drm,wayland \
+    --enable-llvm-shared-libs \
+    --enable-egl \
+    --disable-gallium-egl \
+    --disable-gallium-gbm \
+    --enable-gbm \
+    --enable-gallium-llvm \
+    --enable-shared-glapi \
+    --enable-glx \
+    --enable-glx-tls \
+    --enable-dri \
+    --enable-osmesa \
+    --enable-gles1 \
+    --enable-gles2 \
+    --enable-texture-float \
+    --enable-xa \
+    --enable-vdpau \
+    --enable-omx \
+    --enable-opencl --enable-opencl-icd \
+    --with-clang-libdir=/usr/lib
+
+    # --help
+    # --disable-gallium-egl : not well maintained/expose more bugs, so prefer egl_dri2 (FS#40096)
+    # --disable-gallium-gbm : FS#41337 only useful with gallium-egl
+
+  make
+
+  # fake installation
+  mkdir $srcdir/fakeinstall
+  make DESTDIR=${srcdir}/fakeinstall install
+}
+
+package_opencl-mesa() {
+  pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
+  depends=('mesa-libgl' "mesa=${pkgver}" 'libcl' 'libclc' 'clang')
+  optdepends=('opencl-headers: headers necessary for OpenCL development')
+  
+  install -m755 -d ${pkgdir}/etc
+  mv -v ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/
+  
+  install -m755 -d ${pkgdir}/usr/lib
+  mv -v ${srcdir}/fakeinstall/usr/lib/lib*OpenCL* ${pkgdir}/usr/lib/
+  mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe ${pkgdir}/usr/lib/
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/"
+}
+
+package_mesa-dri() {
+  pkgdesc="Mesa DRI drivers"
+  depends=('mesa-libgl' "mesa=${pkgver}" 'libtxc_dxtn')
+  conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
+  provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
+  replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
+
+  install -m755 -d ${pkgdir}/etc
+  mv -v ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc
+  
+  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+  # ati-dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{r200,r300,r600,radeon{,si}}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
+  # nouveau-dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau{,_vieux}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
+  # intel-dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
+  # svga-dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
+   
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-dri"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-dri/"
+}
+
+package_mesa-vdpau() {
+  pkgdesc="Mesa VDPAU drivers"
+  depends=("mesa=${pkgver}")
+
+  install -m755 -d ${pkgdir}/usr/lib
+  mv -v ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib
+   
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/"
+}
+
+package_mesa() {
+  pkgdesc="an open-source implementation of the OpenGL specification"
+  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' 
+           'libomxil-bellagio' 'llvm-libs' 'libgl')
+  optdepends=('opengl-man-pages: for the OpenGL API man pages')
+  provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+  conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+  replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+
+  install -m755 -d ${pkgdir}/usr/lib
+  mv -v ${srcdir}/fakeinstall/usr/lib/bellagio  ${pkgdir}/usr/lib
+  mv -v ${srcdir}/fakeinstall/usr/lib/lib{OSMesa,gbm,glapi,wayland-egl,xatracker}.so* ${pkgdir}/usr/lib/
+  # FS#41337
+  #mv -v ${srcdir}/fakeinstall/usr/lib/gbm/gbm_gallium_drm* ${pkgdir}/usr/lib/gbm/
+
+  # swrast
+  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{kms_,}swrast_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
+
+  mv -v ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
+  mv -v ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
+  
+  install -m755 -d ${pkgdir}/usr/lib/mesa
+  # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
+  mv -v ${srcdir}/fakeinstall/usr/lib/libGL.so* 	${pkgdir}/usr/lib/mesa/
+  mv -v ${srcdir}/fakeinstall/usr/lib/libEGL.so* 	${pkgdir}/usr/lib/mesa/
+  mv -v ${srcdir}/fakeinstall/usr/lib/libGLES*.so*	${pkgdir}/usr/lib/mesa/
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
+}
+
+package_mesa-libgl() {
+  pkgdesc="Mesa 3-D graphics library"
+  depends=("mesa=${pkgver}")
+  provides=("libgl=${pkgver}")
+  replaces=('libgl')
+ 
+  # See FS#26284
+  install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
+  ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
+
+  ln -s /usr/lib/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0
+  ln -s libGL.so.1.2.0	             ${pkgdir}/usr/lib/libGL.so.1
+  ln -s libGL.so.1.2.0               ${pkgdir}/usr/lib/libGL.so
+
+  ln -s /usr/lib/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0
+  ln -s libEGL.so.1.0.0	              ${pkgdir}/usr/lib/libEGL.so.1
+  ln -s libEGL.so.1.0.0               ${pkgdir}/usr/lib/libEGL.so
+
+  ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0
+  ln -s libGLESv1_CM.so.1.1.0	            ${pkgdir}/usr/lib/libGLESv1_CM.so.1
+  ln -s libGLESv1_CM.so.1.1.0               ${pkgdir}/usr/lib/libGLESv1_CM.so
+
+  ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0
+  ln -s libGLESv2.so.2.0.0               ${pkgdir}/usr/lib/libGLESv2.so.2
+  ln -s libGLESv2.so.2.0.0               ${pkgdir}/usr/lib/libGLESv2.so
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
+}

Copied: mesa/repos/testing-x86_64/llvm35.patch (from rev 222145, mesa/trunk/llvm35.patch)
===================================================================
--- testing-x86_64/llvm35.patch	                        (rev 0)
+++ testing-x86_64/llvm35.patch	2014-09-20 07:25:40 UTC (rev 222146)
@@ -0,0 +1,26 @@
+From 564821c917f4a9d5a0de2ee77b90b0cd85e3d3a6 Mon Sep 17 00:00:00 2001
+From: Aaron Watry <awatry at gmail.com>
+Date: Fri, 20 Jun 2014 19:13:30 -0500
+Subject: gallivm: Fix build after LLVM commit 211259
+
+Signed-off-by: Aaron Watry <awatry at gmail.com>
+Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+index df26883..413a0c2 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+@@ -51,7 +51,9 @@
+ #include <llvm/MC/MCInstPrinter.h>
+ #include <llvm/MC/MCRegisterInfo.h>
+ 
+-#if HAVE_LLVM >= 0x0303
++#if HAVE_LLVM >= 0x0305
++#define OwningPtr std::unique_ptr
++#elif HAVE_LLVM >= 0x0303
+ #include <llvm/ADT/OwningPtr.h>
+ #endif
+ 
+-- 
+cgit v0.10.2
+




More information about the arch-commits mailing list