Rainer Orth <r...@cebitec.uni-bielefeld.de> writes: > * go-test.exp wasn't updated for the change from sparcv9 to sparc64. > While I still don't agree with the new name, at least the two should > be consistent.
I committed this earlier today. > * env.go needs to accept sparc and sparc64. I fixed this in a different way. > * Just like 32-bit Solaris 2/x86, 32-bit Solaris 2/SPARC needs to use > the largefile variants of several functions. I've not introduced a > new LIBGO_IS_SOLARIS32 conditional for that, but perhaps one should? I just committed this one, as appended. Thanks for sending them. Ian
diff -r 50a941f17e57 libgo/Makefile.am --- a/libgo/Makefile.am Wed Mar 30 10:36:43 2011 -0700 +++ b/libgo/Makefile.am Wed Mar 30 14:42:46 2011 -0700 @@ -689,8 +689,12 @@ if LIBGO_IS_386 go_os_dir_file = go/os/dir_largefile.go else +if LIBGO_IS_SPARC +go_os_dir_file = go/os/dir_largefile.go +else go_os_dir_file = go/os/dir_regfile.go endif +endif else if LIBGO_IS_LINUX go_os_dir_file = go/os/dir_largefile.go @@ -1219,16 +1223,21 @@ syscall_stat_file = syscalls/sysfile_stat_largefile.go else # !LIBGO_IS_LINUX if LIBGO_IS_SOLARIS -# FIXME: Same for sparc vs. sparc64. Introduce new/additional conditional? if LIBGO_IS_386 -# Use lseek64 on 386 Solaris. +# Use lseek64 on 32-bit Solaris/x86. syscall_filesize_file = syscalls/sysfile_largefile.go syscall_stat_file = syscalls/sysfile_stat_largefile.go -else # !LIBGO_IS_LINUX && LIBGO_IS_SOLARIS && !LIBGO_IS_386 -# Use lseek on amd64 Solaris. +else # !LIBGO_IS_386 +if LIBGO_IS_SPARC +# Use lseek64 on 32-bit Solaris/SPARC. +syscall_filesize_file = syscalls/sysfile_largefile.go +syscall_stat_file = syscalls/sysfile_stat_largefile.go +else # !LIBGO_IS_386 && !LIBGO_IS_SPARC +# Use lseek on 64-bit Solaris. syscall_filesize_file = syscalls/sysfile_regfile.go syscall_stat_file = syscalls/sysfile_stat_regfile.go -endif # !LIBGO_IS_386 +endif # !LIBGO_IS_386 && !LIBGO_IS_SPARC +endif # !LIBGO_IS_SOLARIS else # !LIBGO_IS_LINUX && !LIBGO_IS_SOLARIS # Use lseek by default. syscall_filesize_file = syscalls/sysfile_regfile.go
