From 198766b6488cf0b50b3cff97099fb1c0482a9f3a Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 20 Jan 2017 02:27:46 +0000 Subject: re PR go/79146 (Bootstrapping go on s390x fails; redefined symbols) PR go/79146 crypto/elliptic: explicitly ignore p256_s390x.go The file only works if used in conjunction with assembly code not (yet) written for gccgo. Fixes GCC PR 79146. Reviewed-on: https://go-review.googlesource.com/35477 From-SVN: r244679 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/crypto/elliptic/p256_s390x.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index f989752..1849dc3 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -2b3d389f961b8461b3fdf42318a628f68b56f8b1 +a21ebb50459ba9608d0325ad1c1d62e6c9290186 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/crypto/elliptic/p256_s390x.go b/libgo/go/crypto/elliptic/p256_s390x.go index a824454..5f99e71 100644 --- a/libgo/go/crypto/elliptic/p256_s390x.go +++ b/libgo/go/crypto/elliptic/p256_s390x.go @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +// +build ignore // -build s390x package elliptic -- cgit v1.1