Mesa (master): gallium/radeon: Add libamd_common.a to TARGET_LIB_DEPS also for r600

[Michel Dänzer]

Module: Mesa
Branch: master
Commit: 936f5407a7da0449926a4f89abd222503ba43eb4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=936f5407a7da0449926a4f89abd222503ba43eb4

Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Feb 28 15:21:39 2017 +0900

gallium/radeon: Add libamd_common.a to TARGET_LIB_DEPS also for r600

Fixes build failure with --enable-opencl --enable-xvmc:

make[4]: Entering directory '/home/daenzer/src/mesa-git/mesa/build-amd64/src/gallium/targets/xvmc'
  CXXLD    libXvMCgallium.la
../../../../src/gallium/drivers/r600/.libs/libr600.a(evergreen_compute.o): In function `evergreen_create_compute_state':
/home/daenzer/src/mesa-git/mesa/build-amd64/src/gallium/drivers/r600/../../../../../src/gallium/drivers/r600/evergreen_compute.c:254: undefined reference to `ac_elf_read'
../../../../src/gallium/drivers/r600/.libs/libr600.a(evergreen_compute.o): In function `r600_shader_binary_read_config':
/home/daenzer/src/mesa-git/mesa/build-amd64/src/gallium/drivers/r600/../../../../../src/gallium/drivers/r600/evergreen_compute.c:189: undefined reference to `ac_shader_binary_config_start'
/home/daenzer/src/mesa-git/mesa/build-amd64/src/gallium/drivers/r600/../../../../../src/gallium/drivers/r600/evergreen_compute.c:189: undefined reference to `ac_shader_binary_config_start'
collect2: error: ld returned 1 exit status
Makefile:760: recipe for target 'libXvMCgallium.la' failed

Fixes: dc4c551a345d ("radeon/ac: switch from radeon_elf_read() to ac_elf_read()")
Acked-by: Timothy Arceri <tarceri at itsqueeze.com>
Tested-by: Timothy Arceri <tarceri at itsqueeze.com>

---

 src/gallium/drivers/r600/Automake.inc     | 5 +++++
 src/gallium/drivers/radeonsi/Automake.inc | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/r600/Automake.inc b/src/gallium/drivers/r600/Automake.inc
index 914eea3..5995433 100644
--- a/src/gallium/drivers/r600/Automake.inc
+++ b/src/gallium/drivers/r600/Automake.inc
@@ -14,3 +14,8 @@ TARGET_RADEON_COMMON = \
 	$(top_builddir)/src/gallium/drivers/radeon/libradeon.la
 
 endif
+
+if NEED_RADEON_LLVM
+TARGET_LIB_DEPS += \
+        $(top_builddir)/src/amd/common/libamd_common.la
+endif
diff --git a/src/gallium/drivers/radeonsi/Automake.inc b/src/gallium/drivers/radeonsi/Automake.inc
index de52835..5a9dcfd 100644
--- a/src/gallium/drivers/radeonsi/Automake.inc
+++ b/src/gallium/drivers/radeonsi/Automake.inc
@@ -4,7 +4,6 @@ TARGET_DRIVERS += radeonsi
 TARGET_CPPFLAGS += -DGALLIUM_RADEONSI
 TARGET_LIB_DEPS += \
 	$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
-	$(top_builddir)/src/amd/common/libamd_common.la \
 	$(RADEON_LIBS) \
 	$(LIBDRM_LIBS) \
 	$(AMDGPU_LIBS)