Fix Linux build.

We don't need protected visibility because we now have a version script which hides all symbols except the ones we want to export. Fixes ld linker errors: relocation R_X86_64_PC32 against protected symbol `libEGL_swiftshader' can not be used when making a shared object relocation R_X86_64_PC32 against protected symbol `libGLESv2_swiftshader' can not be used when making a shared object Change-Id: I059c4b03f2523bf8caf08180b02a349d3cf7b2f2 Reviewed-on: https://swiftshader-review.googlesource.com/18708Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Corentin Wallez <cwallez@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com>

Fix Linux build.
840f47ea · Nicolas Capens · Nicolas Capens · a8bb28ca · 840f47ea · 840f47ea
Commit 840f47ea authored Apr 25, 2018 by Nicolas Capens Committed by Nicolas Capens Apr 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

CMakeLists.txt CMakeLists.txt +0 -4

main.cpp src/OpenGL/libEGL/main.cpp +1 -1

entry_points.cpp src/OpenGL/libGLESv2/entry_points.cpp +1 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,10 +154,6 @@ else()
    set_cpp_flag("-Werror=sign-compare")
    set_cpp_flag("-fno-exceptions")

-    # Don't allow symbols to be overridden by another module.
-    # This enables libGLES_CM and libGLESv2 to statically link LLVM.
-    set_cpp_flag("-fvisibility=protected")
-
    # Remove xor, and, or and friends from the list of keywords, they are used
    # by Reactor
    set_cpp_flag("-fno-operator-names")

--- a/src/OpenGL/libEGL/main.cpp
+++ b/src/OpenGL/libEGL/main.cpp
@@ -643,7 +643,7 @@ LibEGLexports::LibEGLexports()
 	this->clientGetCurrentContext = egl::getCurrentContext;
 }

-extern "C" EGLAPI LibEGLexports *libEGL_swiftshader()
+extern "C" LibEGLexports *libEGL_swiftshader()
 {
 	static LibEGLexports libEGL;
 	return &libEGL;

--- a/src/OpenGL/libGLESv2/entry_points.cpp
+++ b/src/OpenGL/libGLESv2/entry_points.cpp
@@ -1420,7 +1420,7 @@ LibGLESv2exports::LibGLESv2exports()
 	this->createFrameBuffer = ::createFrameBuffer;
 }

-extern "C" GL_APICALL LibGLESv2exports *libGLESv2_swiftshader()
+extern "C" LibGLESv2exports *libGLESv2_swiftshader()
 {
 	static LibGLESv2exports libGLESv2;
 	return &libGLESv2;