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: 309181 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 61F1E2C00B0 for ; Fri, 10 Jan 2014 19:23:49 +1100 (EST) 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:cc:content-type; q=dns; s=default; b=EVhywiY1YtM30ighBhGiEDYWmMXq1OIYW3/arpGArX/ jOURezFm/O80AlRcNoQZulboZSnWIglOGauIEHY5HLjJizfJYRLUvxK3UoXo2BP0 TN1gUqRnHcz52ScUWNeqfq8zvGAHc2R7gAEbJVvnGj5DHNJie/MZNWhju2rZvOMo = 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:cc:content-type; s=default; bh=0yhaq5zHBYfiY6QsVVZKHeaIMkY=; b=hN657xiSS9VwEh3p1 vewR5uAuzimSVrOoqJbaNUJ1/xEIkMTqjt6aZuaEaixXOeGYZca7HJv4jEGUZTaZ S0ROYALlydGrFoN3mDi957fMOP1S5l0wYRU1Kkxrtvgqc2OswqSbi7sRE7f58mrW 0q5oTOuZVRxVc5EAA0RYYnhk7Q= Received: (qmail 12533 invoked by alias); 10 Jan 2014 08:23:41 -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 12521 invoked by uid 89); 10 Jan 2014 08:23:40 -0000 Authentication-Results: sourceware.org; auth=none 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) 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:cc :content-type; bh=bWIA3S8qDmf/fG+A4xmUVQyVvIgngTzDgDS4SQk8NRg=; b=Dyoyz4sKOGOwxAy8sQY35Qn0YtJ6luexOxhjV81OM8BHU3lE6wW/YPoQnNoGK+KHG/ V/KUk2mvod3bDjDWGUUJXes7fVftseKYzQH9r772RORRQuCwXSlhnN8Cl9o/sCvgUwPA vMiom5NEOm24C+VHb4LyXt4RTMG1b+UlFRS3MlaSN8IgNKUMmWKx/RnCwWQm0VR80p1f H6jcd7S9S2e0BqBL7HziuxBvKP8alkAMiF/kBrhaGpvRrzoZjJopcraDAGyybWIrsUjU zKLYON3wDfGLFCaq75u+viWY/XjCYjlaOWCZgbt6n3KxZeYOUipEq4iiQc68NUuPZt8/ mAuA== X-Gm-Message-State: ALoCoQkOzf+bJ8LB+PA5/E+NDBYL30Lwo/6s5JASH0HQ6ilhKRXx4E4o8gCXMXOriKY6s+p9Txg9 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 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