diff mbox

libgo patch committed: Fix cgo tests for AIX

Message ID CAOyqgcVyZ2JfQ5a3me=PCZm=whz9vefBNGLosv+D9QDqiqgLZQ@mail.gmail.com
State New
Headers show

Commit Message

Ian Lance Taylor Aug. 18, 2017, 2:06 p.m. UTC 
This libgo patch by Tony Reix fixes the cgo tests for AIX.
Bootstrapped and ran testsuite on x86_64-pc-linux-gnu.  Committed to
mainline.

Ian
diff mbox

Patch

Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE	(revision 251179)
+++ gcc/go/gofrontend/MERGE	(working copy)
@@ -1,4 +1,4 @@ 
-9ff49c64ea6dbb5e08d1fa859b99b06049413279
+28e49825162465172ed706283628bf5cc1996260
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
Index: libgo/misc/cgo/test/cthread_unix.c
===================================================================
--- libgo/misc/cgo/test/cthread_unix.c	(revision 250873)
+++ libgo/misc/cgo/test/cthread_unix.c	(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
 
 #include <pthread.h>
 #include "_cgo_export.h"
Index: libgo/misc/cgo/test/issue18146.go
===================================================================
--- libgo/misc/cgo/test/issue18146.go	(revision 250873)
+++ libgo/misc/cgo/test/issue18146.go	(working copy)
@@ -50,6 +50,8 @@  func test18146(t *testing.T) {
 		nproc = 6
 	case "darwin", "dragonfly", "freebsd", "netbsd", "openbsd":
 		nproc = 7
+	case "aix":
+		nproc = 9
 	}
 	if setNproc {
 		var rlim syscall.Rlimit