From: Ian Lance Taylor <iant@golang.org>
Date: Tue, 11 Aug 2020 18:36:23 +0000 (-0700)
Subject: internal/syscall/unix: restore ppc build tag
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8f9fd3c4ee5f9e9eb5045d35fcf189ccd214231c;p=gcc.git

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
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 93aa18cec06..08daa1a5924 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 576937e3f5c..aa2e81a667e 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