From e884ced05231a04b1a3c70ece7237d0b1eeebf19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= <clement.chigot@atos.net>
Date: Fri, 3 May 2019 16:53:13 +0200
Subject: [PATCH] syscall: fix TestForeground for AIX

Syscall function can't be used on AIX. Therefore, Ioctl in
TestForeground must call raw_ioctl.

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/175080
---
 gcc/go/gofrontend/MERGE              |  2 +-
 libgo/go/syscall/export_aix_test.go  | 16 ++++++++++++++++
 libgo/go/syscall/export_unix_test.go |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 libgo/go/syscall/export_aix_test.go

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 59b580f0956..5d26b7e2da1 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-99ab98d2ed8fa8a33947c52925f89b344d7cb8ae
+cfee06e20a172753552b1515dd3a4fde5d5cad7b
 
 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_aix_test.go b/libgo/go/syscall/export_aix_test.go
new file mode 100644
index 00000000000..044337b9993
--- /dev/null
+++ b/libgo/go/syscall/export_aix_test.go
@@ -0,0 +1,16 @@
+// Copyright 2019 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.
+
+// +build aix
+
+package syscall
+
+import (
+	"unsafe"
+)
+
+func Ioctl(fd, req, arg uintptr) (err Errno) {
+	_, err = raw_ioctl_ptr(int(fd), req, unsafe.Pointer(arg))
+	return err
+}
diff --git a/libgo/go/syscall/export_unix_test.go b/libgo/go/syscall/export_unix_test.go
index dc11f455de0..4d67be9ac2d 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 aix darwin dragonfly freebsd hurd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd hurd linux netbsd openbsd solaris
 
 package syscall