OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use _nuname on 32-bit Solaris 2/x86. 

From-SVN: r170761
This commit is contained in:
Ian Lance Taylor 2011-03-07 22:39:45 +00:00
parent d8b878dc29
commit ec9dc45b75
5 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libgo/Makefile.am
View File

@ -1201,6 +1201,18 @@ else
syscall_socket_epoll_file =
endif
# Support for uname.
if LIBGO_IS_SOLARIS
if LIBGO_IS_386
# 32-bit Solaris 2/x86 needs _nuname, handled in syscall_solaris_386.go.
syscall_uname_file =
else # !LIBGO_IS_386 && LIBGO_IS_SOLARIS
syscall_uname_file = syscalls/syscall_uname.go
endif
else # !LIBGO_IS_SOLARIS
syscall_uname_file = syscalls/syscall_uname.go
endif
syscall_arch.go: s-syscall_arch; @true
s-syscall_arch: Makefile
rm -f syscall_arch.go.tmp
@ -1222,6 +1234,7 @@ go_syscall_files = \
$(syscall_socket_os_file) \
$(syscall_socket_epoll_file) \
$(syscall_syscall_file) \
$(syscall_uname_file) \
syscalls/syscall_unix.go \
syscalls/stringbyte.go \
syscalls/syscall_$(GOOS).go \

7
libgo/Makefile.in
View File

@ -1563,6 +1563,12 @@ go_testing_script_files = \
# Support for epoll.
@LIBGO_IS_LINUX_TRUE@syscall_socket_epoll_file = syscalls/socket_epoll.go
@LIBGO_IS_386_FALSE@@LIBGO_IS_SOLARIS_TRUE@syscall_uname_file = syscalls/syscall_uname.go
# Support for uname.
# 32-bit Solaris 2/x86 needs _nuname, handled in syscall_solaris_386.go.
@LIBGO_IS_386_TRUE@@LIBGO_IS_SOLARIS_TRUE@syscall_uname_file =
@LIBGO_IS_SOLARIS_FALSE@syscall_uname_file = syscalls/syscall_uname.go
go_syscall_files = \
$(syscall_errstr_file) \
$(syscall_errstr_decl_file) \
@ -1575,6 +1581,7 @@ go_syscall_files = \
$(syscall_socket_os_file) \
$(syscall_socket_epoll_file) \
$(syscall_syscall_file) \
$(syscall_uname_file) \
syscalls/syscall_unix.go \
syscalls/stringbyte.go \
syscalls/syscall_$(GOOS).go \

3
libgo/syscalls/syscall_solaris_386.go
View File

@ -15,3 +15,6 @@ func libc_ptrace(request int, pid Pid_t, addr uintptr, data *byte) int __asm__ (
var dummy *byte
const sizeofPtr uintptr = uintptr(unsafe.Sizeof(dummy))
// 32-bit Solaris 2/x86 needs to use _nuname internally, cf. <sys/utsname.h>.
func libc_uname(buf *Utsname) (errno int) __asm__("_nuname")

7
libgo/syscalls/syscall_uname.go Normal file
View File

@ -0,0 +1,7 @@
// Copyright 2011 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.
package syscall
func libc_uname(buf *Utsname) (errno int) __asm__("uname")

2
libgo/syscalls/syscall_unix.go
View File

@ -15,8 +15,6 @@ const ENONE = 0
func GetErrno() int
func SetErrno(int)
func libc_uname(buf *Utsname) (errno int) __asm__("uname")
func Uname(buf *Utsname) (errno int) {
r := libc_uname(buf)
if r < 0 {