diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 00:37:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 00:37:00 +0000 |
| commit | 00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872 (patch) | |
| tree | dc62c249d595198e0d99e43890019d21e901fbec /src/crypto/chacha/chacha_vec_arm_generate.go | |
| parent | 3781a60670f92c3c6fca860cb4589495cefa2e56 (diff) | |
| parent | a04d78d392463df4e69a64360c952ffa5abd22f7 (diff) | |
| download | external_boringssl-00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872.zip external_boringssl-00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872.tar.gz external_boringssl-00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872.tar.bz2 | |
am a04d78d3: Revert "external/boringssl: sync with upstream."
* commit 'a04d78d392463df4e69a64360c952ffa5abd22f7':
Revert "external/boringssl: sync with upstream."
Diffstat (limited to 'src/crypto/chacha/chacha_vec_arm_generate.go')
| -rw-r--r-- | src/crypto/chacha/chacha_vec_arm_generate.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/crypto/chacha/chacha_vec_arm_generate.go b/src/crypto/chacha/chacha_vec_arm_generate.go index 6d167b9..d681e8a 100644 --- a/src/crypto/chacha/chacha_vec_arm_generate.go +++ b/src/crypto/chacha/chacha_vec_arm_generate.go @@ -52,8 +52,7 @@ func main() { output.WriteString(compiler) 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("\n\n#if !defined(OPENSSL_NO_ASM)\n\n") cmd := exec.Command(compiler, args...) cmd.Stderr = os.Stderr @@ -145,6 +144,5 @@ const attr28Block = ` ` const trailer = ` -#endif /* __arm__ || __aarch64__ */ #endif /* !OPENSSL_NO_ASM */ ` |