From patchwork Fri Jun 9 12:53:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Richard Earnshaw \(lists\)" X-Patchwork-Id: 103487 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp194943qgd; Fri, 9 Jun 2017 05:58:24 -0700 (PDT) X-Received: by 10.98.150.199 with SMTP id s68mr23790598pfk.206.1497013104308; Fri, 09 Jun 2017 05:58:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497013104; cv=none; d=google.com; s=arc-20160816; b=eVb3YRM9CT6VpB/31TvF3Nkw7w/yZU+glgDRsHZzlRJ1MO9O+qQVkJaPstaeVfnR1a NRFdOeMYLP/yHUOOTbeABsXqxZ15mQWx7VbDSZ32AHD4F2Doq+BqOS9erALTwQUq0otl RM9k0gKmbDaG1ENBVhpn0AisavUF4fdEv2Jn37gp0Es4zugTNyFHmHgbfSEkLWgPJnIr cy1itjAU99CjvkJlZ8RyQD7PWqRmJtUmCIaeQqOXYH8BHzNa3jN3/MUGAhsPMN3U7STL Ob6MbWxj6JhdEDoYAUvt0UBSk3Z0C1fZgkujtuOBh7IaHpqF5KO7QLKNDaEQOQpiExu6 bs9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:references:in-reply-to :message-id:date:subject:cc:to:from:delivered-to:sender:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :mailing-list:dkim-signature:domainkey-signature :arc-authentication-results; bh=d3KLhNmeIK6o59DA2krPdkWEAQK/+NJPL6nvhcb6n1I=; b=Am82EkGryvRl6rCCQpZTtR/61X1xWPN2x9lwgEfRY2XkvcLeg4eJ3X2Lzg/Yo1BdVd XV95D52gkp9ljRmqQ8NCaiy1aVVV6xbPMXw03HXLXahCYYWJddbSCeYwn7zZ0IuYEg4a PRYQea8RLNtQYlmhbpG7plAH1Ca1OUUDYvmUGpzWg/v/pm+lyNTZIVBuKdP4ObUCqZ5g HKGBWRXlIgUOWjGnZqJ+7IyKlBAJrFC3W2dZVeN6DcspaZlcH5/jY94x7vXZ7pqHGKCG ApouiyeAik3dXIEHuGU4B94Fj0OKtVAmHj2zigZpFqm0zV0romAZ3vqsc8wOeVT4Lr0c CF+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org; spf=pass (google.com: domain of gcc-patches-return-455530-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-455530-patch=linaro.org@gcc.gnu.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id z82si917840pff.392.2017.06.09.05.58.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Jun 2017 05:58:24 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-return-455530-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org; spf=pass (google.com: domain of gcc-patches-return-455530-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-455530-patch=linaro.org@gcc.gnu.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references:mime-version:content-type; q=dns; s= default; b=vM9dbDIxhcqFvahsJPK5m+Ye9ll4mkNT+zlYiU0dTEe61bqURjZvi cvQdPzc0vR1IjyevyhaFdaoeXr3IRaoj6RUsilgH14NagC3rytxIr+sn64RVliwP N2oX9eRpRrXO7KgU091Y8TQHk98hRB0gVN4NXzeUSaYB7uTZsRCIjA= 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:from :to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references:mime-version:content-type; s=default; bh=ZGxYnCzZz43XuKQ7hkMEFC4yTtY=; b=MsFMzNr/Fv/Fod0MlO0UYClShSC4 qoKtT6+Z5L4nZmcHmEZe2+IpACfSNLHUUH5cLMkVdbMQK/esNzz81HcxJ7NBc73n gLCIs8GX6zg645m0XL80wYv4wBlNuVbZrkMLub6YTu/GrXJVaoAgSQnLoWoyk3zx 9GsL2CLX55fOYkI= Received: (qmail 85135 invoked by alias); 9 Jun 2017 12:54:34 -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 83797 invoked by uid 89); 9 Jun 2017 12:54:31 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy= X-HELO: eggs.gnu.org Received: from eggs.gnu.org (HELO eggs.gnu.org) (208.118.235.92) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 09 Jun 2017 12:54:28 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJJQq-0007hX-2C for gcc-patches@gcc.gnu.org; Fri, 09 Jun 2017 08:54:31 -0400 Received: from foss.arm.com ([217.140.101.70]:47128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJJQp-0007Te-RF for gcc-patches@gcc.gnu.org; Fri, 09 Jun 2017 08:54:27 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 88537168F; Fri, 9 Jun 2017 05:54:27 -0700 (PDT) Received: from e105689-lin.cambridge.arm.com (e105689-lin.cambridge.arm.com [10.2.207.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E70CC3F3E1; Fri, 9 Jun 2017 05:54:26 -0700 (PDT) From: Richard Earnshaw To: gcc-patches@gcc.gnu.org Cc: Richard Earnshaw , Jakub Sejdak Subject: [PATCH 25/30] [arm][phoenix] reset all multilib variables Date: Fri, 9 Jun 2017 13:53:54 +0100 Message-Id: <3e6ae4b89e7412968d08a5c198af2f33133399a1.1497004220.git.Richard.Earnshaw@arm.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.140.101.70 NB. This configuration does not build in GCC-7 and doesn't build now either. This patch resets a couple of multlib variables which previously were not cleared. It almost certainly needs further work to make it use the new option framework correctly, but since the library configurations are already clearly wrong, it's not clear what the changes need to be. In particular it tries to build a hard-float library for ARM7TDMI in both ARM and thumb modes, but ARMv4t does not support any floating-point instructions; furthermore, GCC has never supported a hard-float thumb1 library. * config/arm/t-phoenix (MULTILIB_REUSE): Clear variable. (MULTILIB_REQUIRED): Likewise. --- gcc/config/arm/t-phoenix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gcc/config/arm/t-phoenix b/gcc/config/arm/t-phoenix index dea5257..4930ba8 100644 --- a/gcc/config/arm/t-phoenix +++ b/gcc/config/arm/t-phoenix @@ -16,14 +16,16 @@ # along with GCC; see the file COPYING3. If not see # . -MULTILIB_OPTIONS = marm/mthumb -MULTILIB_DIRNAMES = arm thumb -MULTILIB_EXCEPTIONS = -MULTILIB_MATCHES = +MULTILIB_OPTIONS = marm/mthumb +MULTILIB_DIRNAMES = arm thumb +MULTILIB_EXCEPTIONS = +MULTILIB_MATCHES = +MULTILIB_REUSE = +MULTILIB_REQUIRED = -MULTILIB_OPTIONS += mfloat-abi=hard -MULTILIB_DIRNAMES += fpu -MULTILIB_MATCHES += mfloat-abi?hard=mhard-float +MULTILIB_OPTIONS += mfloat-abi=hard +MULTILIB_DIRNAMES += fpu +MULTILIB_MATCHES += mfloat-abi?hard=mhard-float -MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork -MULTILIB_DIRNAMES += normal interwork +MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork +MULTILIB_DIRNAMES += normal interwork