mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-24 13:11:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

runtime: use _libgo_off_t_type when calling C mmap

Browse Source 
The last argument to the C mmap function is type off_t, not uintptr.
On some 32-bit systems, off_t is larger than uintptr.

Based on patch by Sören Tempel.

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/445735
This commit is contained in:
Ian Lance Taylor 2022-10-26 17:23:42 -07:00
parent fc01cfa967
commit 0a2984dd10
2 changed files with 5 additions and 3 deletions
gcc/go/gofrontend
MERGE
libgo/go/runtime
mem_gccgo.go

2
gcc/go/gofrontend/MERGE

@ -1,4 +1,4 @@
6c188108858e3ae8c8ea8e4cc55427d8cf01bbc8
5e658f4659c551330ea68f5667e4f951b218f32d
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

6
libgo/go/runtime/mem_gccgo.go

@ -15,7 +15,7 @@ import (
//go:linkname sysFree
//extern mmap
func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off _libgo_off_t_type) unsafe.Pointer
//extern munmap
func munmap(addr unsafe.Pointer, length uintptr) int32
@ -38,7 +38,7 @@ func init() {
}
func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
p := sysMmap(addr, n, prot, flags, fd, off)
p := sysMmap(addr, n, prot, flags, fd, _libgo_off_t_type(off))
if uintptr(p) == _MAP_FAILED {
return nil, errno()
}
@ -47,6 +47,7 @@ func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (u
// Don't split the stack as this method may be invoked without a valid G, which
// prevents us from allocating more stack.
//
//go:nosplit
func sysAlloc(n uintptr, sysStat *sysMemStat) unsafe.Pointer {
p, err := mmap(nil, n, _PROT_READ|_PROT_WRITE, _MAP_ANON|_MAP_PRIVATE, mmapFD, 0)
@ -165,6 +166,7 @@ func sysHugePage(v unsafe.Pointer, n uintptr) {
// Don't split the stack as this function may be invoked without a valid G,
// which prevents us from allocating more stack.
//
//go:nosplit
func sysFree(v unsafe.Pointer, n uintptr, sysStat *sysMemStat) {
sysStat.add(-int64(n))