summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Stellard <[email protected]>2013-11-12 11:29:21 -0800
committerTom Stellard <[email protected]>2013-11-18 12:19:04 -0800
commit17930a66aad6774224296ad9c845d30e01e4ffe5 (patch)
treec642731b23ee72f61dd467324edbc2665c04e9b4
parenta84dd2398f75c672293122408828ac66bb7052a0 (diff)
gallium: Pass version scripts to linker using --version-script=
This fixes build failures with the gold linker. CC: "10.0" <[email protected]>
-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: *;
};