From patchwork Fri Jan 10 08:23:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenqiang Chen X-Patchwork-Id: 23085 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DD0A220555 for ; Fri, 10 Jan 2014 08:23:55 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id l109sf3127991yhq.5 for ; Fri, 10 Jan 2014 00:23:55 -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:mime-version:date:message-id:subject:from:to:cc :x-original-sender:x-original-authentication-results:content-type; bh=bWIA3S8qDmf/fG+A4xmUVQyVvIgngTzDgDS4SQk8NRg=; b=dPwkXnPfeSGuaLsCStOVHABqhwzR59xyMeWCgpjohUbSHNK8mVNKILB9YLqq2FXiMW MGHRXZA1esosdY31coBl/WVdJirKGNAZBtU4vUv7pulpW5g98GCVBqXFVtOrmauE/3+5 yeb8oPLvvJZ1KLSx4Tk58MPYYjfvWua+FPX3yHOb0DdTUwLDXZfgTqOIremOAToCn735 b7lmGFvevZRQYSlxZRKP0w3vgZukmtIe67KNwwncErik3lzzxvTxOOHCt+RNNjLYFm/n cRNuI92mOkAnsn0Jeq//JHJtqIwaSjJ9EPfrcajE9Esrrf2ny65tXNdNUJxzQmrwfSTK moDg== X-Gm-Message-State: ALoCoQmbDwVZ4JI90GILsfPsxjU9XUgcrehbwPQdHipoMRnN65LoSnsTY+SB5DWCzlhDE0XGURi4 X-Received: by 10.58.238.199 with SMTP id vm7mr2885667vec.17.1389342235098; Fri, 10 Jan 2014 00:23:55 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.131.162 with SMTP id on2ls1584754qeb.73.gmail; Fri, 10 Jan 2014 00:23:55 -0800 (PST) X-Received: by 10.224.111.195 with SMTP id t3mr4751308qap.2.1389342235016; Fri, 10 Jan 2014 00:23:55 -0800 (PST) Received: from mail-ve0-x22c.google.com (mail-ve0-x22c.google.com [2607:f8b0:400c:c01::22c]) by mx.google.com with ESMTPS id f9si9276078qar.94.2014.01.10.00.23.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Jan 2014 00:23:54 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22c 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:c01::22c; Received: by mail-ve0-f172.google.com with SMTP id jw12so3262836veb.3 for ; Fri, 10 Jan 2014 00:23:54 -0800 (PST) X-Received: by 10.58.181.71 with SMTP id du7mr6840178vec.25.1389342234680; Fri, 10 Jan 2014 00:23:54 -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.59.13.131 with SMTP id ey3csp70398ved; Fri, 10 Jan 2014 00:23:54 -0800 (PST) X-Received: by 10.66.13.138 with SMTP id h10mr9649997pac.148.1389342233681; Fri, 10 Jan 2014 00:23:53 -0800 (PST) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id ez5si6376516pab.164.2014.01.10.00.23.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jan 2014 00:23:53 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-return-359337-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 12533 invoked by alias); 10 Jan 2014 08:23:41 -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 12521 invoked by uid 89); 10 Jan 2014 08:23:40 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-la0-f49.google.com Received: from mail-la0-f49.google.com (HELO mail-la0-f49.google.com) (209.85.215.49) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 10 Jan 2014 08:23:40 +0000 Received: by mail-la0-f49.google.com with SMTP id er20so2923023lab.22 for ; Fri, 10 Jan 2014 00:23:36 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.152.22.228 with SMTP id h4mr3108985laf.71.1389342215934; Fri, 10 Jan 2014 00:23:35 -0800 (PST) Received: by 10.112.25.103 with HTTP; Fri, 10 Jan 2014 00:23:35 -0800 (PST) Date: Fri, 10 Jan 2014 16:23:35 +0800 Message-ID: Subject: [PATCH, AARCH64] MULTIARCH_DIRNAME breaks multiarch build From: Zhenqiang Chen To: "gcc-patches@gcc.gnu.org" Cc: Yufeng Zhang , Marcus Shawcroft X-Original-Sender: zhenqiang.chen@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22c 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, MULTIARCH_DIRNAME was removed @r196649 since the dir info had been combined in MULTILIB_OSDIRNAMES. But MULTIARCH_DIRNAME was re-added @r201164. With this change, the final multiarch_dir is combined as "aarch64-linux-gnu:aarch64-linux-gnu", which is incorrect and leads to multiarch build fail if the sysroot is in correct multiarch layout. Any reason to add MULTIARCH_DIRNAME? If it is not necessary, can we remove it as the patch? Thanks! -Zhenqiang ChangeLog: 2014-01-10 Zhenqiang Chen * config/aarch64/t-aarch64-linux (MULTIARCH_DIRNAME): Remove. # on the baremetal targets. diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux index 147452b..77e33ea 100644 --- a/gcc/config/aarch64/t-aarch64-linux +++ b/gcc/config/aarch64/t-aarch64-linux @@ -23,7 +23,6 @@ LIB1ASMFUNCS = _aarch64_sync_cache_range AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) MULTILIB_OSDIRNAMES = .=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) -MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) # Disable the multilib for linux-gnu targets for the time being; focus