[Mesa-dev] [PATCH 07/16] targets/omx: use version script to limit amount of exported symbols

[Emil Velikov]

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.

Cc: Christian König <christian.koenig at amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 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 a70ab6c..2fbea6e 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -80,7 +80,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) \
 	-Wl,--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 = \
-- 
1.9.1