aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-01-20 20:39:10 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-01-20 20:39:10 +0000
commit5dc8f5d9e6765ec1083afe8968dd88d8aa029150 (patch)
tree350f53925f7311a5ae07dc5cf613a52dc69418ed /gcc
parent4b9f2115114eb2c3acee32ed1898201a761fd215 (diff)
downloadgcc-5dc8f5d9e6765ec1083afe8968dd88d8aa029150.zip
gcc-5dc8f5d9e6765ec1083afe8968dd88d8aa029150.tar.gz
gcc-5dc8f5d9e6765ec1083afe8968dd88d8aa029150.tar.bz2
re PR go/79146 (Bootstrapping go on s390x fails; redefined symbols)
PR go/79146 math/big: fix build on s390x Don't build arith_decl_s390x.go for gccgo; it is only for assembly code that has not yet been ported to gccgo. For GCC PR 79146. From-SVN: r244731
Diffstat (limited to 'gcc')
-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 1849dc3..df9be07 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-a21ebb50459ba9608d0325ad1c1d62e6c9290186
+907f6e31975443993c47fa45e09cf85d0709b7e6
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.