aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/internal/cpu/cpu_ppc64x.go4
2 files changed, 2 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 07437d4..e3db885 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-672572130ba7a7b277a4c9c8f93576fc42accf63
+fe0382eabbf1e8b148dc8cb7733348bd9d887e10
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/cpu/cpu_ppc64x.go b/libgo/go/internal/cpu/cpu_ppc64x.go
index c59503f..02f2c06 100644
--- a/libgo/go/internal/cpu/cpu_ppc64x.go
+++ b/libgo/go/internal/cpu/cpu_ppc64x.go
@@ -29,9 +29,7 @@ func doinit() {
{Name: "darn", Feature: &PPC64.HasDARN},
{Name: "scv", Feature: &PPC64.HasSCV},
{Name: "power9", Feature: &PPC64.IsPOWER9},
-
- // These capabilities should always be enabled on ppc64 and ppc64le:
- {Name: "power8", Feature: &PPC64.IsPOWER8, Required: true},
+ {Name: "power8", Feature: &PPC64.IsPOWER8},
}
// HWCAP2 feature bits