Skip to content

Commit 3ded668

Browse files
committed
poly1305: enable assembly for ARM in Go 1.6.
5f31782 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 <[email protected]> Run-TryBot: Brad Fitzpatrick <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
1 parent dec8741 commit 3ded668

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

poly1305/sum_amd64.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5-
// +build amd64,!gccgo,!appengine,go1.7
5+
// +build amd64,!gccgo,!appengine
66

77
package poly1305
88

poly1305/sum_amd64.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5-
// +build amd64,!gccgo,!appengine,go1.7
5+
// +build amd64,!gccgo,!appengine
66

77
#include "textflag.h"
88

poly1305/sum_ref.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5-
// +build !amd64,!arm gccgo appengine nacl !go1.7
5+
// +build !amd64,!arm gccgo appengine nacl
66

77
package poly1305
88

0 commit comments

Comments
 (0)