From 69d790da9f5307c54c7a7c280e158c412f91dc84 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 4 Apr 2014 23:59:30 +0100 Subject: [PATCH] targets/vdpau: use version script to limit the exported symbols MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Using export-symbols-regex is the least desirable method of restricting the exported symbols, as is completely messes up with the symbol table. Signed-off-by: Emil Velikov Reviewed-by: Christian König --- src/gallium/Automake.inc | 2 +- src/gallium/targets/r600/vdpau/Makefile.am | 2 -- src/gallium/targets/radeonsi/vdpau/Makefile.am | 2 -- src/gallium/targets/vdpau-nouveau/Makefile.am | 2 -- src/gallium/targets/vdpau.sym | 8 ++++++++ 5 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 src/gallium/targets/vdpau.sym diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index 5a4f4e8c455..4519c161c09 100644 --- a/src/gallium/Automake.inc +++ b/src/gallium/Automake.inc @@ -64,7 +64,7 @@ GALLIUM_VDPAU_LINKER_FLAGS = \ -module \ -no-undefined \ -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \ - -export-symbols-regex $(VDPAU_EXPORTS) \ + -Wl,--version-script=$(top_srcdir)/src/gallium/targets/vdpau.sym \ $(GC_SECTIONS) \ $(LD_NO_UNDEFINED) diff --git a/src/gallium/targets/r600/vdpau/Makefile.am b/src/gallium/targets/r600/vdpau/Makefile.am index 455d90f795b..b212024b752 100644 --- a/src/gallium/targets/r600/vdpau/Makefile.am +++ b/src/gallium/targets/r600/vdpau/Makefile.am @@ -20,8 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -# Note: Make sure VDPAU_EXPORTS is defined before including Automake.inc -VDPAU_EXPORTS = '^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$' include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am b/src/gallium/targets/radeonsi/vdpau/Makefile.am index b8dcf8865df..975ae7884b7 100644 --- a/src/gallium/targets/radeonsi/vdpau/Makefile.am +++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am @@ -20,8 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -# Note: Make sure VDPAU_EXPORTS is defined before including Automake.inc -VDPAU_EXPORTS = '^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$' include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am b/src/gallium/targets/vdpau-nouveau/Makefile.am index de1adf83619..36d2f4761ff 100644 --- a/src/gallium/targets/vdpau-nouveau/Makefile.am +++ b/src/gallium/targets/vdpau-nouveau/Makefile.am @@ -20,8 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -# Note: Make sure VDPAU_EXPORTS is defined before including Automake.inc -VDPAU_EXPORTS = '^(vdp_imp_device_create_x11|nouveau_drm_screen_create)$$' include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ diff --git a/src/gallium/targets/vdpau.sym b/src/gallium/targets/vdpau.sym new file mode 100644 index 00000000000..f184193c055 --- /dev/null +++ b/src/gallium/targets/vdpau.sym @@ -0,0 +1,8 @@ +{ + global: + vdp_imp_device_create_x11; + nouveau_drm_screen_create; + radeon_drm_winsys_create; + local: + *; +}; -- 2.30.2