[23/30,arm,rtems] Update t-rtems for new option framework

Message ID	0c71bd43a66e3cffceae8adbca9fd5f3c199e438.1497004220.git.Richard.Earnshaw@arm.com
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of gcc-patches-return-455531-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; 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=xXytk4Ohqi8xqW2u044stutdHKNjf4o7NNNwVnjXy6j96/tHQ/sU+ wPeY1ZaqEiZWXtKNlmzn0n32AIpl72q07CcGZIQF0DDPEjpc7YAtZ3U/kpjv0Nhx d75vqHypFw1Rv/Y3LDp9V9oqL5XQMaED89JqwnMTkkCY9+7eADkFXs= Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org From: Richard Earnshaw <Richard.Earnshaw@arm.com> To: gcc-patches@gcc.gnu.org Cc: Richard Earnshaw <Richard.Earnshaw@arm.com>, Joel Sherrill <joel@oarcorp.com>, Ralf Corsepius <ralf.corsepius@rtems.org>, Sebastian Huber <sebastian.huber@embedded-brains.de> Subject: [PATCH 23/30] [arm][rtems] Update t-rtems for new option framework Date: Fri, 9 Jun 2017 13:53:52 +0100 Message-Id: <0c71bd43a66e3cffceae8adbca9fd5f3c199e438.1497004220.git.Richard.Earnshaw@arm.com> In-Reply-To: <cover.1497004220.git.Richard.Earnshaw@arm.com> References: <cover.1497004220.git.Richard.Earnshaw@arm.com> In-Reply-To: <cover.1497004220.git.Richard.Earnshaw@arm.com> References: <cover.1497004220.git.Richard.Earnshaw@arm.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.7.4"
Series	Reworking the -mcpu, -march and -mfpu options \| expand [00/30,ARM] Reworking the -mcpu, -march and -mfpu options [01/30,arm] Use strings for -march, -mcpu and -mtune options [02/30,arm] Rewrite -march and -mcpu options for passing to the assembler [03/30,arm] Don't pass -mfpu=auto through to the assembler. [04/30,arm] Allow +opt on arbitrary cpu and architecture specifications [05/30,arm] Add architectural options [06/30,arm] Add default FPUs for CPUs. [07/30,build] Make sbitmap code available to the driver programs [08/30,arm] Split CPU, architecture and tuning data tables. [09/30,ARM] Move cpu and architecture option name parsing code to arm-common.c [10/30,arm] Use standard option parsing code for detecting thumb-only targets [11/30,arm] Allow CPU and architecture extensions to be defined as aliases [12/30,arm] Allow new extended syntax CPU and architecture names during configure [13/30,arm] Force a CPU default in the config args defaults list. [14/30,arm] Generate a canonical form for -march [15/30,arm] Make -mfloat-abi=softfp work when there are no FPU instructions [16/30,arm] Update basic multilib configuration [17/30,arm] Make 'auto' the default FPU selection option. [18/30,arm] Rewrite t-aprofile using new selector methodology [19/30,arm] Explicitly set .fpu in cmse_nonsecure_call.S [20/30,genmultilib] Allow explicit periods to be escaped in MULTILIB_REUSE [21/30,arm,testsuite] Use -march=armv7-a+fp when testing hard-float ABI. [22/30,arm] Rewrite t-rmprofile multilib specification [23/30,arm,rtems] Update t-rtems for new option framework [24/30,arm,linux-eabi] Ensure all multilib variables are reset [25/30,arm,phoenix] reset all multilib variables [26/30,arm] Rework multlib builds for symbianelf [27/30,arm,fuchsia] Rework multilib support [28/30,arm] Add a few missing architecture extension options. [29/30,arm,doc] Document new -march= syntax. [30/30,arm,doc] Document changes to -mcpu, -mtune and -mfpu.

Message ID

0c71bd43a66e3cffceae8adbca9fd5f3c199e438.1497004220.git.Richard.Earnshaw@arm.com

State

New

Headers

