libgo: adapt Solaris 12 references
With the change in the Solaris release model (no more major releases like Solaris 12 but only minor ones like 11.4), the Solaris 12 references in GCC need to be adapted. Patch by Rainer Orth. Reviewed-on: https://go-review.googlesource.com/77490 From-SVN: r254729
This commit is contained in:
parent
aea4b54ac5
commit
082fc7e884
6 changed files with 12 additions and 12 deletions
|
@ -1,4 +1,4 @@
|
|||
b03c5dc36d6d0c0d3bef434936e8b924d253595b
|
||||
d028451131e92bab5379defb04ead87ca978ed25
|
||||
|
||||
The first line of this file holds the git revision number of the last
|
||||
merge done from the gofrontend repository.
|
||||
|
|
|
@ -1191,7 +1191,7 @@ syscall/wait.lo: go/syscall/wait.c runtime.inc
|
|||
@$(MKDIR_P) syscall
|
||||
$(LTCOMPILE) -c -o $@ $(srcdir)/go/syscall/wait.c
|
||||
|
||||
# Solaris 12 changed the type of fields in struct stat.
|
||||
# Solaris 11.4 changed the type of fields in struct stat.
|
||||
# Use a build tag, based on a configure check, to cope.
|
||||
if LIBGO_IS_SOLARIS
|
||||
if HAVE_STAT_TIMESPEC
|
||||
|
|
|
@ -1218,7 +1218,7 @@ extra_check_libs_cmd_go_internal_load = $(abs_builddir)/libgotool.a
|
|||
extra_check_libs_cmd_go_internal_work = $(abs_builddir)/libgotool.a
|
||||
@HAVE_STAT_TIMESPEC_FALSE@@LIBGO_IS_SOLARIS_TRUE@matchargs_os =
|
||||
|
||||
# Solaris 12 changed the type of fields in struct stat.
|
||||
# Solaris 11.4 changed the type of fields in struct stat.
|
||||
# Use a build tag, based on a configure check, to cope.
|
||||
@HAVE_STAT_TIMESPEC_TRUE@@LIBGO_IS_SOLARIS_TRUE@matchargs_os = --tag=solaristag
|
||||
@LIBGO_IS_SOLARIS_FALSE@matchargs_os =
|
||||
|
|
|
@ -752,7 +752,7 @@ STRUCT_EPOLL_EVENT_FD_OFFSET=${libgo_cv_c_epoll_event_fd_offset}
|
|||
AC_SUBST(STRUCT_EPOLL_EVENT_FD_OFFSET)
|
||||
|
||||
dnl Check if <sys/stat.h> uses timespec_t for st_?tim members. Introduced
|
||||
dnl in Solaris 12 for XPG7 compatibility.
|
||||
dnl in Solaris 11.4 for XPG7 compatibility.
|
||||
AC_EGREP_HEADER([timespec_t.*st_atim], [sys/stat.h],
|
||||
[have_stat_timespec=yes], [have_stat_timespec=no])
|
||||
AM_CONDITIONAL(HAVE_STAT_TIMESPEC, test $have_stat_timespec = yes)
|
||||
|
|
|
@ -168,22 +168,22 @@ grep '^type _zone_net_addr_t ' gen-sysinfo.go | \
|
|||
sed -e 's/_in6_addr/[16]byte/' \
|
||||
>> ${OUT}
|
||||
|
||||
# The Solaris 12 _flow_arp_desc_t struct.
|
||||
# The Solaris 11.4 _flow_arp_desc_t struct.
|
||||
grep '^type _flow_arp_desc_t ' gen-sysinfo.go | \
|
||||
sed -e 's/_in6_addr_t/[16]byte/g' \
|
||||
>> ${OUT}
|
||||
|
||||
# The Solaris 12 _flow_l3_desc_t struct.
|
||||
# The Solaris 11.4 _flow_l3_desc_t struct.
|
||||
grep '^type _flow_l3_desc_t ' gen-sysinfo.go | \
|
||||
sed -e 's/_in6_addr_t/[16]byte/g' \
|
||||
>> ${OUT}
|
||||
|
||||
# The Solaris 12 _mac_ipaddr_t struct.
|
||||
# The Solaris 11.3 _mac_ipaddr_t struct.
|
||||
grep '^type _mac_ipaddr_t ' gen-sysinfo.go | \
|
||||
sed -e 's/_in6_addr_t/[16]byte/g' \
|
||||
>> ${OUT}
|
||||
|
||||
# The Solaris 12 _mactun_info_t struct.
|
||||
# The Solaris 11.3 _mactun_info_t struct.
|
||||
grep '^type _mactun_info_t ' gen-sysinfo.go | \
|
||||
sed -e 's/_in6_addr_t/[16]byte/g' \
|
||||
>> ${OUT}
|
||||
|
|
|
@ -1295,22 +1295,22 @@ grep '^type _zone_net_addr_t ' gen-sysinfo.go | \
|
|||
sed -e 's/_in6_addr/[16]byte/' \
|
||||
>> ${OUT}
|
||||
|
||||
# The Solaris 12 _flow_arp_desc_t struct.
|
||||
# The Solaris 11.4 _flow_arp_desc_t struct.
|
||||
grep '^type _flow_arp_desc_t ' gen-sysinfo.go | \
|
||||
sed -e 's/_in6_addr_t/[16]byte/g' \
|
||||
>> ${OUT}
|
||||
|
||||
# The Solaris 12 _flow_l3_desc_t struct.
|
||||
# The Solaris 11.4 _flow_l3_desc_t struct.
|
||||
grep '^type _flow_l3_desc_t ' gen-sysinfo.go | \
|
||||
sed -e 's/_in6_addr_t/[16]byte/g' \
|
||||
>> ${OUT}
|
||||
|
||||
# The Solaris 12 _mac_ipaddr_t struct.
|
||||
# The Solaris 11.3 _mac_ipaddr_t struct.
|
||||
grep '^type _mac_ipaddr_t ' gen-sysinfo.go | \
|
||||
sed -e 's/_in6_addr_t/[16]byte/g' \
|
||||
>> ${OUT}
|
||||
|
||||
# The Solaris 12 _mactun_info_t struct.
|
||||
# The Solaris 11.3 _mactun_info_t struct.
|
||||
grep '^type _mactun_info_t ' gen-sysinfo.go | \
|
||||
sed -e 's/_in6_addr_t/[16]byte/g' \
|
||||
>> ${OUT}
|
||||
|
|
Loading…
Add table
Reference in a new issue