From eef60be96fb91dc632a18173b4a4f21e9813aba7 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Sat, 18 Apr 2015 19:07:35 -0700 Subject: external/boringssl: try to fix aarch64+Clang. It appears that the version of Clang in Android doesn't support the .arch_extension directive. This change removes the .arch and .arch_extension lines (because they are triggering errors) and adds a -march option on the command line instead. The aarch64+Clang build is still broken with this change, but it's broken in binder rather than BoringSSL with it. Change-Id: I32c557bdfde4df66d26794ccdd650356f2bbaf8f --- linux-aarch64/crypto/aes/aesv8-armx.S | 5 +---- linux-aarch64/crypto/modes/ghashv8-armx.S | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'linux-aarch64') diff --git a/linux-aarch64/crypto/aes/aesv8-armx.S b/linux-aarch64/crypto/aes/aesv8-armx.S index e3d4666..e7ae46f 100644 --- a/linux-aarch64/crypto/aes/aesv8-armx.S +++ b/linux-aarch64/crypto/aes/aesv8-armx.S @@ -2,10 +2,7 @@ #if __ARM_MAX_ARCH__>=7 .text -#ifdef __clang__ -.arch armv8-a -.arch_extension crypto -#else +#if !defined(__clang__) .arch armv8-a+crypto #endif .align 5 diff --git a/linux-aarch64/crypto/modes/ghashv8-armx.S b/linux-aarch64/crypto/modes/ghashv8-armx.S index 2da617f..565146e 100644 --- a/linux-aarch64/crypto/modes/ghashv8-armx.S +++ b/linux-aarch64/crypto/modes/ghashv8-armx.S @@ -1,10 +1,7 @@ #include "arm_arch.h" .text -#ifdef __clang__ -.arch armv8-a -.arch_extension crypto -#else +#if !defined(__clang__) .arch armv8-a+crypto #endif .global gcm_init_v8 -- cgit v1.1