diff options
author | Adam Langley <agl@google.com> | 2015-10-30 13:15:30 -0700 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2015-10-30 13:39:01 -0700 |
commit | fdeb488e6332a17729db5a04236e48a46a019272 (patch) | |
tree | b4e43f0c1d2161af97e2b7e030644ca1d54a839c /src/crypto/chacha/chacha_vec_arm_generate.go | |
parent | 6e19d4dc059301bed57d7dae7750c69fecb51b15 (diff) | |
download | external_boringssl-fdeb488e6332a17729db5a04236e48a46a019272.zip external_boringssl-fdeb488e6332a17729db5a04236e48a46a019272.tar.gz external_boringssl-fdeb488e6332a17729db5a04236e48a46a019272.tar.bz2 |
external/boringssl: sync with upstream.
See the following URL for a list of the changes included in this sync:
https://boringssl.googlesource.com/boringssl/+log/d98dc1311e20193ac188e359e91aeaaf5cc3a7e2..51a01a5cd44b3bdfab5220847000f13fc85f000b
Change-Id: I36535827f652536dfd687c1646bbea1535fc8e44
Diffstat (limited to 'src/crypto/chacha/chacha_vec_arm_generate.go')
-rw-r--r-- | src/crypto/chacha/chacha_vec_arm_generate.go | 9 |
1 files changed, 6 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..82aa847 100644 --- a/src/crypto/chacha/chacha_vec_arm_generate.go +++ b/src/crypto/chacha/chacha_vec_arm_generate.go @@ -12,7 +12,10 @@ // OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// This package generates chacha_vec_arm.S from chacha_vec.c. +// This package generates chacha_vec_arm.S from chacha_vec.c. Install the +// arm-linux-gnueabihf-gcc compiler as described in BUILDING.md. Then: +// `(cd crypto/chacha && go run chacha_vec_arm_generate.go)`. + package main import ( @@ -53,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 @@ -145,6 +148,6 @@ const attr28Block = ` ` const trailer = ` -#endif /* __arm__ || __aarch64__ */ +#endif /* __arm__ */ #endif /* !OPENSSL_NO_ASM */ ` |