automake: r600: radeonsi: correctly manage libamd_common.la linking

Since both r600 and radeonsi use code from libamd_common they need to
static link it. At the same time, adding a common library to LIB_DEPS is
fragile [can lean to multiple symbol definitions] and non-obvious - I
had to do a double-take how things work atm.

So follow the libradeon.la approach and put common libraries in
TARGET_RADEON_COMMON

Fixes: 936f5407a7d ("gallium/radeon: Add libamd_common.a to TARGET_LIB_DEPS also for r600")
Cc: Timothy Arceri <tarceri@itsqueeze.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Tested-by: Michel Dänzer <michel.daenzer@amd.com>

diff --git a/src/gallium/drivers/r600/Automake.inc b/src/gallium/drivers/r600/Automake.inc
index 5995433ce9671225f45c19f1ee19ce23e1415498..3ff5501d6c4a25a8579886c7e40cc4b055af8c4d 100644 (file)
--- a/src/gallium/drivers/r600/Automake.inc
+++ b/src/gallium/drivers/r600/Automake.inc
@@ -13,9 +13,9 @@ TARGET_RADEON_WINSYS = \
 TARGET_RADEON_COMMON = \
        $(top_builddir)/src/gallium/drivers/radeon/libradeon.la
 
+if NEED_RADEON_LLVM
+TARGET_RADEON_COMMON += \
+       $(top_builddir)/src/amd/common/libamd_common.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 5a9dcfd9fd61c537f2cb58eace7ad715258e60bc..1bc7b93f8c3ecf47eb8adc719542ed057c83c6f2 100644 (file)
--- a/src/gallium/drivers/radeonsi/Automake.inc
+++ b/src/gallium/drivers/radeonsi/Automake.inc
@@ -13,6 +13,7 @@ TARGET_RADEON_WINSYS = \
        $(top_builddir)/src/gallium/winsys/amdgpu/drm/libamdgpuwinsys.la
 
 TARGET_RADEON_COMMON = \
-       $(top_builddir)/src/gallium/drivers/radeon/libradeon.la
+       $(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
+       $(top_builddir)/src/amd/common/libamd_common.la
 
 endif