summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-04-04 23:52:21 +0100
committerEmil Velikov <[email protected]>2014-05-02 21:48:25 +0100
commit6239d42fdbd15f68442a71563902ac7d51a92fcf (patch)
treec659365775a249266035e1b940294f75f9db08f4
parentb8f31dfc22eb90c1703c8d414eedb841c9025f52 (diff)
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 <[email protected]> Acked-by: Maarten Lankhorst <[email protected]> Signed-off-by: Emil Velikov <[email protected]>
-rw-r--r--src/gallium/Automake.inc6
-rw-r--r--src/gallium/state_trackers/dri/dri.link5
-rw-r--r--src/gallium/targets/dri-nouveau/Makefile.am1
-rw-r--r--src/gallium/targets/dri.sym (renamed from src/gallium/targets/dri-nouveau/nouveau_dri.link)6
-rw-r--r--src/gallium/targets/r300/dri/Makefile.am1
-rw-r--r--src/gallium/targets/r300/dri/radeon.link6
-rw-r--r--src/gallium/targets/r600/dri/Makefile.am1
-rw-r--r--src/gallium/targets/radeonsi/dri/Makefile.am1
8 files changed, 6 insertions, 21 deletions
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index f857c1a793d..feed5c32cb0 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 163902eff58..00000000000
--- 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 6c749bcaffc..a479040d6c7 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
index 16015aa3d81..c99aa09b4d9 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 26505447dd1..c780fd9cb72 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 618058b13db..00000000000
--- 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 697abacb954..e13275ee230 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 4f362977d7e..c9910dd669f 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 = \