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

Disable ssp and aesni on nativeclient, nativeclient.sh->nativeclient-pnacl.sh

Browse Source
This commit is contained in:
Frank Denis 2016-04-29 22:29:34 +02:00
parent 3499cbfbe5
commit d463dadc51
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -414,6 +414,9 @@ AS_IF([test "x$EMSCRIPTEN" = "x"],[
AX_CHECK_COMPILE_FLAG([-mpclmul], [CFLAGS="$CFLAGS -mpclmul"]) AX_CHECK_COMPILE_FLAG([-mpclmul], [CFLAGS="$CFLAGS -mpclmul"])
AC_MSG_CHECKING(for AESNI instructions set and PCLMULQDQ) AC_MSG_CHECKING(for AESNI instructions set and PCLMULQDQ)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#ifdef __native_client__
# error NativeClient doesn't properly support aesni for now
#endif
#pragma GCC target("aes") #pragma GCC target("aes")
#pragma GCC target("pclmul") #pragma GCC target("pclmul")
#include <wmmintrin.h> #include <wmmintrin.h>

3
dist-build/Makefile.am
View File

@ -12,4 +12,5 @@ EXTRA_DIST = \
ios.sh \ ios.sh \
msys2-win32.sh \ msys2-win32.sh \
msys2-win64.sh \ msys2-win64.sh \
nativeclient.sh nativeclient-pnacl.sh \
nativeclient-x86_64.sh

3
dist-build/nativeclient.sh → dist-build/nativeclient-pnacl.sh
View File

@ -13,7 +13,7 @@ export NM=${NM-"pnacl-nm"}
export RANLIB=${RANLIB-"pnacl-ranlib"} export RANLIB=${RANLIB-"pnacl-ranlib"}
export PNACL_FINALIZE=${PNACL_FINALIZE-"pnacl-finalize"} export PNACL_FINALIZE=${PNACL_FINALIZE-"pnacl-finalize"}
export PNACL_TRANSLATE=${PNACL_TRANSLATE-"pnacl-translate"} export PNACL_TRANSLATE=${PNACL_TRANSLATE-"pnacl-translate"}
export CFLAGS="-O3 -fomit-frame-pointer" export CFLAGS="-O3 -fomit-frame-pointer -fforce-addr"
mkdir -p $PREFIX || exit 1 mkdir -p $PREFIX || exit 1
@ -21,6 +21,7 @@ make distclean > /dev/null
./configure --enable-minimal \ ./configure --enable-minimal \
--host=nacl \ --host=nacl \
--disable-ssp \
--prefix="$PREFIX" || exit 1 --prefix="$PREFIX" || exit 1
make -j3 check && make -j3 install || exit 1 make -j3 check && make -j3 install || exit 1

3
dist-build/nativeclient-x86-64.sh
View File

@ -5,7 +5,7 @@ export NACL_TOOLCHAIN=${NACL_TOOLCHAIN-"${NACL_SDK_ROOT}/toolchain/mac_x86_glibc
export NACL_BIN=${NACL_BIN-"${NACL_TOOLCHAIN}/bin"} export NACL_BIN=${NACL_BIN-"${NACL_TOOLCHAIN}/bin"}
export PREFIX="$(pwd)/libsodium-nativeclient-x86-64" export PREFIX="$(pwd)/libsodium-nativeclient-x86-64"
export PATH="${NACL_BIN}:$PATH" export PATH="${NACL_BIN}:$PATH"
export CFLAGS="-O3 -fomit-frame-pointer" export CFLAGS="-O3 -fomit-frame-pointer -fforce-addr"
mkdir -p $PREFIX || exit 1 mkdir -p $PREFIX || exit 1
@ -13,6 +13,7 @@ make distclean > /dev/null
./configure --enable-minimal \ ./configure --enable-minimal \
--host=x86_64-nacl \ --host=x86_64-nacl \
--disable-ssp \
--prefix="$PREFIX" || exit 1 --prefix="$PREFIX" || exit 1
make -j3 check && make -j3 install || exit 1 make -j3 check && make -j3 install || exit 1