From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sat, 5 Apr 2014 17:04:18 +0000 (+0100)
Subject: targets/pipe-loader: cleanup version-script
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ce6c17c0833032e91a2d1b34f9eb80c738a854a2;p=mesa.git

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 <emil.l.velikov@gmail.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
---

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:
+		*;
+};