Received-SPF: pass (google.com: domain of
	gcc-patches-return-455531-patch=linaro.org@gcc.gnu.org
	designates 209.132.180.131 as permitted sender)
	client-ip=209.132.180.131; 
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=xXytk4Ohqi8xqW2u044stutdHKNjf4o7NNNwVnjXy6j96/tHQ/sU+
	wPeY1ZaqEiZWXtKNlmzn0n32AIpl72q07CcGZIQF0DDPEjpc7YAtZ3U/kpjv0Nhx
	d75vqHypFw1Rv/Y3LDp9V9oqL5XQMaED89JqwnMTkkCY9+7eADkFXs=
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
Sender: gcc-patches-owner@gcc.gnu.org
From: Richard Earnshaw <Richard.Earnshaw@arm.com>
To: gcc-patches@gcc.gnu.org
Cc: Richard Earnshaw <Richard.Earnshaw@arm.com>,
	Joel Sherrill <joel@oarcorp.com>,
	Ralf Corsepius <ralf.corsepius@rtems.org>,
	Sebastian Huber <sebastian.huber@embedded-brains.de>
Subject: [PATCH 23/30] [arm][rtems] Update t-rtems for new option framework
Date: Fri,  9 Jun 2017 13:53:52 +0100
Message-Id: <0c71bd43a66e3cffceae8adbca9fd5f3c199e438.1497004220.git.Richard.Earnshaw@arm.com>
In-Reply-To: <cover.1497004220.git.Richard.Earnshaw@arm.com>
References: <cover.1497004220.git.Richard.Earnshaw@arm.com>
In-Reply-To: <cover.1497004220.git.Richard.Earnshaw@arm.com>
References: <cover.1497004220.git.Richard.Earnshaw@arm.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------2.7.4"

Series

Reworking the -mcpu, -march and -mfpu options | expand

Commit Message

Richard Earnshaw (lists) June 9, 2017, 12:53 p.m. UTC

[This patch has only been fairly lightly tested (I've built a compiler
with all the relevant multilibs and smoke-tested a few combinations to
check that the tools still produce a sensible object file).]

This patch updates the RTEMS build to use the new option framework.
It tries as far as possible to keep the existing supported options,
but there are two necessary changes and one cleanup.  I've also
restructed the file slightly to make it slightly easier (IMO) to
understand.

Necessary changes:

1: ARMv4t does not support a hard-float ABI, the earliest supported
architecture with floating-point support is ARMv5te, so I've rebased
the original fpu/hard libraries to that revision of the architecture.

2: Similarly, the earliest version of the -m profile to support
hardware floating-point is armv7e-m (not armv7-m), so the base
architecture for m-profile with FP has been correspondingly updated.

Clean-up:

1: For greater consistency I've changed the
-mcpu=cortex-m7/-mfpu=fpv5-d16/-mhard-float to
-march=armv7e-m+fp.dp/-mhard-float.  The built-in -mcpu rewrite rules
take care of mapping the existing option sets onto the architecture
string to ensure compatibility.

Since the existing rule set does not contain any MULTILIB_REUSE rules,
I have not added any here this time around, but it would be worth the
maintainers of this file considering whether adding some rules would
make their toolchain more friendly to users.

Finally, I've added lines to reset all the multilib variables at the
head of the file.  I found during testing that some definitions from
t-arm-elf were leaking through and causing unexpected behviour.

	* config/arm/t-rtems: Rewrite for new option framework.
---
 gcc/config/arm/t-rtems | 49 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 17 deletions(-)

Comments

Sebastian Huber June 9, 2017, 1:02 p.m. UTC | #1

Hello Richard,

thanks for updating the RTEMS multlib configuration. It looks fine to me.

-- 
Sebastian Huber, embedded brains GmbH

Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone   : +49 89 189 47 41-16
Fax     : +49 89 189 47 41-09
E-Mail  : sebastian.huber@embedded-brains.de
PGP     : Public key available on request.

Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.

diff --git a/gcc/config/arm/t-rtems b/gcc/config/arm/t-rtems
index 026a589..c073786 100644
--- a/gcc/config/arm/t-rtems
+++ b/gcc/config/arm/t-rtems
@@ -1,22 +1,37 @@ 
 # Custom RTEMS multilibs for ARM
 
