fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 13:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
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: 936f5407a7 ("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>
This commit is contained in:
Emil Velikov 2017-02-28 10:55:46 +00:00 • committed by Emil Velikov
parent 8af447d6f0
commit 3bbbb63801
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/r600/Automake.inc
View file

@ -13,9 +13,9 @@ TARGET_RADEON_WINSYS = \
TARGET_RADEON_COMMON = \ TARGET_RADEON_COMMON = \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la $(top_builddir)/src/gallium/drivers/radeon/libradeon.la
endif
if NEED_RADEON_LLVM if NEED_RADEON_LLVM
TARGET_LIB_DEPS += \ TARGET_RADEON_COMMON += \
$(top_builddir)/src/amd/common/libamd_common.la $(top_builddir)/src/amd/common/libamd_common.la
endif endif
endif

3
src/gallium/drivers/radeonsi/Automake.inc
View file

@ -13,6 +13,7 @@ TARGET_RADEON_WINSYS = \
$(top_builddir)/src/gallium/winsys/amdgpu/drm/libamdgpuwinsys.la $(top_builddir)/src/gallium/winsys/amdgpu/drm/libamdgpuwinsys.la
TARGET_RADEON_COMMON = \ 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 endif