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 6a5b380..a1c7d25 100644 (file)
--- 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 (file)
index d6dd2af..0000000
--- 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 (file)
index 0000000..19b1d77
--- /dev/null
+++ b/src/gallium/targets/pipe-loader/pipe.sym
@@ -0,0 +1,7 @@
+{
+       global:
+               driver_descriptor;
+               swrast_create_screen;
+       local:
+               *;
+};