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@amd.com>
Acked-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index f857c1a..feed5c3 100644 (file)
--- 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 (file)
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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
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 (file)
--- 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 (file)
--- 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 = \