From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 20 Sep 2016 18:26:55 +0000 (+0000)
Subject: syscall: build export_unix_test.go on solaris
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=321f72a231c35599a5c68d1369a5b17edd794f7f;p=gcc.git

syscall: build export_unix_test.go on solaris

    Patch from Rainer Orth.

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

From-SVN: r240285
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 48d19462897..1123e622c82 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-57d120d75be87c2a0da67e750f16929891f1b8f4
+259b4fe81436a3836308f6c96e058edad07be338
 
 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/syscall/export_unix_test.go b/libgo/go/syscall/export_unix_test.go
index b41fe2f86b3..47ec544339f 100644
--- a/libgo/go/syscall/export_unix_test.go
+++ b/libgo/go/syscall/export_unix_test.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
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package syscall