From bea9e8dca010c84b8281000d69b62dcdc0341bf3 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 4 Apr 2014 23:53:13 +0100 Subject: [PATCH] targets/omx: use version script to limit amount of 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. radeon_drm_winsys_create is not needed, avoid exporting it. Signed-off-by: Emil Velikov Reviewed-by: Christian König --- src/gallium/Automake.inc | 2 +- src/gallium/targets/omx.sym | 6 ++++++ src/gallium/targets/r600/omx/Makefile.am | 2 -- src/gallium/targets/radeonsi/omx/Makefile.am | 2 -- 4 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 src/gallium/targets/omx.sym diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index feed5c3..5263b7a 100644 --- a/src/gallium/Automake.inc +++ b/src/gallium/Automake.inc @@ -81,7 +81,7 @@ GALLIUM_OMX_LINKER_FLAGS = \ -shared \ -module \ -no-undefined \ - -export-symbols-regex $(EXPORTS) \ + -Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx.sym \ $(GC_SECTIONS) \ $(LD_NO_UNDEFINED) diff --git a/src/gallium/targets/omx.sym b/src/gallium/targets/omx.sym new file mode 100644 index 0000000..af22aed --- /dev/null +++ b/src/gallium/targets/omx.sym @@ -0,0 +1,6 @@ +{ + global: + omx_component_library_Setup; + local: + *; +}; diff --git a/src/gallium/targets/r600/omx/Makefile.am b/src/gallium/targets/r600/omx/Makefile.am index 2168db8..62e3970 100644 --- a/src/gallium/targets/r600/omx/Makefile.am +++ b/src/gallium/targets/r600/omx/Makefile.am @@ -20,8 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -EXPORTS = '^(omx_component_library_Setup|radeon_drm_winsys_create)$$' - include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ diff --git a/src/gallium/targets/radeonsi/omx/Makefile.am b/src/gallium/targets/radeonsi/omx/Makefile.am index 3c37909..859659e 100644 --- a/src/gallium/targets/radeonsi/omx/Makefile.am +++ b/src/gallium/targets/radeonsi/omx/Makefile.am @@ -20,8 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -EXPORTS = '^(omx_component_library_Setup|radeon_drm_winsys_create)$$' - include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ -- 2.7.4