From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 10 Jan 2018 04:53:55 +0000 (+0000)
Subject: libgo: add aix build tags
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=76e723a3134cf121b6b9b9a7c46b9e1f74f9ce2d;p=gcc.git

libgo: add aix build tags

    Reviewed-on: https://go-review.googlesource.com/86936

From-SVN: r256416
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 0c6538d4e09..92d8b94b660 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 bc7da5e0d57..1611a907f00 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 963ed99655b..efc67a8eba9 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 ed13e448b7b..b6839dcd8fd 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 020f7bfc665..1c3480cffc5 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.