diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-05-13 20:26:24 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-05-13 20:26:24 +0000 |
| commit | 93ee143d1888051fbf3156212accc154af3a667b (patch) | |
| tree | cfe431691d948b2710293d70df70e1b6822b80eb /libgo | |
| parent | bceb07e3584c9d8ea3e5760636ae24ff7f8606ff (diff) | |
| download | gcc-93ee143d1888051fbf3156212accc154af3a667b.zip gcc-93ee143d1888051fbf3156212accc154af3a667b.tar.gz gcc-93ee143d1888051fbf3156212accc154af3a667b.tar.bz2 | |
libgo: drop Solaris 10 support
Based on patch by Rainer Orth.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/176938
From-SVN: r271135
Diffstat (limited to 'libgo')
| -rwxr-xr-x | libgo/configure | 2 | ||||
| -rw-r--r-- | libgo/configure.ac | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/signal_gccgo.go | 5 | ||||
| -rwxr-xr-x | libgo/mksysinfo.sh | 4 |
4 files changed, 2 insertions, 11 deletions
diff --git a/libgo/configure b/libgo/configure index 06b68b0..888b6d9 100755 --- a/libgo/configure +++ b/libgo/configure @@ -14138,7 +14138,7 @@ case "$target" in # msghdr in <sys/socket.h>. OSCFLAGS="$OSCFLAGS -D_XOPEN_SOURCE=500" ;; - *-*-solaris2.1[01]) + *-*-solaris2.*) # Solaris 10+ needs this so struct msghdr gets the msg_control # etc. fields in <sys/socket.h> (_XPG4_2). _XOPEN_SOURCE=600 as # above doesn't work with C99. diff --git a/libgo/configure.ac b/libgo/configure.ac index 03c07fe..c47253b 100644 --- a/libgo/configure.ac +++ b/libgo/configure.ac @@ -397,7 +397,7 @@ case "$target" in # msghdr in <sys/socket.h>. OSCFLAGS="$OSCFLAGS -D_XOPEN_SOURCE=500" ;; - *-*-solaris2.1[[01]]) + *-*-solaris2.*) # Solaris 10+ needs this so struct msghdr gets the msg_control # etc. fields in <sys/socket.h> (_XPG4_2). _XOPEN_SOURCE=600 as # above doesn't work with C99. diff --git a/libgo/go/runtime/signal_gccgo.go b/libgo/go/runtime/signal_gccgo.go index b3c78f6..6f362fc 100644 --- a/libgo/go/runtime/signal_gccgo.go +++ b/libgo/go/runtime/signal_gccgo.go @@ -60,11 +60,6 @@ type sigctxt struct { } func (c *sigctxt) sigcode() uint64 { - if c.info == nil { - // This can happen on Solaris 10. We don't know the - // code, just avoid a misleading value. - return _SI_USER + 1 - } return uint64(c.info.si_code) } diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh index c9dd8d4..5f7b5f0 100755 --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -735,13 +735,9 @@ if ! grep "const EAI_OVERFLOW " ${OUT} >/dev/null 2>&1; then fi # The passwd struct. -# Force uid and gid from int32 to uint32 for consistency; they are -# int32 on Solaris 10 but uint32 everywhere else including Solaris 11. grep '^type _passwd ' gen-sysinfo.go | \ sed -e 's/_passwd/Passwd/' \ -e 's/ pw_/ Pw_/g' \ - -e 's/ Pw_uid int32/ Pw_uid uint32/' \ - -e 's/ Pw_gid int32/ Pw_gid uint32/' \ >> ${OUT} # The group struct. |