From 3ded668c5379f6951fb0de06174442072e5447d3 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Wed, 19 Oct 2016 10:38:27 -0700 Subject: [PATCH] poly1305: enable assembly for ARM in Go 1.6. 5f31782cfb2b6373211f8f9fbf31283fa234b570 added build constraints to disable assembly for Go 1.6 but didn't add the needed tags to the ARM files. Also, it's not clear that was needed as the error given in golang/go#17424 only complains about the chacha20poly1305 package. This change reenables the assembly for Go 1.6 in the poly1305 package. Tested with 1.6.3 and 1.5.4. Fixes golang/go#17512. Change-Id: I81b41f8810437ea327b415542402cd8ff5c8a390 Reviewed-on: https://go-review.googlesource.com/31492 Reviewed-by: Brad Fitzpatrick Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- poly1305/sum_amd64.go | 2 +- poly1305/sum_amd64.s | 2 +- poly1305/sum_ref.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poly1305/sum_amd64.go b/poly1305/sum_amd64.go index 1501f13..4dd72fe 100644 --- a/poly1305/sum_amd64.go +++ b/poly1305/sum_amd64.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build amd64,!gccgo,!appengine,go1.7 +// +build amd64,!gccgo,!appengine package poly1305 diff --git a/poly1305/sum_amd64.s b/poly1305/sum_amd64.s index 56e8311..bc75c61 100644 --- a/poly1305/sum_amd64.s +++ b/poly1305/sum_amd64.s @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build amd64,!gccgo,!appengine,go1.7 +// +build amd64,!gccgo,!appengine #include "textflag.h" diff --git a/poly1305/sum_ref.go b/poly1305/sum_ref.go index 908aae0..dbe50e7 100644 --- a/poly1305/sum_ref.go +++ b/poly1305/sum_ref.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build !amd64,!arm gccgo appengine nacl !go1.7 +// +build !amd64,!arm gccgo appengine nacl package poly1305