aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-01-20 02:27:46 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-01-20 02:27:46 +0000
commit198766b6488cf0b50b3cff97099fb1c0482a9f3a (patch)
tree010c3ae5e90f6fca1e9491b7110533539956c464
parent38a9e5a6c07d84274bc5d345b947d1c13351d590 (diff)
downloadgcc-198766b6488cf0b50b3cff97099fb1c0482a9f3a.zip
gcc-198766b6488cf0b50b3cff97099fb1c0482a9f3a.tar.gz
gcc-198766b6488cf0b50b3cff97099fb1c0482a9f3a.tar.bz2
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
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/crypto/elliptic/p256_s390x.go1
2 files changed, 2 insertions, 1 deletions
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