From c57d4a71915a248dbad846d60825145062b4c18e Mon Sep 17 00:00:00 2001 From: Marga Manterola Date: Thu, 26 Mar 2015 13:36:50 +0100 Subject: [PATCH] poly1305, curve25519: add build constraints for appengine Updates: golang/go#9845 Change-Id: I78ce460d2a188ee13dd3f80015919a14eba03d07 Reviewed-on: https://go-review.googlesource.com/8100 Reviewed-by: Brad Fitzpatrick --- curve25519/const_amd64.s | 2 +- curve25519/cswap_amd64.s | 2 +- curve25519/curve25519.go | 2 +- curve25519/freeze_amd64.s | 2 +- curve25519/ladderstep_amd64.s | 2 +- curve25519/mont25519_amd64.go | 2 +- curve25519/mul_amd64.s | 2 +- curve25519/square_amd64.s | 2 +- poly1305/const_amd64.s | 2 +- poly1305/poly1305_amd64.s | 2 +- poly1305/sum_amd64.go | 2 +- poly1305/sum_ref.go | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/curve25519/const_amd64.s b/curve25519/const_amd64.s index 0517fc1..797f9b0 100644 --- a/curve25519/const_amd64.s +++ b/curve25519/const_amd64.s @@ -5,7 +5,7 @@ // This code was translated into a form compatible with 6a from the public // domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html -// +build amd64,!gccgo +// +build amd64,!gccgo,!appengine DATA ·REDMASK51(SB)/8, $0x0007FFFFFFFFFFFF GLOBL ·REDMASK51(SB), 8, $8 diff --git a/curve25519/cswap_amd64.s b/curve25519/cswap_amd64.s index 16204ed..45484d1 100644 --- a/curve25519/cswap_amd64.s +++ b/curve25519/cswap_amd64.s @@ -5,7 +5,7 @@ // This code was translated into a form compatible with 6a from the public // domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html -// +build amd64,!gccgo +// +build amd64,!gccgo,!appengine // func cswap(inout *[5]uint64, v uint64) TEXT ·cswap(SB),7,$0 diff --git a/curve25519/curve25519.go b/curve25519/curve25519.go index 5b7b9bc..6918c47 100644 --- a/curve25519/curve25519.go +++ b/curve25519/curve25519.go @@ -4,7 +4,7 @@ // We have a implementation in amd64 assembly so this code is only run on // non-amd64 platforms. The amd64 assembly does not support gccgo. -// +build !amd64 gccgo +// +build !amd64 gccgo appengine package curve25519 diff --git a/curve25519/freeze_amd64.s b/curve25519/freeze_amd64.s index 0b80eef..37599fa 100644 --- a/curve25519/freeze_amd64.s +++ b/curve25519/freeze_amd64.s @@ -5,7 +5,7 @@ // This code was translated into a form compatible with 6a from the public // domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html -// +build amd64,!gccgo +// +build amd64,!gccgo,!appengine // func freeze(inout *[5]uint64) TEXT ·freeze(SB),7,$96-8 diff --git a/curve25519/ladderstep_amd64.s b/curve25519/ladderstep_amd64.s index 10bb89f..3949f9c 100644 --- a/curve25519/ladderstep_amd64.s +++ b/curve25519/ladderstep_amd64.s @@ -5,7 +5,7 @@ // This code was translated into a form compatible with 6a from the public // domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html -// +build amd64,!gccgo +// +build amd64,!gccgo,!appengine // func ladderstep(inout *[5][5]uint64) TEXT ·ladderstep(SB),0,$384-8 diff --git a/curve25519/mont25519_amd64.go b/curve25519/mont25519_amd64.go index 3275877..5822bd5 100644 --- a/curve25519/mont25519_amd64.go +++ b/curve25519/mont25519_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 +// +build amd64,!gccgo,!appengine package curve25519 diff --git a/curve25519/mul_amd64.s b/curve25519/mul_amd64.s index 5404f32..e48d183 100644 --- a/curve25519/mul_amd64.s +++ b/curve25519/mul_amd64.s @@ -5,7 +5,7 @@ // This code was translated into a form compatible with 6a from the public // domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html -// +build amd64,!gccgo +// +build amd64,!gccgo,!appengine // func mul(dest, a, b *[5]uint64) TEXT ·mul(SB),0,$128-24 diff --git a/curve25519/square_amd64.s b/curve25519/square_amd64.s index cb0053f..78d1a50 100644 --- a/curve25519/square_amd64.s +++ b/curve25519/square_amd64.s @@ -5,7 +5,7 @@ // This code was translated into a form compatible with 6a from the public // domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html -// +build amd64,!gccgo +// +build amd64,!gccgo,!appengine // func square(out, in *[5]uint64) TEXT ·square(SB),7,$96-16 diff --git a/poly1305/const_amd64.s b/poly1305/const_amd64.s index 33fcd6e..8e861f3 100644 --- a/poly1305/const_amd64.s +++ b/poly1305/const_amd64.s @@ -5,7 +5,7 @@ // This code was translated into a form compatible with 6a from the public // domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html -// +build amd64,!gccgo +// +build amd64,!gccgo,!appengine DATA ·SCALE(SB)/8, $0x37F4000000000000 GLOBL ·SCALE(SB), 8, $8 diff --git a/poly1305/poly1305_amd64.s b/poly1305/poly1305_amd64.s index b9ad0ba..f8d4ee9 100644 --- a/poly1305/poly1305_amd64.s +++ b/poly1305/poly1305_amd64.s @@ -5,7 +5,7 @@ // This code was translated into a form compatible with 6a from the public // domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html -// +build amd64,!gccgo +// +build amd64,!gccgo,!appengine // func poly1305(out *[16]byte, m *byte, mlen uint64, key *[32]key) TEXT ·poly1305(SB),0,$224-32 diff --git a/poly1305/sum_amd64.go b/poly1305/sum_amd64.go index eb22ca1..6775c70 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 +// +build amd64,!gccgo,!appengine package poly1305 diff --git a/poly1305/sum_ref.go b/poly1305/sum_ref.go index 12568a2..92d3801 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 gccgo +// +build !amd64 gccgo appengine package poly1305