aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2020-08-11 11:36:23 -0700
committerIan Lance Taylor <iant@golang.org>2020-08-11 12:28:46 -0700
commit8f9fd3c4ee5f9e9eb5045d35fcf189ccd214231c (patch)
treeafb6c249622a5538e613cc7e378ed2dc9fcc332c /gcc/go
parent09c683a39c5e4e59b992efd0d406cb61b55f7f56 (diff)
downloadgcc-8f9fd3c4ee5f9e9eb5045d35fcf189ccd214231c.zip
gcc-8f9fd3c4ee5f9e9eb5045d35fcf189ccd214231c.tar.gz
gcc-8f9fd3c4ee5f9e9eb5045d35fcf189ccd214231c.tar.bz2
internal/syscall/unix: restore ppc build tag
It was accidentally lost in the 1.15rc1 merge. Fixes PR go/96567 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/247843
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 93aa18c..08daa1a 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-c512af85eb8c75a759b5e4fc6b72041fe09b75f1
+e08f1d7d1bc14c0a29eb9ee17980f14fa2397239
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.