gallium: Pass version scripts to linker using --version-script=

This fixes build failures with the gold linker.

CC: "10.0" <mesa-stable@lists.freedesktop.org>

diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index 760c477148df5f04b83125fc29db413f42f3b346..fdd5a1d067a3480c751f525937a4d6b11c9120b3 100644 (file)
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -30,7 +30,7 @@
 #
 include $(top_srcdir)/src/gallium/Automake.inc
 
-LDFLAGS += -Wl,$(top_srcdir)/src/gallium/targets/egl-static/egl.link
+LDFLAGS += -Wl,--version-script=$(top_srcdir)/src/gallium/targets/egl-static/egl.link
 
 AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS = \

diff --git a/src/gallium/targets/egl-static/egl.link b/src/gallium/targets/egl-static/egl.link
index 78d155df01a614b30280c4fa652f09ddefb9dcee..5be917fdcdea5c9b574b48656ed3c66df27f7b8d 100644 (file)
--- a/src/gallium/targets/egl-static/egl.link
+++ b/src/gallium/targets/egl-static/egl.link
@@ -1,3 +1,3 @@
 VERSION {
-{ global: _eglMain; local: *; };
+       global: _eglMain; local: *;
 };

diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index 970ff0ec3f2e67b1e00258032a14c0eca0886465..1c2f31bc68125cb4978bb13364c5904f4fd96b38 100644 (file)
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -22,7 +22,7 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
-LDFLAGS += -Wl,$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.link
+LDFLAGS += -Wl,--version-script=$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.link
 
 AM_CPPFLAGS = \
        $(GALLIUM_CFLAGS) \

diff --git a/src/gallium/targets/pipe-loader/pipe.link b/src/gallium/targets/pipe-loader/pipe.link
index 1c98da67f23b1015152bec36349b794e5e52d078..d6dd2af418b4fb55ab9ae688e35c7a3a3410faa7 100644 (file)
--- a/src/gallium/targets/pipe-loader/pipe.link
+++ b/src/gallium/targets/pipe-loader/pipe.link
@@ -1,3 +1,3 @@
 VERSION {
-       {global: driver_descriptor; local: *;  };
+       global: driver_descriptor; local: *;
 };