This patch by Tony Reix adds some aix build tags to new libgo files. Bootstrapped on x86_64-pc-linux-gnu. Committed to mainline.
Ian
Index: gcc/go/gofrontend/MERGE =================================================================== --- gcc/go/gofrontend/MERGE (revision 256412) +++ gcc/go/gofrontend/MERGE (working copy) @@ -1,4 +1,4 @@ -7ef1b48f63c0a64b83fc049884fb89677e19b2dd +98b0942497bf2896127b71d851a79959ed3197cf The first line of this file holds the git revision number of the last merge done from the gofrontend repository. Index: libgo/go/golang_org/x/net/internal/nettest/helper_nobsd.go =================================================================== --- libgo/go/golang_org/x/net/internal/nettest/helper_nobsd.go (revision 256366) +++ libgo/go/golang_org/x/net/internal/nettest/helper_nobsd.go (working copy) @@ -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 linux solaris +// +build aix linux solaris package nettest Index: libgo/go/golang_org/x/net/internal/nettest/helper_posix.go =================================================================== --- libgo/go/golang_org/x/net/internal/nettest/helper_posix.go (revision 256366) +++ libgo/go/golang_org/x/net/internal/nettest/helper_posix.go (working copy) @@ -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 darwin dragonfly freebsd linux netbsd openbsd solaris windows +// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows package nettest Index: libgo/go/golang_org/x/net/internal/nettest/helper_unix.go =================================================================== --- libgo/go/golang_org/x/net/internal/nettest/helper_unix.go (revision 256366) +++ libgo/go/golang_org/x/net/internal/nettest/helper_unix.go (working copy) @@ -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 darwin dragonfly freebsd linux netbsd openbsd solaris +// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris package nettest Index: libgo/go/os/signal/internal/pty/pty.go =================================================================== --- libgo/go/os/signal/internal/pty/pty.go (revision 256399) +++ libgo/go/os/signal/internal/pty/pty.go (working copy) @@ -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 darwin dragonfly freebsd linux,!android netbsd openbsd solaris +// +build aix darwin dragonfly freebsd linux,!android netbsd openbsd solaris // Package pty is a simple pseudo-terminal package for Unix systems, // implemented by calling C functions via cgo.
