From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 85337 invoked by alias); 9 Jun 2017 12:54:35 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 84082 invoked by uid 89); 9 Jun 2017 12:54:32 -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=sensible 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 1dJJQo-0007gK-Je 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 1dJJQo-0007Te-9E for gcc-patches@gcc.gnu.org; Fri, 09 Jun 2017 08:54:26 -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 F385A1650; Fri, 9 Jun 2017 05:54:25 -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 1AA5A3F3E1; Fri, 9 Jun 2017 05:54:24 -0700 (PDT) From: Richard Earnshaw To: gcc-patches@gcc.gnu.org Cc: Richard Earnshaw , Joel Sherrill , Ralf Corsepius , Sebastian Huber Subject: [PATCH 23/30] [arm][rtems] Update t-rtems for new option framework Date: Fri, 09 Jun 2017 12:54:00 -0000 Message-Id: <0c71bd43a66e3cffceae8adbca9fd5f3c199e438.1497004220.git.Richard.Earnshaw@arm.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.7.4" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.140.101.70 X-SW-Source: 2017-06/txt/msg00618.txt.bz2 This is a multi-part message in MIME format. --------------2.7.4 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: quoted-printable Content-length: 1840 [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=3Dcortex-m7/-mfpu=3Dfpv5-d16/-mhard-float to -march=3Darmv7e-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(-) --------------2.7.4 Content-Type: text/x-patch; name="0023-arm-rtems-Update-t-rtems-for-new-option-framework.patch" Content-Disposition: attachment; filename="0023-arm-rtems-Update-t-rtems-for-new-option-framework.patch" Content-Transfer-Encoding: quoted-printable Content-length: 2824 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 =20 -MULTILIB_OPTIONS =3D mbig-endian mthumb march=3Darmv6-m/march=3Darmv7-a/m= arch=3Darmv7-r/march=3Darmv7-m/mcpu=3Dcortex-m7 mfpu=3Dneon/mfpu=3Dvfp/mfpu= =3Dvfpv3-d16/mfpu=3Dfpv4-sp-d16/mfpu=3Dfpv5-d16 mfloat-abi=3Dhard -MULTILIB_DIRNAMES =3D eb thumb armv6-m armv7-a armv7-r armv7-m cortex-m7 n= eon vfp vfpv3-d16 fpv4-sp-d16 fpv5-d16 hard +# Reset all MULTILIB variables + +MULTILIB_OPTIONS =3D +MULTILIB_DIRNAMES =3D +MULTILIB_EXCEPTIONS =3D +MULTILIB_REUSE =3D +MULTILIB_MATCHES =3D +MULTILIB_REQUIRED =3D =20 # Enumeration of multilibs =20 -MULTILIB_EXCEPTIONS =3D - -MULTILIB_REQUIRED =3D -MULTILIB_REQUIRED +=3D mbig-endian/mthumb/march=3Darmv7-r/mfpu=3Dvfpv3-d16= /mfloat-abi=3Dhard -MULTILIB_REQUIRED +=3D mbig-endian/mthumb/march=3Darmv7-r -MULTILIB_REQUIRED +=3D mfpu=3Dvfp/mfloat-abi=3Dhard -MULTILIB_REQUIRED +=3D mthumb/march=3Darmv6-m -MULTILIB_REQUIRED +=3D mthumb/march=3Darmv7-a/mfpu=3Dneon/mfloat-abi=3Dhard -MULTILIB_REQUIRED +=3D mthumb/march=3Darmv7-a -MULTILIB_REQUIRED +=3D mthumb/march=3Darmv7-r/mfpu=3Dvfpv3-d16/mfloat-abi= =3Dhard -MULTILIB_REQUIRED +=3D mthumb/march=3Darmv7-r -MULTILIB_REQUIRED +=3D mthumb/march=3Darmv7-m/mfpu=3Dfpv4-sp-d16/mfloat-ab= i=3Dhard -MULTILIB_REQUIRED +=3D mthumb/mcpu=3Dcortex-m7/mfpu=3Dfpv5-d16/mfloat-abi= =3Dhard -MULTILIB_REQUIRED +=3D mthumb/march=3Darmv7-m -MULTILIB_REQUIRED +=3D mthumb +MULTILIB_OPTIONS +=3D mbig-endian +MULTILIB_DIRNAMES +=3D eb + +MULTILIB_OPTIONS +=3D mthumb +MULTILIB_DIRNAMES +=3D thumb + +MULTILIB_OPTIONS +=3D march=3Darmv5te+fp/march=3Darmv6-m/march=3Darmv7-a/m= arch=3Darmv7-a+simd/march=3Darmv7-r/march=3Darmv7-r+fp/march=3Darmv7-m/marc= h=3Darmv7e-m+fp/march=3Darmv7e-m+fp.dp +MULTILIB_DIRNAMES +=3D 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 +=3D mfloat-abi=3Dhard +MULTILIB_DIRNAMES +=3D hard + +MULTILIB_REQUIRED +=3D mbig-endian/mthumb/march=3Darmv7-r+fp/mfloat-abi=3D= hard +MULTILIB_REQUIRED +=3D mbig-endian/mthumb/march=3Darmv7-r +MULTILIB_REQUIRED +=3D march=3Darmv5te+fp/mfloat-abi=3Dhard +MULTILIB_REQUIRED +=3D mthumb/march=3Darmv6-m +MULTILIB_REQUIRED +=3D mthumb/march=3Darmv7-a+simd/mfloat-abi=3Dhard +MULTILIB_REQUIRED +=3D mthumb/march=3Darmv7-a +MULTILIB_REQUIRED +=3D mthumb/march=3Darmv7-r+fp/mfloat-abi=3Dhard +MULTILIB_REQUIRED +=3D mthumb/march=3Darmv7-r +MULTILIB_REQUIRED +=3D mthumb/march=3Darmv7e-m+fp/mfloat-abi=3Dhard +MULTILIB_REQUIRED +=3D mthumb/march=3Darmv7e-m+fp.dp/mfloat-abi=3Dhard +MULTILIB_REQUIRED +=3D mthumb/march=3Darmv7-m +MULTILIB_REQUIRED +=3D mthumb --------------2.7.4--