summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2013-11-12 11:29:21 -0800
committerIan Romanick <ian.d.romanick@intel.com>2013-11-23 12:36:07 -0800
commit521c59f1327e8902e4bb9dc4f926a54a1cb26bd3 (patch)
treeeb72d3e8cfe654f153031afe1faa80e66834d81b /src/gallium
parenteafb9f675611ba40ca7ed8da95d90e3f87cc13c1 (diff)
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> (cherry picked from commit 17930a66aad6774224296ad9c845d30e01e4ffe5)
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/targets/egl-static/Makefile.am2
-rw-r--r--src/gallium/targets/egl-static/egl.link2
-rw-r--r--src/gallium/targets/pipe-loader/Makefile.am2
-rw-r--r--src/gallium/targets/pipe-loader/pipe.link2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index 760c477148d..fdd5a1d067a 100644
--- 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 78d155df01a..5be917fdcde 100644
--- 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 970ff0ec3f2..1c2f31bc681 100644
--- 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 1c98da67f23..d6dd2af418b 100644
--- 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: *;
};