arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Android x86 and x86-64 cross-compilesexit

pull/546/head
Jeffrey Walton 2018-01-20 13:54:02 -05:00
parent 5cee4a6573
commit 65963c5504
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TestScripts/setenv-android-old.sh
View File

@ -157,14 +157,14 @@ case "$THE_ARCH" in
TOOLCHAIN_NAME="i686-linux-android" TOOLCHAIN_NAME="i686-linux-android"
AOSP_ABI="x86" AOSP_ABI="x86"
AOSP_ARCH="arch-x86" AOSP_ARCH="arch-x86"
AOSP_FLAGS="-mtune=intel -mssse3 -mfpmath=sse -funwind-tables -fexceptions -frtti" AOSP_FLAGS="-mtune=intel -mssse3 -mfpmath=sse -DCRYPTOPP_DISABLE_SSE4 -DCRYPTOPP_DISABLE_CLMUL -DCRYPTOPP_DISABLE_AES -DCRYPTOPP_DISABLE_SHA -funwind-tables -fexceptions -frtti"
;; ;;
x86_64|x64) x86_64|x64)
TOOLCHAIN_ARCH="x86_64" TOOLCHAIN_ARCH="x86_64"
TOOLCHAIN_NAME="x86_64-linux-android" TOOLCHAIN_NAME="x86_64-linux-android"
AOSP_ABI="x86_64" AOSP_ABI="x86_64"
AOSP_ARCH="arch-x86_64" AOSP_ARCH="arch-x86_64"
AOSP_FLAGS="-march=x86-64 -msse4.2 -mpopcnt -mtune=intel -funwind-tables -fexceptions -frtti" AOSP_FLAGS="-march=x86-64 -msse4.2 -mpopcnt -mtune=intel -DCRYPTOPP_DISABLE_CLMUL -DCRYPTOPP_DISABLE_AES -DCRYPTOPP_DISABLE_SHA -funwind-tables -fexceptions -frtti"
;; ;;
*) *)
echo "ERROR: Unknown architecture $1" echo "ERROR: Unknown architecture $1"

4
setenv-android.sh
View File

@ -150,14 +150,14 @@ case "$THE_ARCH" in
TOOLCHAIN_NAME="i686-linux-android" TOOLCHAIN_NAME="i686-linux-android"
AOSP_ABI="x86" AOSP_ABI="x86"
AOSP_ARCH="arch-x86" AOSP_ARCH="arch-x86"
AOSP_FLAGS="-mtune=intel -mssse3 -mfpmath=sse -funwind-tables -fexceptions -frtti" AOSP_FLAGS="-mtune=intel -mssse3 -mfpmath=sse -DCRYPTOPP_DISABLE_SSE4 -DCRYPTOPP_DISABLE_CLMUL -DCRYPTOPP_DISABLE_AES -DCRYPTOPP_DISABLE_SHA -funwind-tables -fexceptions -frtti"
;; ;;
x86_64|x64) x86_64|x64)
TOOLCHAIN_ARCH="x86_64" TOOLCHAIN_ARCH="x86_64"
TOOLCHAIN_NAME="x86_64-linux-android" TOOLCHAIN_NAME="x86_64-linux-android"
AOSP_ABI="x86_64" AOSP_ABI="x86_64"
AOSP_ARCH="arch-x86_64" AOSP_ARCH="arch-x86_64"
AOSP_FLAGS="-march=x86-64 -msse4.2 -mpopcnt -mtune=intel -funwind-tables -fexceptions -frtti" AOSP_FLAGS="-march=x86-64 -msse4.2 -mpopcnt -mtune=intel -DCRYPTOPP_DISABLE_CLMUL -DCRYPTOPP_DISABLE_AES -DCRYPTOPP_DISABLE_SHA -funwind-tables -fexceptions -frtti"
;; ;;
*) *)
echo "ERROR: Unknown architecture $1" echo "ERROR: Unknown architecture $1"