summaryrefslogtreecommitdiffstats
path: root/src/crypto/modes/asm/ghash-armv4.pl
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-11-05 20:20:27 +0000
committerKenny Root <kroot@google.com>2015-11-05 20:20:27 +0000
commit03bcf618b7ed811b305845461fbb5497dfe55ac3 (patch)
tree24150183cfed2ad79eb2258cf525b4fc4544bd2d /src/crypto/modes/asm/ghash-armv4.pl
parentfdeb488e6332a17729db5a04236e48a46a019272 (diff)
downloadexternal_boringssl-03bcf618b7ed811b305845461fbb5497dfe55ac3.zip
external_boringssl-03bcf618b7ed811b305845461fbb5497dfe55ac3.tar.gz
external_boringssl-03bcf618b7ed811b305845461fbb5497dfe55ac3.tar.bz2
Revert "external/boringssl: sync with upstream."
This reverts commit fdeb488e6332a17729db5a04236e48a46a019272. This breaks trusty since it doesn't have setjmp.h Change-Id: I960e25aa0bb2eef1237743b1567f7cb7f6d40497
Diffstat (limited to 'src/crypto/modes/asm/ghash-armv4.pl')
-rw-r--r--src/crypto/modes/asm/ghash-armv4.pl3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/crypto/modes/asm/ghash-armv4.pl b/src/crypto/modes/asm/ghash-armv4.pl
index df33be5..dc5b99e 100644
--- a/src/crypto/modes/asm/ghash-armv4.pl
+++ b/src/crypto/modes/asm/ghash-armv4.pl
@@ -133,6 +133,7 @@ ___
}
$code=<<___;
+#if defined(__arm__)
#include <openssl/arm_arch.h>
.syntax unified
@@ -503,6 +504,8 @@ ___
$code.=<<___;
.asciz "GHASH for ARMv4/NEON, CRYPTOGAMS by <appro\@openssl.org>"
.align 2
+
+#endif
___
foreach (split("\n",$code)) {