Attachment 73796 Details for Bug 59877 – v2: Right attempt to fix it on current master

[patch] v2: Right attempt to fix it on current master

0001-r600g-Fix-building-with-enable-r600-llvm-compiler-th.patch (text/plain), 3.14 KB, created by Johannes Obermayr on 2013-01-28 21:13:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Obermayr

Created: 2013-01-28 21:13:25 UTC

Size: 3.14 KB

patch

obsolete

>From 647b4009a4dfc9e53261acf10b9dc5d8afc37a32 Mon Sep 17 00:00:00 2001
>From: Johannes Obermayr <johannesobermayr@gmx.de>
>Date: Mon, 28 Jan 2013 20:18:40 +0100
>Subject: [PATCH v2] r600g: Fix building with --enable-r600-llvm-compiler the
> right way.
>
>This also reverts commit 91a160b19f5954fad6b1282880b843e8b1f15df4.
>---
> configure.ac                         |    9 ++++-----
> src/gallium/drivers/r600/Makefile.am |   21 ++++++++-------------
> 2 Dateien geÃ¤ndert, 12 Zeilen hinzugefÃ¼gt(+), 18 Zeilen entfernt(-)
>
>diff --git a/configure.ac b/configure.ac
>index 1e352db..e9f7c8a 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1833,12 +1833,12 @@ if test "x$with_gallium_drivers" != x; then
>             GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
>             if test "x$enable_r600_llvm" = xyes -o "x$enable_opencl" = xyes; then
>                 radeon_llvm_check
>+                USE_R600_LLVM_COMPILER=yes;
>                 NEED_RADEON_GALLIUM=yes;
>-                R600_NEED_RADEON_GALLIUM=yes;
>-                LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo bitreader asmparser"
>+                LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo"
>             fi
>-            if test "x$enable_r600_llvm" = xyes; then
>-                USE_R600_LLVM_COMPILER=yes;
>+            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"
>             ;;
>@@ -1988,7 +1988,6 @@ 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 6f48b56..24d0ba5 100644
>--- a/src/gallium/drivers/r600/Makefile.am
>+++ b/src/gallium/drivers/r600/Makefile.am
>@@ -8,13 +8,14 @@ AM_CFLAGS = \
> 	-I$(top_srcdir)/include \
> 	$(GALLIUM_CFLAGS) \
> 	$(RADEON_CFLAGS) \
>-	$(VISIBILITY_CFLAGS)
>+	$(VISIBILITY_CFLAGS) \
>+	$(DEFINES)
> 
> libr600_la_SOURCES = \
> 	$(C_SOURCES)
> 
>-if R600_NEED_RADEON_GALLIUM
>-
>+if USE_R600_LLVM_COMPILER
>+if HAVE_GALLIUM_COMPUTE
> libr600_la_SOURCES += \
> 	$(LLVM_C_SOURCES) \
> 	$(LLVM_CXX_SOURCES)
>@@ -22,19 +23,13 @@ libr600_la_SOURCES += \
> libr600_la_LIBADD = ../radeon/libllvmradeon@VERSION@.la
> 
> AM_CFLAGS += \
>-	$(LLVM_CFLAGS) \
>-	-I$(top_srcdir)/src/gallium/drivers/radeon/
>+	-DHAVE_OPENCL
> 
>-AM_CXXFLAGS= \
>+AM_CXXFLAGS = \
> 	$(LLVM_CXXFLAGS)
> endif
>-
>-if USE_R600_LLVM_COMPILER
> AM_CFLAGS += \
>+	-I$(top_srcdir)/src/gallium/drivers/radeon \
>+	$(LLVM_CFLAGS) \
> 	-DR600_USE_LLVM
> endif
>-
>-if HAVE_GALLIUM_COMPUTE
>-AM_CFLAGS += \
>-	-DHAVE_OPENCL
>-endif
>-- 
>1.7.10.4
>

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.