Attachment 73669 Details for Bug 59887 – Possible fix

Possible fix

0001-PATCH-r600g-build-the-llvm-wrapper-if-llvm-compiler-.patch (text/plain), 1.67 KB, created by Laurent carlier on 2013-01-26 07:07:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Laurent carlier

Created: 2013-01-26 07:07:26 UTC

Size: 1.67 KB

patch

obsolete

>From d50684bf73258dc9e098fef005dbe9e35a3a735c Mon Sep 17 00:00:00 2001
>From: Laurent Carlier <lordheavym@gmail.com>
>Date: Sat, 26 Jan 2013 07:44:45 +0100
>Subject: [PATCH] PATCH] r600g: build the llvm wrapper if llvm-compiler or
> opencl is enabled
>
>264e6dad28e64755dc1580abdbb4e339c3439883 was building the llvm wrapper
>only if llvm-compiler or opencl was enabled.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=59887
>---
> configure.ac                         | 2 ++
> src/gallium/drivers/r600/Makefile.am | 5 +----
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 9cc5c4a..99dec34 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1996,6 +1996,8 @@ AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = xyes)
> AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes)
> AM_CONDITIONAL(HAVE_MESA_LLVM, test x$MESA_LLVM = x1)
> AM_CONDITIONAL(LLVM_NEEDS_FNORTTI, test $LLVM_VERSION_INT -ge 302)
>+AM_CONDITIONAL(NEED_LLVM_WRAPPER, test x$USE_R600_LLVM_COMPILER = xyes -o \
>+                                       x$enable_gallium_loader = xyes)
> 
> AC_SUBST([GALLIUM_MAKE_DIRS])
> 
>diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
>index 6de7e0f..88e1ac0 100644
>--- a/src/gallium/drivers/r600/Makefile.am
>+++ b/src/gallium/drivers/r600/Makefile.am
>@@ -13,9 +13,7 @@ AM_CFLAGS = \
> libr600_la_SOURCES = \
> 	$(C_SOURCES)
> 
>-if USE_R600_LLVM_COMPILER
>-if HAVE_GALLIUM_COMPUTE
>-
>+if NEED_LLVM_WRAPPER
> libr600_la_SOURCES += \
> 	$(LLVM_C_SOURCES) \
> 	$(LLVM_CXX_SOURCES)
>@@ -29,7 +27,6 @@ AM_CFLAGS += \
> AM_CXXFLAGS= \
> 	$(LLVM_CXXFLAGS)
> endif
>-endif
> 
> if USE_R600_LLVM_COMPILER
> AM_CFLAGS += \
>-- 
>1.8.1.1
>

Actions: View

Attachments on bug 59887: 73669

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.