summaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2017-01-20 02:27:46 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2017-01-20 02:27:46 +0000
commit478f6e4f6c9be66fdda3254cf7142aeb62327d9d (patch)
tree010c3ae5e90f6fca1e9491b7110533539956c464 /gcc/go
parent64ac1079b0d56b4a00123a22a618b6f535c4912c (diff)
downloadgcc-478f6e4f6c9be66fdda3254cf7142aeb62327d9d.tar.gz
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 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244679 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index f9897529b73..1849dc37c29 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.