From patchwork Tue Jan 21 23:29:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 23472 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2E492203BE for ; Tue, 21 Jan 2014 23:29:56 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id vb8sf33124409obc.2 for ; Tue, 21 Jan 2014 15:29:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mailing-list:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:sender :delivered-to:from:to:cc:subject:user-agent:date:message-id :mime-version:x-original-sender:x-original-authentication-results :content-type; bh=CS9gIPT5TAIpRe9MrAEovt9g+MKsn6RzFCby1WtOIls=; b=TKbF3tbNQDg6r7ikp0+CHI36WwsavEFzw4P94CbkRE+xHHkWpfko8b22eQsx1o+5nE YT5+NwwsRRXFEOGivert4Ce9nX4RtlRxW8vQvdPm6C1BN1ckIhr/+Dm/SzH8VhkQQaor mnF1kYir2rt5KMymY5ijQA2rHoHD2ET5NoRdTeYeQOzAc8d8Dnq/gi/bY0Mo3mhYjYhp rflH4h4+NPk/jjPH/2Mhu8wYuvUA6gO0yxleKc8o9J1uhr7yPd6LNDGK0Jro54ZxXMCx QP92zHKZb3Jbb/QvLCy1fjiKSl/Ev1cGjCChhEGP7UYrBPAJRop2KtCFejtJ0U5jIvUl qB1A== X-Gm-Message-State: ALoCoQlwBtk72oJqzDNCMEM7BfkMWJAoARtzEgEV9tANp97xcF5vkHwPs7XERXCV6Ajo3pwaYqsB X-Received: by 10.182.88.200 with SMTP id bi8mr4156856obb.43.1390346995842; Tue, 21 Jan 2014 15:29:55 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.171 with SMTP id s40ls1350846qga.17.gmail; Tue, 21 Jan 2014 15:29:55 -0800 (PST) X-Received: by 10.236.230.3 with SMTP id i3mr26364228yhq.13.1390346995743; Tue, 21 Jan 2014 15:29:55 -0800 (PST) Received: from mail-vb0-x230.google.com (mail-vb0-x230.google.com [2607:f8b0:400c:c02::230]) by mx.google.com with ESMTPS id s6si8008320yho.39.2014.01.21.15.29.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Jan 2014 15:29:55 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::230 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::230; Received: by mail-vb0-f48.google.com with SMTP id q16so3848568vbe.7 for ; Tue, 21 Jan 2014 15:29:55 -0800 (PST) X-Received: by 10.58.116.239 with SMTP id jz15mr3406830veb.26.1390346995261; Tue, 21 Jan 2014 15:29:55 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp147664vcz; Tue, 21 Jan 2014 15:29:54 -0800 (PST) X-Received: by 10.66.11.202 with SMTP id s10mr28067015pab.86.1390346994020; Tue, 21 Jan 2014 15:29:54 -0800 (PST) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id sw1si7258196pab.112.2014.01.21.15.29.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jan 2014 15:29:54 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-return-360142-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 17298 invoked by alias); 21 Jan 2014 23:29:42 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list 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 17284 invoked by uid 89); 21 Jan 2014 23:29:41 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.7 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: youngberry.canonical.com Received: from youngberry.canonical.com (HELO youngberry.canonical.com) (91.189.89.112) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 21 Jan 2014 23:29:40 +0000 Received: from [120.136.5.22] (helo=narsil) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1W5klG-0006ZO-Bb; Tue, 21 Jan 2014 23:29:38 +0000 Received: by narsil (Postfix, from userid 1000) id D6997526431; Wed, 22 Jan 2014 12:29:34 +1300 (NZDT) From: Michael Hudson-Doyle To: gcc-patches Cc: Ian Lance Taylor , Matthias Klose Subject: fix inconsistent install paths between gccgo and go tool User-Agent: Notmuch/0.17~rc1+4~g7f07bfd (http://notmuchmail.org) Emacs/24.3.50.2 (x86_64-pc-linux-gnu) Date: Wed, 22 Jan 2014 12:29:34 +1300 Message-ID: <87d2jkncbl.fsf@canonical.com> MIME-Version: 1.0 X-Original-Sender: michael.hudson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::230 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@gcc.gnu.org X-Google-Group-Id: 836684582541 Hi, This patch for the 4.8 branch fixes an inconsistency between gccgo's libgo and the go tool over where libraries installed with "go install -compiler gccgo" end up. Even if it's not strictly required, it makes sense to me that as gccgo implements go 1.1 it should match the go tool from that particular version of the go distribution (and also newer ones!). Cheers, mwh diff --git a/libgo/go/go/build/build.go b/libgo/go/go/build/build.go index cc89afb..59ddcef 100644 --- a/libgo/go/go/build/build.go +++ b/libgo/go/go/build/build.go @@ -429,7 +429,7 @@ func (ctxt *Context) Import(path string, srcDir string, mode ImportMode) (*Packa switch ctxt.Compiler { case "gccgo": dir, elem := pathpkg.Split(p.ImportPath) - pkga = "pkg/gccgo/" + dir + "lib" + elem + ".a" + pkga = "pkg/gccgo_" + ctxt.GOOS + "_" + ctxt.GOARCH + "/" + dir + "lib" + elem + ".a" case "gc": suffix := "" if ctxt.InstallSuffix != "" {