From c207fa6c180bdd121a80e155465160086b87e734 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 6 Oct 2013 19:52:13 +0200 Subject: [PATCH] gallium/dri targets: use DRI_DRIVER_LDFLAGS which contains -Wl,-Bsymbolic. If I understand it correctly, it prevents symbols from clashing if multiple drivers are loaded at the same time. Tested-by: Emil Velikov --- src/gallium/targets/dri-freedreno/Makefile.am | 2 +- src/gallium/targets/dri-i915/Makefile.am | 2 +- src/gallium/targets/dri-ilo/Makefile.am | 2 +- src/gallium/targets/dri-nouveau/Makefile.am | 2 +- src/gallium/targets/dri-swrast/Makefile.am | 2 +- src/gallium/targets/dri-vmwgfx/Makefile.am | 2 +- src/gallium/targets/r300/dri/Makefile.am | 2 +- src/gallium/targets/r600/dri/Makefile.am | 2 +- src/gallium/targets/radeonsi/dri/Makefile.am | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gallium/targets/dri-freedreno/Makefile.am b/src/gallium/targets/dri-freedreno/Makefile.am index ac7460a365d..228fafc65ff 100644 --- a/src/gallium/targets/dri-freedreno/Makefile.am +++ b/src/gallium/targets/dri-freedreno/Makefile.am @@ -39,7 +39,7 @@ AM_CPPFLAGS = \ dridir = $(DRI_DRIVER_INSTALL_DIR) dri_LTLIBRARIES = kgsl_dri.la msm_dri.la -COMMON_LDFLAGS = -module -avoid-version -shared -no-undefined +COMMON_LDFLAGS = $(DRI_DRIVER_LDFLAGS) COMMON_LIBADD = \ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am index e1c6ecab4b4..851c412ce29 100644 --- a/src/gallium/targets/dri-i915/Makefile.am +++ b/src/gallium/targets/dri-i915/Makefile.am @@ -42,7 +42,7 @@ dri_LTLIBRARIES = i915_dri.la i915_dri_la_SOURCES = target.c -i915_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined +i915_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) i915_dri_la_LIBADD = \ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ diff --git a/src/gallium/targets/dri-ilo/Makefile.am b/src/gallium/targets/dri-ilo/Makefile.am index 88233f651ba..776c970ce8f 100644 --- a/src/gallium/targets/dri-ilo/Makefile.am +++ b/src/gallium/targets/dri-ilo/Makefile.am @@ -42,7 +42,7 @@ noinst_LTLIBRARIES = ilo_dri.la ilo_dri_la_SOURCES = target.c # need -rpath to create a noinst shared library -ilo_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined \ +ilo_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) \ -rpath $(abs_builddir) ilo_dri_la_LIBADD = \ diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am index a02394e42d3..17b2c4a4ada 100644 --- a/src/gallium/targets/dri-nouveau/Makefile.am +++ b/src/gallium/targets/dri-nouveau/Makefile.am @@ -41,7 +41,7 @@ dri_LTLIBRARIES = nouveau_dri.la nodist_EXTRA_nouveau_dri_la_SOURCES = dummy.cpp nouveau_dri_la_SOURCES = target.c -nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined +nouveau_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) nouveau_dri_la_LIBADD = \ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am index 0ab6cc6d00c..cdbda976457 100644 --- a/src/gallium/targets/dri-swrast/Makefile.am +++ b/src/gallium/targets/dri-swrast/Makefile.am @@ -47,7 +47,7 @@ swrast_dri_la_SOURCES = \ $(top_srcdir)/src/mesa/drivers/dri/common/drisw_util.c \ $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c -swrast_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined +swrast_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) swrast_dri_la_LIBADD = \ $(top_builddir)/src/mesa/libmesagallium.la \ diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am index f7008ab8179..5ff521e5493 100644 --- a/src/gallium/targets/dri-vmwgfx/Makefile.am +++ b/src/gallium/targets/dri-vmwgfx/Makefile.am @@ -42,7 +42,7 @@ vmwgfx_dri_la_SOURCES = \ target.c \ vmw_powf.c -vmwgfx_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined +vmwgfx_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) vmwgfx_dri_la_LIBADD = \ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ diff --git a/src/gallium/targets/r300/dri/Makefile.am b/src/gallium/targets/r300/dri/Makefile.am index 185330bf3e4..4b41c3077b2 100644 --- a/src/gallium/targets/r300/dri/Makefile.am +++ b/src/gallium/targets/r300/dri/Makefile.am @@ -44,7 +44,7 @@ nodist_EXTRA_r300_dri_la_SOURCES = dummy.cpp r300_dri_la_SOURCES = \ ../drm_target.c -r300_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined +r300_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) r300_dri_la_LIBADD = \ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ diff --git a/src/gallium/targets/r600/dri/Makefile.am b/src/gallium/targets/r600/dri/Makefile.am index fbd0c244075..c7fca320f2b 100644 --- a/src/gallium/targets/r600/dri/Makefile.am +++ b/src/gallium/targets/r600/dri/Makefile.am @@ -43,7 +43,7 @@ dri_LTLIBRARIES = r600_dri.la r600_dri_la_SOURCES = \ ../drm_target.c -r600_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined +r600_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) r600_dri_la_LIBADD = \ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ diff --git a/src/gallium/targets/radeonsi/dri/Makefile.am b/src/gallium/targets/radeonsi/dri/Makefile.am index f8e35e91269..8a78f1b80d4 100644 --- a/src/gallium/targets/radeonsi/dri/Makefile.am +++ b/src/gallium/targets/radeonsi/dri/Makefile.am @@ -44,7 +44,7 @@ nodist_EXTRA_radeonsi_dri_la_SOURCES = dummy.cpp radeonsi_dri_la_SOURCES = \ ../drm_target.c -radeonsi_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined +radeonsi_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) radeonsi_dri_la_LIBADD = \ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \ -- 2.30.2