summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-05-12 19:17:37 -0700
committerKenny Root <kroot@google.com>2015-05-13 03:33:31 +0000
commitaae4cd28e487a1554bc5d290b73fcf9aeeb31370 (patch)
tree401f38eb29416e2b85dd1a202d9ab978bc565712
parent62d05888d1cf178d900b54e7e035928abea512b1 (diff)
downloadexternal_boringssl-aae4cd28e487a1554bc5d290b73fcf9aeeb31370.zip
external_boringssl-aae4cd28e487a1554bc5d290b73fcf9aeeb31370.tar.gz
external_boringssl-aae4cd28e487a1554bc5d290b73fcf9aeeb31370.tar.bz2
external/boringssl: work around Clang's lack of adrl.
This change works around Clang's lack of support for the adrl pseudo-instruction by disabling Clang's as for BoringSSL. See https://android-review.googlesource.com/#/c/150503/ for an alternative solution that was discarded. Change-Id: I1587376f8d864b7ea0c1fc953c7ea8a8552146e6
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 27e786d..cebeb2c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,6 +13,8 @@ LOCAL_MODULE := libcrypto_static
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/crypto-sources.mk
LOCAL_SDK_VERSION := 9
+# sha256-armv4.S does not compile with clang.
+LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
ifeq ($(TARGET_ARCH),arm64)
ifeq ($(USE_CLANG_PLATFORM_BUILD),true)
LOCAL_ASFLAGS += -march=armv8-a+crypto
@@ -29,6 +31,8 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/crypto-sources.mk
LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION
LOCAL_SDK_VERSION := 9
+# sha256-armv4.S does not compile with clang.
+LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
ifeq ($(TARGET_ARCH),arm64)
ifeq ($(USE_CLANG_PLATFORM_BUILD),true)
LOCAL_ASFLAGS += -march=armv8-a+crypto