aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2020-08-11 11:36:23 -0700
committerGiuliano Belinassi <giuliano.belinassi@usp.br>2020-08-17 15:08:01 -0300
commit5aada0ea0402d89acc14184cf699e2a09e583c37 (patch)
tree03484b32e302cb58cacd14e79f50516e26bef14a
parenta674b5d7d11eaf7c430ff5dff10c206b6da1f928 (diff)
downloadgcc-5aada0ea0402d89acc14184cf699e2a09e583c37.zip
gcc-5aada0ea0402d89acc14184cf699e2a09e583c37.tar.gz
gcc-5aada0ea0402d89acc14184cf699e2a09e583c37.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
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/internal/syscall/unix/sysnum_linux_ppc64x.go2
2 files changed, 2 insertions, 2 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.
diff --git a/libgo/go/internal/syscall/unix/sysnum_linux_ppc64x.go b/libgo/go/internal/syscall/unix/sysnum_linux_ppc64x.go
index 576937e..aa2e81a 100644
--- a/libgo/go/internal/syscall/unix/sysnum_linux_ppc64x.go
+++ b/libgo/go/internal/syscall/unix/sysnum_linux_ppc64x.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// +build ppc64 ppc64le
+// +build ppc ppc64 ppc64le
package unix