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

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index f9897529b735cfd7379c8ca655a5629f36ad5a8d..1849dc37c291c82e82757739ed23289b08f7908f 100644 (file)
--- 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 a824454d7da544a381472042d51d1a32e28bbeaa..5f99e71e5d60576fa9aa0b7fa5b502ef0075bcd2 100644 (file)
--- 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