Commit 0270476a by Nicolas Capens Committed by Nicolas Capens

Use both sysv and gnu style linker hash tables.

Change-Id: I658af8e3dd106a5029bb9876bf4dcafa46296ca6 Reviewed-on: https://swiftshader-review.googlesource.com/1480Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent a82b58e0
#define MAJOR_VERSION 3 #define MAJOR_VERSION 3
#define MINOR_VERSION 2 #define MINOR_VERSION 2
#define BUILD_VERSION 7 #define BUILD_VERSION 7
#define BUILD_REVISION 47656 #define BUILD_REVISION 47657
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
...@@ -185,7 +185,7 @@ namespace sw ...@@ -185,7 +185,7 @@ namespace sw
{ {
copyLocked(); copyLocked();
} }
unlock(); unlock();
} }
...@@ -347,7 +347,7 @@ namespace sw ...@@ -347,7 +347,7 @@ namespace sw
For(Int x = x0, x < width, x++) For(Int x = x0, x < width, x++)
{ {
Int c; Int c;
if(state.sourceFormat == FORMAT_X8R8G8B8 || state.sourceFormat == FORMAT_A8R8G8B8) if(state.sourceFormat == FORMAT_X8R8G8B8 || state.sourceFormat == FORMAT_A8R8G8B8)
{ {
c = *Pointer<Int>(s); c = *Pointer<Int>(s);
...@@ -425,7 +425,7 @@ namespace sw ...@@ -425,7 +425,7 @@ namespace sw
{ {
blend(state, d, s, c); blend(state, d, s, c);
} }
c += 4; c += 4;
s += sBytes; s += sBytes;
d += dBytes; d += dBytes;
...@@ -443,7 +443,7 @@ namespace sw ...@@ -443,7 +443,7 @@ namespace sw
Short4 c2; Short4 c2;
c1 = UnpackLow(As<Byte8>(c1), *Pointer<Byte8>(c)); c1 = UnpackLow(As<Byte8>(c1), *Pointer<Byte8>(c));
if(state.sourceFormat == FORMAT_X8R8G8B8 || state.sourceFormat == FORMAT_A8R8G8B8) if(state.sourceFormat == FORMAT_X8R8G8B8 || state.sourceFormat == FORMAT_A8R8G8B8)
{ {
c2 = UnpackLow(As<Byte8>(c2), *Pointer<Byte8>(s)); c2 = UnpackLow(As<Byte8>(c2), *Pointer<Byte8>(s));
...@@ -528,4 +528,4 @@ namespace sw ...@@ -528,4 +528,4 @@ namespace sw
} }
#endif #endif
} }
} }
\ No newline at end of file
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-Wl,--version-script=./exports.map" /> <Add option="-Wl,--version-script=./exports.map" />
<Add option="-Wl,--hash-style=both" />
<Add library="pthread" /> <Add library="pthread" />
</Linker> </Linker>
<Unit filename="../../Common/SharedLibrary.hpp" /> <Unit filename="../../Common/SharedLibrary.hpp" />
......
...@@ -122,6 +122,7 @@ ...@@ -122,6 +122,7 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-Wl,--version-script=./exports.map" /> <Add option="-Wl,--version-script=./exports.map" />
<Add option="-Wl,--hash-style=both" />
<Add library="pthread" /> <Add library="pthread" />
<Add library="X11" /> <Add library="X11" />
<Add library="Xext" /> <Add library="Xext" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment