[17/30,arm] Make 'auto' the default FPU selection option.

Message ID	4504c2d65548dd926cb7755ce992399abac68fe3.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-455540-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=dJa/KPIb1veRYQXlLxqzWHCNL+DhGkFtIuLpgxEL3znoFClnl0VII /V4k/PVnRLOirB9lk7Q6zwWhTKJ+yADRvXhx9ZIEadt3FgDFJtnslvN29YouPkl8 jIRV2wHwI97PbMSgyAEubAU+uRcEYU/juGH2DLLYA0SFcyHfi74sSA= 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> Subject: [PATCH 17/30] [arm] Make 'auto' the default FPU selection option. Date: Fri, 9 Jun 2017 13:53:46 +0100 Message-Id: <4504c2d65548dd926cb7755ce992399abac68fe3.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

4504c2d65548dd926cb7755ce992399abac68fe3.1497004220.git.Richard.Earnshaw@arm.com

State

New

Headers

Received-SPF: pass (google.com: domain of
	gcc-patches-return-455540-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=dJa/KPIb1veRYQXlLxqzWHCNL+DhGkFtIuLpgxEL3znoFClnl0VII
	/V4k/PVnRLOirB9lk7Q6zwWhTKJ+yADRvXhx9ZIEadt3FgDFJtnslvN29YouPkl8
	jIRV2wHwI97PbMSgyAEubAU+uRcEYU/juGH2DLLYA0SFcyHfi74sSA=
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>
Subject: [PATCH 17/30] [arm] Make 'auto' the default FPU selection option.
Date: Fri,  9 Jun 2017 13:53:46 +0100
Message-Id: <4504c2d65548dd926cb7755ce992399abac68fe3.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

Finally, we can make 'auto' the default choice for the FPU option.  It's
still possible to override this during configure, but we will eventually
deprecate that, moving to the new cpu/architecture selection mechanism.

	* config/arm/arm.h (FPUTYPE_AUTO): Define.
	* config/arm/arm.c (arm_option_override): Use FPUTYPE_AUTO if the
	fpu is not specified by the user/command-line.
	* config/arm/bpabi.h (FPUTYPE_DEFAULT): Delete.
	* config/arm/netbsd-elf.h (FPUTYPE_DEFAULT): Delete.
	* config/arm/linux-elf.h (FPUTYPE_DEFAULT): Delete.
	* config/arm/vxworks.h (FPUTYPE_DEFAULT): Delete.
	* common/config/arm/arm-common.c (arm_canon_arch_option): Use
	FPUTYPE_AUTO insted of FPUTYPE_DEFAULT.
---
 gcc/common/config/arm/arm-common.c | 2 +-
 gcc/config/arm/arm.c               | 9 +--------
 gcc/config/arm/arm.h               | 3 +++
 gcc/config/arm/bpabi.h             | 4 ----
 gcc/config/arm/linux-elf.h         | 3 ---
 gcc/config/arm/netbsd-elf.h        | 4 ----
 gcc/config/arm/vxworks.h           | 2 --
 7 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/gcc/common/config/arm/arm-common.c b/gcc/common/config/arm/arm-common.c
index c4ab482..2188b77 100644
--- a/gcc/common/config/arm/arm-common.c
+++ b/gcc/common/config/arm/arm-common.c
@@ -520,7 +520,7 @@  arm_canon_arch_option (int argc, const char **argv)
   gcc_assert (cpu || arch);
 
   if (!fpu)
-    fpu = FPUTYPE_DEFAULT;
+    fpu = FPUTYPE_AUTO;
 
   if (!abi)
     {
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 97d2fbd..af02800 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -3316,17 +3316,10 @@  arm_option_override (void)
 
   if (!global_options_set.x_arm_fpu_index)
     {
-      const char *target_fpu_name;
       bool ok;
       int fpu_index;
 
-#ifdef FPUTYPE_DEFAULT
-      target_fpu_name = FPUTYPE_DEFAULT;
-#else
-      target_fpu_name = "vfp";
-#endif
-
-      ok = opt_enum_arg_to_value (OPT_mfpu_, target_fpu_name, &fpu_index,
+      ok = opt_enum_arg_to_value (OPT_mfpu_, FPUTYPE_AUTO, &fpu_index,
 				  CL_TARGET);
       gcc_assert (ok);
       arm_fpu_index = (enum fpu_type) fpu_index;
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 570bcd7..9153d44 100644
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -2220,6 +2220,9 @@  extern int making_const_table;
   (TARGET_NEON ? (TARGET_ARM_FP & (0xff ^ 0x08)) \
 	       : 0)
 
+/* Name of the automatic fpu-selection option.  */
+#define FPUTYPE_AUTO "auto"
+
 /* The maximum number of parallel loads or stores we support in an ldm/stm
    instruction.  */
 #define MAX_LDM_STM_OPS 4
diff --git a/gcc/config/arm/bpabi.h b/gcc/config/arm/bpabi.h
index 56a4a47..64db83c 100644
--- a/gcc/config/arm/bpabi.h
+++ b/gcc/config/arm/bpabi.h
@@ -33,10 +33,6 @@ 
 #undef ARM_UNWIND_INFO
 #define ARM_UNWIND_INFO 1
 
-/* Section 4.1 of the AAPCS requires the use of VFP format.  */
-#undef  FPUTYPE_DEFAULT
-#define FPUTYPE_DEFAULT "vfp"
-
 /* TARGET_BIG_ENDIAN_DEFAULT is set in
    config.gcc for big endian configurations.  */
 #if TARGET_BIG_ENDIAN_DEFAULT
diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
index 3d62367..cd4fc3b 100644
--- a/gcc/config/arm/linux-elf.h
+++ b/gcc/config/arm/linux-elf.h
@@ -83,9 +83,6 @@ 
     }						\
   while (0)
 
-#undef  FPUTYPE_DEFAULT
-#define FPUTYPE_DEFAULT "vfp"
-
 /* Call the function profiler with a given profile label.  */
 #undef  ARM_FUNCTION_PROFILER
 #define ARM_FUNCTION_PROFILER(STREAM, LABELNO)  			\
diff --git a/gcc/config/arm/netbsd-elf.h b/gcc/config/arm/netbsd-elf.h
index 8811af7..02ff316 100644
--- a/gcc/config/arm/netbsd-elf.h
+++ b/gcc/config/arm/netbsd-elf.h
@@ -153,7 +153,3 @@  do									\
     (void) sysarch (0, &s);						\
   }									\
 while (0)
-
-#undef FPUTYPE_DEFAULT
-#define FPUTYPE_DEFAULT "vfp"
-
diff --git a/gcc/config/arm/vxworks.h b/gcc/config/arm/vxworks.h
index 107863b..9af37c7 100644
--- a/gcc/config/arm/vxworks.h
+++ b/gcc/config/arm/vxworks.h
@@ -92,8 +92,6 @@  see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 /* There is no default multilib.  */
 #undef MULTILIB_DEFAULTS
 
-#define FPUTYPE_DEFAULT "vfp"
-
 #undef FUNCTION_PROFILER
 #define FUNCTION_PROFILER VXWORKS_FUNCTION_PROFILER

[17/30,arm] Make 'auto' the default FPU selection option.

Commit Message

Patch