summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-04-05 18:04:18 +0100
committerEmil Velikov <[email protected]>2014-05-02 21:48:27 +0100
commitce6c17c0833032e91a2d1b34f9eb80c738a854a2 (patch)
treebbcb7ad64b593741d2210014b8f5fad73f6628b2
parentf743670b9a10ab296a5e90b866d1c766d44cf98d (diff)
targets/pipe-loader: cleanup version-script
Drop the version/name tag from the script as it was never meant to be there. Add swrast_create_screen as it is used when loading swrast. Rename the file to pipe.sym. v2: Rebase on top of the LD_NO_UNDEFINED changes. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Francisco Jerez <[email protected]>
-rw-r--r--src/gallium/targets/pipe-loader/Makefile.am4
-rw-r--r--src/gallium/targets/pipe-loader/pipe.link3
-rw-r--r--src/gallium/targets/pipe-loader/pipe.sym7
3 files changed, 9 insertions, 5 deletions
diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index 6a5b38066cb..a1c7d251b5a 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -47,9 +47,9 @@ AM_LDFLAGS = \
-module \
-no-undefined \
-avoid-version \
+ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.sym \
$(GC_SECTIONS) \
- $(LD_NO_UNDEFINED) \
- -Wl,--version-script=$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.link
+ $(LD_NO_UNDEFINED)
if HAVE_MESA_LLVM
PIPE_LIBS += $(LLVM_LIBS)
diff --git a/src/gallium/targets/pipe-loader/pipe.link b/src/gallium/targets/pipe-loader/pipe.link
deleted file mode 100644
index d6dd2af418b..00000000000
--- a/src/gallium/targets/pipe-loader/pipe.link
+++ /dev/null
@@ -1,3 +0,0 @@
-VERSION {
- global: driver_descriptor; local: *;
-};
diff --git a/src/gallium/targets/pipe-loader/pipe.sym b/src/gallium/targets/pipe-loader/pipe.sym
new file mode 100644
index 00000000000..19b1d77b040
--- /dev/null
+++ b/src/gallium/targets/pipe-loader/pipe.sym
@@ -0,0 +1,7 @@
+{
+ global:
+ driver_descriptor;
+ swrast_create_screen;
+ local:
+ *;
+};