From 9477e0b78b9ac3d0b03822fd95422e2fe07627cd Mon Sep 17 00:00:00 2001 From: Alex Vaghin Date: Mon, 31 Oct 2016 16:37:30 +0100 Subject: [PATCH] chacha20poly1305: fix build constraints Similarly to https://go-review.googlesource.com/32311, chacha20poly1305 needs additional build constraints for non-standard toolchains. Change-Id: I22816ef333c05450e9ab4debb3ce591518b6b84b Reviewed-on: https://go-review.googlesource.com/32391 Run-TryBot: Alex Vaghin TryBot-Result: Gobot Gobot Reviewed-by: Adam Langley --- chacha20poly1305/chacha20poly1305_amd64.go | 2 +- chacha20poly1305/chacha20poly1305_amd64.s | 2 +- chacha20poly1305/chacha20poly1305_noasm.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chacha20poly1305/chacha20poly1305_amd64.go b/chacha20poly1305/chacha20poly1305_amd64.go index f0d3485..4755033 100644 --- a/chacha20poly1305/chacha20poly1305_amd64.go +++ b/chacha20poly1305/chacha20poly1305_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,go1.7 +// +build go1.7,amd64,!gccgo,!appengine package chacha20poly1305 diff --git a/chacha20poly1305/chacha20poly1305_amd64.s b/chacha20poly1305/chacha20poly1305_amd64.s index ac95844..f69cc91 100644 --- a/chacha20poly1305/chacha20poly1305_amd64.s +++ b/chacha20poly1305/chacha20poly1305_amd64.s @@ -4,7 +4,7 @@ // This file was originally from https://golang.org/cl/24717 by Vlad Krasnov of CloudFlare. -// +build go1.7 +// +build go1.7,amd64,!gccgo,!appengine #include "textflag.h" // General register allocation diff --git a/chacha20poly1305/chacha20poly1305_noasm.go b/chacha20poly1305/chacha20poly1305_noasm.go index 1d4dcd3..4c2eb70 100644 --- a/chacha20poly1305/chacha20poly1305_noasm.go +++ b/chacha20poly1305/chacha20poly1305_noasm.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 !go1.7 +// +build !amd64 !go1.7 gccgo appengine package chacha20poly1305