-MULTILIB_OPTIONS  = mbig-endian mthumb march=armv6-m/march=armv7-a/march=armv7-r/march=armv7-m/mcpu=cortex-m7 mfpu=neon/mfpu=vfp/mfpu=vfpv3-d16/mfpu=fpv4-sp-d16/mfpu=fpv5-d16 mfloat-abi=hard
-MULTILIB_DIRNAMES = eb thumb armv6-m armv7-a armv7-r armv7-m cortex-m7 neon vfp vfpv3-d16 fpv4-sp-d16 fpv5-d16 hard
+# Reset all MULTILIB variables
+
+MULTILIB_OPTIONS	=
+MULTILIB_DIRNAMES	=
+MULTILIB_EXCEPTIONS	=
+MULTILIB_REUSE		=
+MULTILIB_MATCHES	=
+MULTILIB_REQUIRED	=
 
 # Enumeration of multilibs
 
-MULTILIB_EXCEPTIONS =
-
-MULTILIB_REQUIRED =
-MULTILIB_REQUIRED += mbig-endian/mthumb/march=armv7-r/mfpu=vfpv3-d16/mfloat-abi=hard
-MULTILIB_REQUIRED += mbig-endian/mthumb/march=armv7-r
-MULTILIB_REQUIRED += mfpu=vfp/mfloat-abi=hard
-MULTILIB_REQUIRED += mthumb/march=armv6-m
-MULTILIB_REQUIRED += mthumb/march=armv7-a/mfpu=neon/mfloat-abi=hard
-MULTILIB_REQUIRED += mthumb/march=armv7-a
-MULTILIB_REQUIRED += mthumb/march=armv7-r/mfpu=vfpv3-d16/mfloat-abi=hard
-MULTILIB_REQUIRED += mthumb/march=armv7-r
-MULTILIB_REQUIRED += mthumb/march=armv7-m/mfpu=fpv4-sp-d16/mfloat-abi=hard
-MULTILIB_REQUIRED += mthumb/mcpu=cortex-m7/mfpu=fpv5-d16/mfloat-abi=hard
-MULTILIB_REQUIRED += mthumb/march=armv7-m
-MULTILIB_REQUIRED += mthumb
+MULTILIB_OPTIONS	+= mbig-endian
+MULTILIB_DIRNAMES	+= eb
+
+MULTILIB_OPTIONS	+= mthumb
+MULTILIB_DIRNAMES	+= thumb
+
+MULTILIB_OPTIONS	+= march=armv5te+fp/march=armv6-m/march=armv7-a/march=armv7-a+simd/march=armv7-r/march=armv7-r+fp/march=armv7-m/march=armv7e-m+fp/march=armv7e-m+fp.dp
+MULTILIB_DIRNAMES	+= armv5te+fp       armv6-m       armv7-a       armv7-a+simd       armv7-r       armv7-r+fp       armv7-m       armv7e-m+fp        armv7e-m+fp.dp
+
+MULTILIB_OPTIONS	+= mfloat-abi=hard
+MULTILIB_DIRNAMES	+= hard
+
+MULTILIB_REQUIRED	+= mbig-endian/mthumb/march=armv7-r+fp/mfloat-abi=hard
+MULTILIB_REQUIRED	+= mbig-endian/mthumb/march=armv7-r
+MULTILIB_REQUIRED	+= march=armv5te+fp/mfloat-abi=hard
+MULTILIB_REQUIRED	+= mthumb/march=armv6-m
+MULTILIB_REQUIRED	+= mthumb/march=armv7-a+simd/mfloat-abi=hard
+MULTILIB_REQUIRED	+= mthumb/march=armv7-a
+MULTILIB_REQUIRED	+= mthumb/march=armv7-r+fp/mfloat-abi=hard
+MULTILIB_REQUIRED	+= mthumb/march=armv7-r
+MULTILIB_REQUIRED	+= mthumb/march=armv7e-m+fp/mfloat-abi=hard
+MULTILIB_REQUIRED	+= mthumb/march=armv7e-m+fp.dp/mfloat-abi=hard
+MULTILIB_REQUIRED	+= mthumb/march=armv7-m
+MULTILIB_REQUIRED	+= mthumb

[23/30,arm,rtems] Update t-rtems for new option framework

Commit Message

Comments

Patch