From 8c954c529db60e55bb1a53213926edff9a2f347f Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 14 Jan 2011 18:46:42 +0000 Subject: [PATCH] libgo/Makefile.am: Correct typos in Solaris support. From Rainer Orth. From-SVN: r168804 --- libgo/Makefile.am | 6 +++--- libgo/Makefile.in | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libgo/Makefile.am b/libgo/Makefile.am index e2d2158a8c8..f651c24bb12 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -1,6 +1,6 @@ # Makefile.am -- Go library Makefile. -# Copyright 2009, 2010 The Go Authors. All rights reserved. +# Copyright 2009 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. @@ -1041,10 +1041,10 @@ else # !LIBGO_IS_LINUX if LIBGO_IS_SOLARIS if LIBGO_IS_386 # Use lseek64 on 386 Solaris. -syscall_filesize_flie = syscalls/sysfile_largefile.go +syscall_filesize_file = syscalls/sysfile_largefile.go else # !LIBGO_IS_LINUX && LIBGO_IS_SOLARIS && !LIBGO_IS_386 # Use lseek on amd64 Solaris. -syscall_filesize_flie = syscalls/sysfile_regfile.go +syscall_filesize_file = syscalls/sysfile_regfile.go endif # !LIBGO_IS_386 else # !LIBGO_IS_LINUX && !LIBGO_IS_SOLARIS # Use lseek by default. diff --git a/libgo/Makefile.in b/libgo/Makefile.in index 1b8fd5a2429..5328037718f 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -17,7 +17,7 @@ # Makefile.am -- Go library Makefile. -# Copyright 2009, 2010 The Go Authors. All rights reserved. +# Copyright 2009 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. @@ -1397,16 +1397,16 @@ go_testing_script_files = \ # Define Syscall and Syscall6. @LIBGO_IS_RTEMS_TRUE@syscall_syscall_file = syscalls/syscall_stubs.go +# Use lseek on amd64 Solaris. +@LIBGO_IS_386_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@syscall_filesize_file = syscalls/sysfile_regfile.go +# Use lseek64 on 386 Solaris. +@LIBGO_IS_386_TRUE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@syscall_filesize_file = syscalls/sysfile_largefile.go # Use lseek by default. @LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@syscall_filesize_file = syscalls/sysfile_regfile.go # Declare libc functions that vary for largefile systems. # Always use lseek64 on GNU/Linux. @LIBGO_IS_LINUX_TRUE@syscall_filesize_file = syscalls/sysfile_largefile.go -# Use lseek on amd64 Solaris. -@LIBGO_IS_386_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@syscall_filesize_flie = syscalls/sysfile_regfile.go -# Use lseek64 on 386 Solaris. -@LIBGO_IS_386_TRUE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@syscall_filesize_flie = syscalls/sysfile_largefile.go @LIBGO_IS_RTEMS_FALSE@syscall_exec_os_file = syscalls/exec.go # Define ForkExec, PtraceForkExec, Exec, and Wait4.