From patchwork Tue Sep 15 03:43:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 517654 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 830D6140291 for ; Tue, 15 Sep 2015 13:43:20 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=MdKWystm; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:content-type; q= dns; s=default; b=XtGjPXHeB+xDXNiQWucmjQQvfB/zjvGydSCTWSiq4scLzK 7z8NUUbQSPzwOOpOaIDr9HpXIkh4Zbv8adNh2WOQ1rV3gQnVhpfIGX/8sZKafJdB vxd36wR0By0fctaLiHBZHCkSVvWVOu+2FoaCFfjHjdDqmReZzEgmgEAmlTMlg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:content-type; s= default; bh=KGcl6nYUchkW4DMofxRBISPdG88=; b=MdKWystm0nv28L3r5nkq +phJ8UmdhXuVOawZRFnKRZS8lek2NgXlNfHZeJnka3VD2IjgjMedoPQ8iPd/JsZ2 7jBvir5pi6ce6P6VKqbKhRT/d/uI4ey4lhLWRIxQKHVIjOttz+9QmcXjgRqsuKNi vedEg7dKWnpodXLAwwonvME= Received: (qmail 31356 invoked by alias); 15 Sep 2015 03:43:09 -0000 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 Received: (qmail 31343 invoked by uid 89); 15 Sep 2015 03:43:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.9 required=5.0 tests=AWL, BAYES_40, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-lb0-f173.google.com Received: from mail-lb0-f173.google.com (HELO mail-lb0-f173.google.com) (209.85.217.173) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Tue, 15 Sep 2015 03:43:07 +0000 Received: by lbcao8 with SMTP id ao8so77492883lbc.3 for ; Mon, 14 Sep 2015 20:43:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=nuVgsmhXlBYK8TjHYzV29APiWhaZ6ZChenhdGH2KtRA=; b=eAv47Cye1xi+lupsP9WDntxBbhXFsU3mvEi+9QZws62Rx/SMgzimGiEqq10GLOGlpq Kcp5E6hR2Fo5Ys4Ylqe2Rs+zd6AyX5nqOBVjoeTjr2Uj+WzJ0NsXzfDlYBGa2DC9bzy4 qDsv1ueuGI9qwBmh5h5Xfdluk/fbbzY8ZXzD5L3GcLk4HhN8cz97g0kbrFQGMh6+HA+5 b4spOKQVKchKq5GVP+ZQV+EaQOH1nxt/X+13DEoYJTjn+boquO3+VbRNN9j6WEyuhuKi Ko7iPR1BdD+8YDjcvRY5PoBLWP5jI3zIv7Md+jVMRAQEQs9k1pKFNVk4/QbR5MF7vk82 eXIQ== X-Gm-Message-State: ALoCoQkIkNH+WHx9yylGMTvRIOBNxBZEaS30afTdJUy9D/RstijLaOxAJFahU9f2aC8+DGjM6SxA MIME-Version: 1.0 X-Received: by 10.152.29.167 with SMTP id l7mr18028936lah.57.1442288583928; Mon, 14 Sep 2015 20:43:03 -0700 (PDT) Received: by 10.114.176.73 with HTTP; Mon, 14 Sep 2015 20:43:03 -0700 (PDT) Date: Mon, 14 Sep 2015 20:43:03 -0700 Message-ID: Subject: libgo patch committed: Don't provide ustat on arm64 GNU/Linux From: Ian Lance Taylor To: gcc-patches , "gofrontend-dev@googlegroups.com" Apparently arm64 GNU/Linux does not provide ustat, and the linker warns about it when using glibc. This patch to libgo avoids providing syscall.Ustat on arm64 GNU/Linux, since it will apparently never work. Since I was touching Makefile.am I rebuilt with automake 1.11.6, the new GCC standard. Bootstrapped and tested on x86_64-unknown-linux-gnu, which admittedly proves little, but at least syscall.Ustat still works there. Committed to mainline. Ian Index: gcc/go/gofrontend/MERGE =================================================================== --- gcc/go/gofrontend/MERGE (revision 227758) +++ gcc/go/gofrontend/MERGE (working copy) @@ -1,4 +1,4 @@ -1d9d92ab09996d2f7795481d2876a21194502b89 +ae60deadd72b3b29df98cee61deed68f251f0122 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. Index: libgo/Makefile.am =================================================================== --- libgo/Makefile.am (revision 227696) +++ libgo/Makefile.am (working copy) @@ -1742,6 +1742,17 @@ else syscall_lsf_file = endif +# GNU/Linux specific ustat support. +if LIBGO_IS_LINUX +if LIBGO_IS_ARM64 +syscall_ustat_file = +else +syscall_ustat_file = go/syscall/libcall_linux_ustat.go +endif +else +syscall_ustat_file = +endif + # GNU/Linux specific utimesnano support. if LIBGO_IS_LINUX syscall_utimesnano_file = go/syscall/libcall_linux_utimesnano.go @@ -1780,6 +1791,7 @@ go_base_syscall_files = \ $(syscall_uname_file) \ $(syscall_netlink_file) \ $(syscall_lsf_file) \ + $(syscall_ustat_file) \ $(syscall_utimesnano_file) \ $(GO_LIBCALL_OS_FILE) \ $(GO_LIBCALL_OS_ARCH_FILE) \ Index: libgo/go/syscall/libcall_linux.go =================================================================== --- libgo/go/syscall/libcall_linux.go (revision 227696) +++ libgo/go/syscall/libcall_linux.go (working copy) @@ -408,6 +408,3 @@ func Unlinkat(dirfd int, path string) (e //sys Unshare(flags int) (err error) //unshare(flags _C_int) _C_int - -//sys Ustat(dev int, ubuf *Ustat_t) (err error) -//ustat(dev _dev_t, ubuf *Ustat_t) _C_int Index: libgo/go/syscall/libcall_linux_ustat.go =================================================================== --- libgo/go/syscall/libcall_linux_ustat.go (revision 0) +++ libgo/go/syscall/libcall_linux_ustat.go (working copy) @@ -0,0 +1,11 @@ +// Copyright 2015 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. + +// GNU/Linux library ustat call. +// This is not supported on some kernels, such as arm64. + +package syscall + +//sys Ustat(dev int, ubuf *Ustat_t) (err error) +//ustat(dev _dev_t, ubuf *Ustat_t) _C_int