aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-01-10 04:53:55 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-01-10 04:53:55 +0000
commit76e723a3134cf121b6b9b9a7c46b9e1f74f9ce2d (patch)
tree13aa4e0c69061b554b4348ed2077404832d7d449
parent5862924dc8b1b24feb2878a1b5750124e3cb4130 (diff)
downloadgcc-76e723a3134cf121b6b9b9a7c46b9e1f74f9ce2d.zip
gcc-76e723a3134cf121b6b9b9a7c46b9e1f74f9ce2d.tar.gz
gcc-76e723a3134cf121b6b9b9a7c46b9e1f74f9ce2d.tar.bz2
libgo: add aix build tags
Reviewed-on: https://go-review.googlesource.com/86936 From-SVN: r256416
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/golang_org/x/net/internal/nettest/helper_nobsd.go2
-rw-r--r--libgo/go/golang_org/x/net/internal/nettest/helper_posix.go2
-rw-r--r--libgo/go/golang_org/x/net/internal/nettest/helper_unix.go2
-rw-r--r--libgo/go/os/signal/internal/pty/pty.go2
5 files changed, 5 insertions, 5 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 0c6538d..92d8b94 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -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.
diff --git a/libgo/go/golang_org/x/net/internal/nettest/helper_nobsd.go b/libgo/go/golang_org/x/net/internal/nettest/helper_nobsd.go
index bc7da5e..1611a90 100644
--- a/libgo/go/golang_org/x/net/internal/nettest/helper_nobsd.go
+++ b/libgo/go/golang_org/x/net/internal/nettest/helper_nobsd.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 linux solaris
+// +build aix linux solaris
package nettest
diff --git a/libgo/go/golang_org/x/net/internal/nettest/helper_posix.go b/libgo/go/golang_org/x/net/internal/nettest/helper_posix.go
index 963ed99..efc67a8 100644
--- a/libgo/go/golang_org/x/net/internal/nettest/helper_posix.go
+++ b/libgo/go/golang_org/x/net/internal/nettest/helper_posix.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 darwin dragonfly freebsd linux netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
package nettest
diff --git a/libgo/go/golang_org/x/net/internal/nettest/helper_unix.go b/libgo/go/golang_org/x/net/internal/nettest/helper_unix.go
index ed13e44..b6839dc 100644
--- a/libgo/go/golang_org/x/net/internal/nettest/helper_unix.go
+++ b/libgo/go/golang_org/x/net/internal/nettest/helper_unix.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 darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package nettest
diff --git a/libgo/go/os/signal/internal/pty/pty.go b/libgo/go/os/signal/internal/pty/pty.go
index 020f7bf..1c3480c 100644
--- a/libgo/go/os/signal/internal/pty/pty.go
+++ b/libgo/go/os/signal/internal/pty/pty.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 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.