Mesa (master): targets/dri: use a single version script to restict exported symbols
Emil Velikov
evelikov at kemper.freedesktop.org
Fri May 2 20:52:08 UTC 2014
Module: Mesa
Branch: master
Commit: 6239d42fdbd15f68442a71563902ac7d51a92fcf
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6239d42fdbd15f68442a71563902ac7d51a92fcf
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Fri Apr 4 23:52:21 2014 +0100
targets/dri: use a single version script to restict exported symbols
Rather than having multiple (almost) identical version scripts use
a single one.
Cc: Christian König <christian.koenig at amd.com>
Acked-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
src/gallium/Automake.inc | 6 ++----
src/gallium/state_trackers/dri/dri.link | 5 -----
src/gallium/targets/dri-nouveau/Makefile.am | 1 -
src/gallium/targets/{dri-nouveau/nouveau_dri.link => dri.sym} | 6 ++++--
src/gallium/targets/r300/dri/Makefile.am | 1 -
src/gallium/targets/r300/dri/radeon.link | 6 ------
src/gallium/targets/r600/dri/Makefile.am | 1 -
src/gallium/targets/radeonsi/dri/Makefile.am | 1 -
8 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index f857c1a..feed5c3 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -51,15 +51,13 @@ GALLIUM_VIDEO_CFLAGS = \
$(VISIBILITY_CFLAGS)
-DRI_VERSION_SCRIPT ?= $(top_srcdir)/src/gallium/state_trackers/dri/dri.link
-
GALLIUM_DRI_LINKER_FLAGS = \
-shared \
-shrext .so \
-module \
-avoid-version \
- $(GC_SECTIONS) \
- -Wl,--version-script=$(DRI_VERSION_SCRIPT)
+ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri.sym \
+ $(GC_SECTIONS)
GALLIUM_VDPAU_LINKER_FLAGS = \
-shared \
diff --git a/src/gallium/state_trackers/dri/dri.link b/src/gallium/state_trackers/dri/dri.link
deleted file mode 100644
index 163902e..0000000
--- a/src/gallium/state_trackers/dri/dri.link
+++ /dev/null
@@ -1,5 +0,0 @@
-VERSION {
- global:
- __driDriverExtensions;
- local: *;
-};
diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am
index 6c749bc..a479040 100644
--- a/src/gallium/targets/dri-nouveau/Makefile.am
+++ b/src/gallium/targets/dri-nouveau/Makefile.am
@@ -20,7 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-DRI_VERSION_SCRIPT = $(srcdir)/nouveau_dri.link
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
diff --git a/src/gallium/targets/dri-nouveau/nouveau_dri.link b/src/gallium/targets/dri.sym
similarity index 60%
rename from src/gallium/targets/dri-nouveau/nouveau_dri.link
rename to src/gallium/targets/dri.sym
index 16015aa..c99aa09 100644
--- a/src/gallium/targets/dri-nouveau/nouveau_dri.link
+++ b/src/gallium/targets/dri.sym
@@ -1,6 +1,8 @@
-VERSION {
+{
global:
__driDriverExtensions;
nouveau_drm_screen_create;
- local: *;
+ radeon_drm_winsys_create;
+ local:
+ *;
};
diff --git a/src/gallium/targets/r300/dri/Makefile.am b/src/gallium/targets/r300/dri/Makefile.am
index 2650544..c780fd9 100644
--- a/src/gallium/targets/r300/dri/Makefile.am
+++ b/src/gallium/targets/r300/dri/Makefile.am
@@ -20,7 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-DRI_VERSION_SCRIPT = $(srcdir)/radeon.link
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
diff --git a/src/gallium/targets/r300/dri/radeon.link b/src/gallium/targets/r300/dri/radeon.link
deleted file mode 100644
index 618058b..0000000
--- a/src/gallium/targets/r300/dri/radeon.link
+++ /dev/null
@@ -1,6 +0,0 @@
-VERSION {
- global:
- __driDriverExtensions;
- radeon_drm_winsys_create;
- local: *;
-};
diff --git a/src/gallium/targets/r600/dri/Makefile.am b/src/gallium/targets/r600/dri/Makefile.am
index 697abac..e13275e 100644
--- a/src/gallium/targets/r600/dri/Makefile.am
+++ b/src/gallium/targets/r600/dri/Makefile.am
@@ -20,7 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-DRI_VERSION_SCRIPT = $(srcdir)/../../r300/dri/radeon.link
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
diff --git a/src/gallium/targets/radeonsi/dri/Makefile.am b/src/gallium/targets/radeonsi/dri/Makefile.am
index 4f36297..c9910dd 100644
--- a/src/gallium/targets/radeonsi/dri/Makefile.am
+++ b/src/gallium/targets/radeonsi/dri/Makefile.am
@@ -20,7 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-DRI_VERSION_SCRIPT = $(srcdir)/../../r300/dri/radeon.link
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
More information about the mesa-commit
mailing list