cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable asm on native client

Browse Source
This commit is contained in:
Frank Denis 2016-04-28 21:31:18 +02:00
parent 5f3b59c8b0
commit fbad64f6ef
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -72,9 +72,13 @@ AC_ARG_ENABLE(asm,
enable_asm="yes"
])
AS_IF([test "x$EMSCRIPTEN" != "x"],[
AS_IF([test "x$EMSCRIPTEN" != "x"], [
enable_asm="no"
AC_MSG_WARN([compiling to javascript - asm implementations disabled])
AC_MSG_WARN([compiling to JavaScript - asm implementations disabled])
])
AS_IF([test "$host_os" = "nacl" -o "$host_os" = "pnacl"], [
enable_asm="no"
AC_MSG_WARN([compiling to Native Client - asm implementations disabled])
])
AC_ARG_ENABLE(pie,

2
src/libsodium/sodium/core.c
View File

@ -106,7 +106,7 @@ _sodium_crit_leave(void)
return 0;
}
#elif defined(__GNUC__) && !defined(__EMSCRIPTEN__)
#elif defined(__GNUC__) && !defined(__EMSCRIPTEN__) && !defined(__native_client__)
static volatile int _sodium_lock;