diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-04-25 15:39:39 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-04-25 15:39:39 +0000 |
| commit | b34bfeb1979da5a970ef9ac5213178d67f269dbb (patch) | |
| tree | da1e9d7c746d8d6267957281bb1b5b53ac68dad0 /libgo | |
| parent | 9bafe5a81e42406b86a65ef14b011ed9acc96c5d (diff) | |
| parent | b16f214775619dd850e724a0630792da38ba3e40 (diff) | |
| download | gcc-b34bfeb1979da5a970ef9ac5213178d67f269dbb.zip gcc-b34bfeb1979da5a970ef9ac5213178d67f269dbb.tar.gz gcc-b34bfeb1979da5a970ef9ac5213178d67f269dbb.tar.bz2 | |
Merge from trunk revision 270573.
From-SVN: r270577
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/go/syscall/socket_aix.go | 24 | ||||
| -rw-r--r-- | libgo/runtime/go-unwind.c | 5 |
2 files changed, 28 insertions, 1 deletions
diff --git a/libgo/go/syscall/socket_aix.go b/libgo/go/syscall/socket_aix.go index 40cf423..aaa1419 100644 --- a/libgo/go/syscall/socket_aix.go +++ b/libgo/go/syscall/socket_aix.go @@ -11,6 +11,7 @@ import "unsafe" const SizeofSockaddrInet4 = 16 const SizeofSockaddrInet6 = 28 const SizeofSockaddrUnix = 1025 +const SizeofSockaddrDatalink = 128 type RawSockaddrInet4 struct { Len uint8 @@ -87,3 +88,26 @@ func GetsockoptIPv6MTUInfo(fd, level, opt int) (*IPv6MTUInfo, error) { err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen) return &value, err } + +type SockaddrDatalink struct { + Len uint8 + Family uint8 + Index uint16 + Type uint8 + Nlen uint8 + Alen uint8 + Slen uint8 + Data [120]uint8 + raw RawSockaddrDatalink +} + +type RawSockaddrDatalink struct { + Len uint8 + Family uint8 + Index uint16 + Type uint8 + Nlen uint8 + Alen uint8 + Slen uint8 + Data [120]uint8 +} diff --git a/libgo/runtime/go-unwind.c b/libgo/runtime/go-unwind.c index 9fd9596..ad3142c 100644 --- a/libgo/runtime/go-unwind.c +++ b/libgo/runtime/go-unwind.c @@ -411,7 +411,7 @@ parse_lsda_header (struct _Unwind_Context *context, const unsigned char *p, _Unwind_Reason_Code PERSONALITY_FUNCTION (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *) - __attribute__ ((no_split_stack, flatten)); + __attribute__ ((no_split_stack, flatten, target ("general-regs-only"))); _Unwind_Reason_Code PERSONALITY_FUNCTION (_Unwind_State state, @@ -604,6 +604,9 @@ __gccgo_personality_dummy (int, _Unwind_Action, _Unwind_Exception_Class, __attribute__ ((no_split_stack)); _Unwind_Reason_Code +#ifdef __ARM_EABI_UNWINDER__ +__attribute__ ((target ("general-regs-only"))) +#endif __gccgo_personality_dummy (int version __attribute__ ((unused)), _Unwind_Action actions __attribute__ ((unused)), _Unwind_Exception_Class exception_class __attribute__ ((unused)), |