Attachment 73672 Details for Bug 59877 – Possible fix v2

[patch] Possible fix v2

0001-r600g-Fix-building-with-enable-r600-llvm-compiler.patch (text/plain), 2.46 KB, created by Tom Stellard on 2013-01-26 08:42:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Stellard

Created: 2013-01-26 08:42:41 UTC

Size: 2.46 KB

patch

obsolete

>From 8de4c4d0a7f482c163d0a377b207bd155d614a75 Mon Sep 17 00:00:00 2001
>From: Tom Stellard <thomas.stellard@amd.com>
>Date: Fri, 25 Jan 2013 20:50:31 -0500
>Subject: [PATCH] r600g: Fix building with --enable-r600-llvm-compiler
>
>---
> configure.ac                         |    7 +++----
> src/gallium/drivers/r600/Makefile.am |    4 +---
> 2 files changed, 4 insertions(+), 7 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 9cc5c4a..1e352db 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1834,14 +1834,12 @@ if test "x$with_gallium_drivers" != x; then
>             if test "x$enable_r600_llvm" = xyes -o "x$enable_opencl" = xyes; then
>                 radeon_llvm_check
>                 NEED_RADEON_GALLIUM=yes;
>-                LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo"
>+                R600_NEED_RADEON_GALLIUM=yes;
>+                LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo bitreader asmparser"
>             fi
>             if test "x$enable_r600_llvm" = xyes; then
>                 USE_R600_LLVM_COMPILER=yes;
>             fi
>-            if test "x$enable_opencl" = xyes -a "x$with_llvm_shared_libs" = xno; then
>-                LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser"
>-            fi
>             gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600"
>             ;;
>         xradeonsi)
>@@ -1990,6 +1988,7 @@ AM_CONDITIONAL(HAVE_GALAHAD_GALLIUM, test x$HAVE_GALAHAD_GALLIUM = xyes)
> AM_CONDITIONAL(HAVE_IDENTITY_GALLIUM, test x$HAVE_IDENTITY_GALLIUM = xyes)
> AM_CONDITIONAL(HAVE_NOOP_GALLIUM, test x$HAVE_NOOP_GALLIUM = xyes)
> AM_CONDITIONAL(NEED_RADEON_GALLIUM, test x$NEED_RADEON_GALLIUM = xyes)
>+AM_CONDITIONAL(R600_NEED_RADEON_GALLIUM, test x$R600_NEED_RADEON_GALLIUM = xyes)
> AM_CONDITIONAL(USE_R600_LLVM_COMPILER, test x$USE_R600_LLVM_COMPILER = xyes)
> AM_CONDITIONAL(HAVE_LOADER_GALLIUM, test x$enable_gallium_loader = xyes)
> AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = xyes)
>diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
>index 6de7e0f..6f48b56 100644
>--- a/src/gallium/drivers/r600/Makefile.am
>+++ b/src/gallium/drivers/r600/Makefile.am
>@@ -13,8 +13,7 @@ AM_CFLAGS = \
> libr600_la_SOURCES = \
> 	$(C_SOURCES)
> 
>-if USE_R600_LLVM_COMPILER
>-if HAVE_GALLIUM_COMPUTE
>+if R600_NEED_RADEON_GALLIUM
> 
> libr600_la_SOURCES += \
> 	$(LLVM_C_SOURCES) \
>@@ -29,7 +28,6 @@ AM_CFLAGS += \
> AM_CXXFLAGS= \
> 	$(LLVM_CXXFLAGS)
> endif
>-endif
> 
> if USE_R600_LLVM_COMPILER
> AM_CFLAGS += \
>-- 
>1.7.8.6
>

Actions: View | Splinter Review

Attachments on bug 59877: 73664 | 73672 | 73792 | 73796 | 73847

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.