summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-04-18 19:07:35 -0700
committerAdam Langley <agl@google.com>2015-04-18 19:09:59 -0700
commiteef60be96fb91dc632a18173b4a4f21e9813aba7 (patch)
tree3aa14dddb3cd83f10f517f1854028082621058ce /src
parentdc5ad20a799d19a4c8b2531ddae7489d87de7db2 (diff)
downloadexternal_boringssl-eef60be96fb91dc632a18173b4a4f21e9813aba7.zip
external_boringssl-eef60be96fb91dc632a18173b4a4f21e9813aba7.tar.gz
external_boringssl-eef60be96fb91dc632a18173b4a4f21e9813aba7.tar.bz2
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
Diffstat (limited to 'src')
-rw-r--r--src/crypto/aes/asm/aesv8-armx.pl5
-rw-r--r--src/crypto/modes/asm/ghashv8-armx.pl5
2 files changed, 2 insertions, 8 deletions
diff --git a/src/crypto/aes/asm/aesv8-armx.pl b/src/crypto/aes/asm/aesv8-armx.pl
index 2f0aaae..703da04 100644
--- a/src/crypto/aes/asm/aesv8-armx.pl
+++ b/src/crypto/aes/asm/aesv8-armx.pl
@@ -40,10 +40,7 @@ $code=<<___;
___
$code.=<<___ if ($flavour =~ /64/);
-#ifdef __clang__
-.arch armv8-a
-.arch_extension crypto
-#else
+#if !defined(__clang__)
.arch armv8-a+crypto
#endif
___
diff --git a/src/crypto/modes/asm/ghashv8-armx.pl b/src/crypto/modes/asm/ghashv8-armx.pl
index 40dca96..08c8775 100644
--- a/src/crypto/modes/asm/ghashv8-armx.pl
+++ b/src/crypto/modes/asm/ghashv8-armx.pl
@@ -45,10 +45,7 @@ $code=<<___;
.text
___
$code.=<<___ if ($flavour =~ /64/);
-#ifdef __clang__
-.arch armv8-a
-.arch_extension crypto
-#else
+#if !defined(__clang__)
.arch armv8-a+crypto
#endif
___