diff options
-rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
-rw-r--r-- | libgo/go/golang.org/x/sys/cpu/cpu_linux_other.go | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 895aa6f..4ae93ee 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -1f4ce28409a2d9d4045b1085de55c46de8759d1c +27b2311fa460b1dd76fb3a796c7c05ebedc64df2 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/golang.org/x/sys/cpu/cpu_linux_other.go b/libgo/go/golang.org/x/sys/cpu/cpu_linux_other.go new file mode 100644 index 0000000..6e8f9fe --- /dev/null +++ b/libgo/go/golang.org/x/sys/cpu/cpu_linux_other.go @@ -0,0 +1,9 @@ +// Copyright 2019 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build !amd64,!amd64p32,!386,!arm64,!ppc64,!ppc64le,!s390x + +package cpu + +func doinit() {} |