diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2018-01-20 13:23:41 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2018-01-20 13:23:41 -0500 |
| commit | 5cee4a6573573379d8a1ec9e560751364181c94f (patch) | |
| tree | fe54fb1565fbf9ffd275fe2f9e3c7cf50cebf342 /TestScripts/setenv-android-old.sh | |
| parent | 5adfe4e812a2fc22f457911eeb1b0add27799256 (diff) | |
| download | cryptopp-git-5cee4a6573573379d8a1ec9e560751364181c94f.tar.gz | |
Improve logic for <arm_acle.h> include (GH #568)
Diffstat (limited to 'TestScripts/setenv-android-old.sh')
| -rwxr-xr-x | TestScripts/setenv-android-old.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/TestScripts/setenv-android-old.sh b/TestScripts/setenv-android-old.sh index 3f7cac7b..d93b568d 100755 --- a/TestScripts/setenv-android-old.sh +++ b/TestScripts/setenv-android-old.sh @@ -108,21 +108,21 @@ case "$THE_ARCH" in TOOLCHAIN_NAME="arm-linux-androideabi" AOSP_ABI="armeabi" AOSP_ARCH="arch-arm" - AOSP_FLAGS="-march=armv5te -mtune=xscale -mthumb -msoft-float -funwind-tables -fexceptions -frtti" + AOSP_FLAGS="-march=armv5te -mtune=xscale -mthumb -msoft-float -DCRYPTOPP_DISABLE_ASM -funwind-tables -fexceptions -frtti" ;; armv7a|armv7-a|armeabi-v7a) TOOLCHAIN_ARCH="arm-linux-androideabi" TOOLCHAIN_NAME="arm-linux-androideabi" AOSP_ABI="armeabi-v7a" AOSP_ARCH="arch-arm" - AOSP_FLAGS="-march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp -Wl,--fix-cortex-a8 -funwind-tables -fexceptions -frtti" + AOSP_FLAGS="-march=armv7-a -mthumb -mfpu=vfpv3-d16 -mfloat-abi=softfp -DCRYPTOPP_DISABLE_ASM -Wl,--fix-cortex-a8 -funwind-tables -fexceptions -frtti" ;; hard|armv7a-hard|armeabi-v7a-hard) TOOLCHAIN_ARCH="arm-linux-androideabi" TOOLCHAIN_NAME="arm-linux-androideabi" AOSP_ABI="armeabi-v7a" AOSP_ARCH="arch-arm" - AOSP_FLAGS="-mhard-float -D_NDK_MATH_NO_SOFTFP=1 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp -Wl,--fix-cortex-a8 -funwind-tables -fexceptions -frtti -Wl,--no-warn-mismatch -Wl,-lm_hard" + AOSP_FLAGS="-mhard-float -D_NDK_MATH_NO_SOFTFP=1 -march=armv7-a -mfpu=vfpv3-d16 -DCRYPTOPP_DISABLE_ASM -mfloat-abi=softfp -Wl,--fix-cortex-a8 -funwind-tables -fexceptions -frtti -Wl,--no-warn-mismatch -Wl,-lm_hard" ;; neon|armv7a-neon) TOOLCHAIN_ARCH="arm-linux-androideabi" |