On Fri, May 22, 2020 at 4:11 AM Jakub Jelinek <ja...@redhat.com> wrote: > > On Fri, May 22, 2020 at 12:04:10PM +0100, Richard Earnshaw wrote: > > >> The directories in question are > > >> > > >> gcc/go/gofrontend > > >> libgo > > >> gcc/testsuite/go.test/test > > > > > > The script has: > > > ignored_prefixes = [ > > > 'gcc/d/dmd/', > > > 'gcc/go/frontend/', > > > > The directory is gcc/go/gofrontend > > > > so it's missing 'go' from frontend. > > Thanks for spotting. I believe Martin said he will be afk > today, so I've fixed it for him and committed as obvious and > am going to install into git-hooks now too. > > diff --git a/contrib/ChangeLog b/contrib/ChangeLog > index 7b61bb8915b..64a0db18e58 100644 > --- a/contrib/ChangeLog > +++ b/contrib/ChangeLog > @@ -1,3 +1,9 @@ > +2020-05-22 Jakub Jelinek <ja...@redhat.com> > + > + * gcc-changelog/git_commit.py: Add trailing / to > + gcc/testsuite/go.test/test and replace gcc/go/frontend/ > + with gcc/go/gofrontend/ in ignored locations. > + > 2020-05-22 Martin Liska <mli...@suse.cz> > > * gcc-changelog/git_commit.py: Add gcc/testsuite/go.test/test > diff --git a/contrib/gcc-changelog/git_commit.py > b/contrib/gcc-changelog/git_commit.py > index ba9f5ce9650..8c5fa2c0fc9 100755 > --- a/contrib/gcc-changelog/git_commit.py > +++ b/contrib/gcc-changelog/git_commit.py > @@ -127,8 +127,8 @@ bug_components = set([ > > ignored_prefixes = [ > 'gcc/d/dmd/', > - 'gcc/go/frontend/', > - 'gcc/testsuite/go.test/test', > + 'gcc/go/gofrontend/', > + 'gcc/testsuite/go.test/test/', > 'libgo/', > 'libphobos/libdruntime', > 'libphobos/src/',
Thanks for looking into this. Unfortunately, my push is still failing. I'm not sure why. remote: *** ChangeLog format failed: remote: ERR: cannot find a ChangeLog location in message remote: remote: Please see: https://gcc.gnu.org/codingconventions.html#ChangeLogs remote: remote: error: hook declined to update refs/heads/master To git+ssh://gcc.gnu.org/git/gcc ! [remote rejected] master -> master (hook declined) error: failed to push some refs to 'git+ssh://gcc.gnu.org/git/gcc' I've attached the output of "git format-patch -k 1 --stdout", in case that helps. Ian
From 81994eab700da7fea6644541c163aa0f0f3b8cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= <chigo...@gmail.com> Date: Tue, 19 May 2020 16:03:54 +0200 Subject: libgo: update x/sys/cpu after gccgo support added Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/234597 --- gcc/go/gofrontend/MERGE | 2 +- .../sys/cpu/{cpu_aix_ppc64.go => cpu_aix.go} | 2 +- .../golang.org/x/sys/cpu/syscall_aix_gccgo.go | 27 +++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) rename libgo/go/golang.org/x/sys/cpu/{cpu_aix_ppc64.go => cpu_aix.go} (96%) create mode 100644 libgo/go/golang.org/x/sys/cpu/syscall_aix_gccgo.go diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index bc9c1f07eda..284374820b0 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -bc27341f245a5cc54ac7530d037a609db72b677c +ea58b8491064fbed18a220571a3043c38dccf7c7 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_aix_ppc64.go b/libgo/go/golang.org/x/sys/cpu/cpu_aix.go similarity index 96% rename from libgo/go/golang.org/x/sys/cpu/cpu_aix_ppc64.go rename to libgo/go/golang.org/x/sys/cpu/cpu_aix.go index b0ede112d4e..02d03129e50 100644 --- a/libgo/go/golang.org/x/sys/cpu/cpu_aix_ppc64.go +++ b/libgo/go/golang.org/x/sys/cpu/cpu_aix.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 aix,ppc64 +// +build aix package cpu diff --git a/libgo/go/golang.org/x/sys/cpu/syscall_aix_gccgo.go b/libgo/go/golang.org/x/sys/cpu/syscall_aix_gccgo.go new file mode 100644 index 00000000000..2609cc49ae7 --- /dev/null +++ b/libgo/go/golang.org/x/sys/cpu/syscall_aix_gccgo.go @@ -0,0 +1,27 @@ +// Copyright 2020 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. + +// Recreate a getsystemcfg syscall handler instead of +// using the one provided by x/sys/unix to avoid having +// the dependency between them. (See golang.org/issue/32102) +// Morover, this file will be used during the building of +// gccgo's libgo and thus must not use a CGo method. + +// +build aix +// +build gccgo + +package cpu + +import ( + "syscall" +) + +//extern getsystemcfg +func gccgoGetsystemcfg(label uint32) (r uint64) + +func callgetsystemcfg(label int) (r1 uintptr, e1 syscall.Errno) { + r1 = uintptr(gccgoGetsystemcfg(uint32(label))) + e1 = syscall.GetErrno() + return +} -- 2.27.0.rc0.183.gde8f92d652-goog