aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-01-19 04:48:51 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-01-19 04:48:51 +0000
commit674dddfe2db0280637f2f71211f9fd2018f555e8 (patch)
tree48ee0c4f12c156dcb10dfb75b48b3527a93c93b8
parent219f9bad8306a8766e25b06116fece3f027cbeef (diff)
downloadgcc-674dddfe2db0280637f2f71211f9fd2018f555e8.zip
gcc-674dddfe2db0280637f2f71211f9fd2018f555e8.tar.gz
gcc-674dddfe2db0280637f2f71211f9fd2018f555e8.tar.bz2
runtime: no escape for some functions on AIX
Reviewed-on: https://go-review.googlesource.com/88236 From-SVN: r256874
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/runtime/netpoll_aix.go3
-rw-r--r--libgo/go/runtime/stubs2.go1
3 files changed, 5 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index a16df7a..be2cc54 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-cf33aedb66b5121708f5640443c1336080a47fe5
+8195b62d353026256037fa44409c4ad95762e6b7
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/runtime/netpoll_aix.go b/libgo/go/runtime/netpoll_aix.go
index b4962cc..da59f93 100644
--- a/libgo/go/runtime/netpoll_aix.go
+++ b/libgo/go/runtime/netpoll_aix.go
@@ -34,12 +34,15 @@ const _PS_DELETE = 0x2
//extern pollset_create
func pollset_create(maxfd int32) pollset_t
+//go:noescape
//extern pollset_ctl
func pollset_ctl(ps pollset_t, pollctl_array *poll_ctl, array_length int32) int32
+//go:noescape
//extern pollset_poll
func pollset_poll(ps pollset_t, polldata_array *pollfd, array_length int32, timeout int32) int32
+//go:noescape
//extern pipe
func libc_pipe(fd *int32) int32
diff --git a/libgo/go/runtime/stubs2.go b/libgo/go/runtime/stubs2.go
index e760772..e305b16 100644
--- a/libgo/go/runtime/stubs2.go
+++ b/libgo/go/runtime/stubs2.go
@@ -10,6 +10,7 @@ package runtime
import "unsafe"
+//go:noescape
func read(fd int32, p unsafe.Pointer, n int32) int32
func closefd(fd int32) int32