From patchwork Fri Jan 14 16:16:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 78949 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 4D43FB7088 for ; Sat, 15 Jan 2011 03:16:32 +1100 (EST) Received: (qmail 8822 invoked by alias); 14 Jan 2011 16:16:28 -0000 Received: (qmail 8804 invoked by uid 22791); 14 Jan 2011 16:16:23 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD 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, 14 Jan 2011 16:16:19 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id C892FDA0; Fri, 14 Jan 2011 17:16:16 +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 PESc1R-KAgrd; Fri, 14 Jan 2011 17:16:15 +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 2104ED9E; Fri, 14 Jan 2011 17:16:15 +0100 (CET) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.4+Sun/8.14.4/Submit) id p0EGGEw5003082; Fri, 14 Jan 2011 17:16:14 +0100 (MET) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: Ian Lance Taylor Subject: [libgo] Fix typos in Makefile.am Date: Fri, 14 Jan 2011 17:16:14 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (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 Bootstrapping with Go on Solaris 11/x86 and SPARC failed building libgo due to two typos in Makefile.am. I'd normally install the following patch as obvious, but I'm not completely sure what the rules for libgo are wrt. synchronization with upstream. Ok for mainline? Rainer 2011-01-14 Rainer Orth * Makefile.am [LIBGO_IS_SOLARIS] (syscall_filesize_file): Fix typos. * Makefile.in: Regenerate. diff -r 6c184227ca86 libgo/Makefile.am --- a/libgo/Makefile.am Fri Jan 14 10:25:46 2011 +0100 +++ b/libgo/Makefile.am Fri Jan 14 17:13:20 2011 +0100 @@ -1,6 +1,6 @@ # Makefile.am -- Go library Makefile. -# Copyright 2009, 2010 The Go Authors. All rights reserved. +# Copyright 2009, 2010, 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. @@ -1041,10 +1041,10 @@ 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.