yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix aarch64 (64-bit ARM) guard on chacha_vec_arm.S.

Browse Source 
Change-Id: Ia3632639daa8655ea5e2f81ba2a5163949f522b2
Reviewed-on: https://boringssl-review.googlesource.com/6110
Reviewed-by: Adam Langley <alangley@gmail.com>
This commit is contained in:
William Hesse 2015-10-05 17:06:38 +02:00 committed by Adam Langley
parent 953cfc837f
commit 6dc1851f30
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/chacha/chacha_vec_arm.S
View File

@ -23,7 +23,7 @@
# /opt/gcc-linaro-4.9-2014.11-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc -O3 -mcpu=cortex-a8 -mfpu=neon -fpic -DASM_GEN -I ../../include -S chacha_vec.c -o -
#if !defined(OPENSSL_NO_ASM)
#if defined(__arm__) || defined(__aarch64__)
#if defined(__arm__)
.syntax unified
.cpu cortex-a8
@ -1424,5 +1424,5 @@ CRYPTO_chacha_20_neon:
.ident "GCC: (Linaro GCC 2014.11) 4.9.3 20141031 (prerelease)"
.section .note.GNU-stack,"",%progbits
#endif /* __arm__ || __aarch64__ */
#endif /* __arm__ */
#endif /* !OPENSSL_NO_ASM */

4
crypto/chacha/chacha_vec_arm_generate.go
View File

@ -56,7 +56,7 @@ func main() {
output.WriteString(" ")
output.WriteString(strings.Join(args, " "))
output.WriteString("\n\n#if !defined(OPENSSL_NO_ASM)\n")
output.WriteString("#if defined(__arm__) || defined(__aarch64__)\n\n")
output.WriteString("#if defined(__arm__)\n\n")
cmd := exec.Command(compiler, args...)
cmd.Stderr = os.Stderr
@ -148,6 +148,6 @@ const attr28Block = `
`
const trailer = `
#endif /* __arm__ || __aarch64__ */
#endif /* __arm__ */
#endif /* !OPENSSL_NO_ASM */
`