From 3bbbb63801c9c30440398563d6090029f9c7b51c Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 28 Feb 2017 10:55:46 +0000 Subject: [PATCH] automake: r600: radeonsi: correctly manage libamd_common.la linking MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Emil Velikov Acked-by: Marek Olšák Reviewed-by: Michel Dänzer Tested-by: Michel Dänzer --- src/gallium/drivers/r600/Automake.inc | 6 +++--- src/gallium/drivers/radeonsi/Automake.inc | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/r600/Automake.inc b/src/gallium/drivers/r600/Automake.inc index 5995433ce96..3ff5501d6c4 100644 --- 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 5a9dcfd9fd6..1bc7b93f8c3 100644 --- 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 -- 2.30.2