Prepare for Crypto++ 8.2 tag

Author: noloader

Android.mk

@@ -140,12 +140,12 @@ LOCAL_CPPFLAGS := -Wall
 LOCAL_CPP_FEATURES := rtti exceptions
 LOCAL_LDFLAGS := -Wl,--exclude-libs,ALL -Wl,--as-needed
 
-# Intel machines and AVX2
+# Clang workarounds for Intel machines
 ifeq ($(TARGET_ARCH),x86)
-    LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS) -DCRYPTOPP_DISABLE_AVX2
+    LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS) -DCRYPTOPP_DISABLE_MIXED_ASM -DCRYPTOPP_DISABLE_AVX2
 endif
 ifeq ($(TARGET_ARCH),x86_64)
-    LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS) -DCRYPTOPP_DISABLE_AVX2
+    LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS) -DCRYPTOPP_DISABLE_MIXED_ASM -DCRYPTOPP_DISABLE_AVX2
 endif
 
 LOCAL_EXPORT_CFLAGS := $(LOCAL_CFLAGS)
@@ -164,12 +164,12 @@ LOCAL_SRC_FILES := $(addprefix $(CRYPTOPP_PATH),$(CRYPTOPP_LIB_FILES))
 LOCAL_CPPFLAGS := -Wall
 LOCAL_CPP_FEATURES := rtti exceptions
 
-# Intel machines and AVX2
+# Clang workarounds for Intel machines
 ifeq ($(TARGET_ARCH),x86)
-    LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS) -DCRYPTOPP_DISABLE_AVX2
+    LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS) -DCRYPTOPP_DISABLE_MIXED_ASM -DCRYPTOPP_DISABLE_AVX2
 endif
 ifeq ($(TARGET_ARCH),x86_64)
-    LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS) -DCRYPTOPP_DISABLE_AVX2
+    LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS) -DCRYPTOPP_DISABLE_MIXED_ASM -DCRYPTOPP_DISABLE_AVX2
 endif
 
 LOCAL_EXPORT_CFLAGS := $(LOCAL_CFLAGS)