From 17930a66aad6774224296ad9c845d30e01e4ffe5 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 12 Nov 2013 11:29:21 -0800 Subject: [PATCH] gallium: Pass version scripts to linker using --version-script= This fixes build failures with the gold linker. CC: "10.0" --- src/gallium/targets/egl-static/Makefile.am | 2 +- src/gallium/targets/egl-static/egl.link | 2 +- src/gallium/targets/pipe-loader/Makefile.am | 2 +- src/gallium/targets/pipe-loader/pipe.link | 2 +- 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: *; }; -- 2.30.2