summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/radeonsi
diff options
context:
space:
mode:
authorMaarten Lankhorst <[email protected]>2014-03-06 15:20:56 +0100
committerMaarten Lankhorst <[email protected]>2014-03-10 17:08:19 +0100
commit8c136b53b79e90b9e8f30f891b8bef112fee375d (patch)
treeead859a9735573cb4df2913a04da7a12e9f0652e /src/gallium/targets/radeonsi
parent952fda4d3feca9b676a12d011523feaaf5836086 (diff)
fix vdpau interop when using -Bsymbolic-functions in ldflags
Explicitly add radeon_drm_winsys_create and nouveau_drm_screen_create to the dynamic list. This will ensure vdpau interop still works even when the user links with -Bsymbolic-functions in hardened builds. Signed-off-by: Maarten Lankhorst <[email protected]> Tested-by: Rachel Greenham <[email protected]> Reported-by: Peter Frühberger <[email protected]> Reviewed-by: Christian König <[email protected]>
Diffstat (limited to 'src/gallium/targets/radeonsi')
-rw-r--r--src/gallium/targets/radeonsi/dri/Makefile.am4
-rw-r--r--src/gallium/targets/radeonsi/vdpau/Makefile.am4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/gallium/targets/radeonsi/dri/Makefile.am b/src/gallium/targets/radeonsi/dri/Makefile.am
index eab28b5a253..c49e5fcac87 100644
--- a/src/gallium/targets/radeonsi/dri/Makefile.am
+++ b/src/gallium/targets/radeonsi/dri/Makefile.am
@@ -37,7 +37,9 @@ nodist_EXTRA_radeonsi_dri_la_SOURCES = dummy.cpp
radeonsi_dri_la_SOURCES = \
drm_target.c
-radeonsi_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
+radeonsi_dri_la_LDFLAGS = \
+ $(GALLIUM_DRI_LINKER_FLAGS) \
+ -Wl,--dynamic-list=$(srcdir)/../../r300/dri/radeon.dyn
radeonsi_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am b/src/gallium/targets/radeonsi/vdpau/Makefile.am
index 54d65b3d783..8e276136842 100644
--- a/src/gallium/targets/radeonsi/vdpau/Makefile.am
+++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am
@@ -36,7 +36,9 @@ libvdpau_radeonsi_la_SOURCES = \
$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
libvdpau_radeonsi_la_LDFLAGS = \
- $(GALLIUM_VDPAU_LINKER_FLAGS)
+ $(GALLIUM_VDPAU_LINKER_FLAGS) \
+ -Wl,--dynamic-list=$(srcdir)/../../r300/dri/radeon.dyn
+
libvdpau_radeonsi_la_LIBADD = \
$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \