From patchwork Fri Dec 16 10:54:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 131804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 575FC1007D7 for ; Fri, 16 Dec 2011 21:54:56 +1100 (EST) Received: (qmail 14221 invoked by alias); 16 Dec 2011 10:54:53 -0000 Received: (qmail 14211 invoked by uid 22791); 16 Dec 2011 10:54:52 -0000 X-SWARE-Spam-Status: No, hits=-2.9 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, TW_CC, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 16 Dec 2011 10:54:38 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 32076BEA; Fri, 16 Dec 2011 11:54:35 +0100 (CET) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id FNcSr3pJUpaz; Fri, 16 Dec 2011 11:54:32 +0100 (CET) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 7ACDEBE9; Fri, 16 Dec 2011 11:54:32 +0100 (CET) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.5+Sun/8.14.5/Submit) id pBGAsV4n001428; Fri, 16 Dec 2011 11:54:31 +0100 (MET) From: Rainer Orth To: Ian Lance Taylor Cc: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: Re: libgo patch committed: Update to weekly.2011-12-02 References: Date: Fri, 16 Dec 2011 11:54:31 +0100 In-Reply-To: (Ian Lance Taylor's message of "Tue, 13 Dec 2011 11:16:30 -0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Ian Lance Taylor writes: > I have committed a patch to update libgo to the weekly.2011-12-02 > release of the master library. In this message I have only included the > diffs to files that are specific to the gccgo copy of the library. > Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. > Committed to mainline. The following patch is necessary to restore Solaris Go bootstrap after your patch went in, to fix /vol/gcc/src/hg/trunk/local/libgo/go/os/stat.go:22:29: error: argument 1 has incompatible type (cannot use type syscall.Timestruc as type syscall.Timespec) /vol/gcc/src/hg/trunk/local/libgo/go/os/stat.go:55:60: error: argument 1 has incompatible type (cannot use type syscall.Timestruc as type syscall.Timespec) Rainer 2011-12-15 Rainer Orth * go/os/stat_solaris.go: New file. * Makefile.am (go_os_stat_file): New variable. (go_os_files): Use it. * Makefile.in: Regenerate. # HG changeset patch # Parent e7747591399959c280e5c7b0589bf7bb0c052595 Fix go/os/stat.go build on Solaris diff --git a/libgo/Makefile.am b/libgo/Makefile.am --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -763,6 +763,12 @@ endif endif endif +if LIBGO_IS_SOLARIS +go_os_stat_file = go/os/stat_solaris.go +else +go_os_stat_file = go/os/stat.go +endif + go_os_files = \ $(go_os_dir_file) \ go/os/dir.go \ @@ -779,7 +785,7 @@ go_os_files = \ go/os/path.go \ go/os/path_unix.go \ go/os/proc.go \ - go/os/stat.go \ + $(go_os_stat_file) \ go/os/str.go \ $(go_os_sys_file) \ go/os/time.go \ diff --git a/libgo/go/os/stat_solaris.go b/libgo/go/os/stat_solaris.go new file mode 100644 --- /dev/null +++ b/libgo/go/os/stat_solaris.go @@ -0,0 +1,56 @@ +// Copyright 2011 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. + +package os + +import ( + "syscall" + "time" +) + +func sameFile(fs1, fs2 *FileStat) bool { + sys1 := fs1.Sys.(*syscall.Stat_t) + sys2 := fs2.Sys.(*syscall.Stat_t) + return sys1.Dev == sys2.Dev && sys1.Ino == sys2.Ino +} + +func fileInfoFromStat(st *syscall.Stat_t, name string) FileInfo { + fs := &FileStat{ + name: basename(name), + size: int64(st.Size), + modTime: timestrucToTime(st.Mtime), + Sys: st, + } + fs.mode = FileMode(st.Mode & 0777) + switch st.Mode & syscall.S_IFMT { + case syscall.S_IFBLK, syscall.S_IFCHR: + fs.mode |= ModeDevice + case syscall.S_IFDIR: + fs.mode |= ModeDir + case syscall.S_IFIFO: + fs.mode |= ModeNamedPipe + case syscall.S_IFLNK: + fs.mode |= ModeSymlink + case syscall.S_IFREG: + // nothing to do + case syscall.S_IFSOCK: + fs.mode |= ModeSocket + } + if st.Mode&syscall.S_ISGID != 0 { + fs.mode |= ModeSetgid + } + if st.Mode&syscall.S_ISUID != 0 { + fs.mode |= ModeSetuid + } + return fs +} + +func timestrucToTime(ts syscall.Timestruc) time.Time { + return time.Unix(int64(ts.Sec), int64(ts.Nsec)) +} + +// For testing. +func atime(fi FileInfo) time.Time { + return timestrucToTime(fi.(*FileStat).Sys.(*syscall.Stat_t).Atime) +}