[AArch64] Fix selection of default CPU options at configure-time

* config.gcc (aarch64*-*-*): Use ISA flags from aarch64-arches.def.
	Do not define target_cpu_default2 to generic.
	* config/aarch64/aarch64.h (TARGET_CPU_DEFAULT): Use generic cpu.
	* config/aarch64/aarch64.c (aarch64_override_options): Update comment.
	* config/aarch64/aarch64-arches.def (armv8-a): Use generic cpu.

From-SVN: r208508
This commit is contained in:
Kyrylo Tkachov 2014-03-12 10:13:07 +00:00 committed by Kyrylo Tkachov
parent c888139c9a
commit a3cd024676
5 changed files with 18 additions and 7 deletions

View File

@ -1,3 +1,11 @@
2014-03-12 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
* config.gcc (aarch64*-*-*): Use ISA flags from aarch64-arches.def.
Do not define target_cpu_default2 to generic.
* config/aarch64/aarch64.h (TARGET_CPU_DEFAULT): Use generic cpu.
* config/aarch64/aarch64.c (aarch64_override_options): Update comment.
* config/aarch64/aarch64-arches.def (armv8-a): Use generic cpu.
2014-03-12 Jakub Jelinek <jakub@redhat.com>
Marc Glisse <marc.glisse@inria.fr>

View File

@ -3396,6 +3396,11 @@ case "${target}" in
${srcdir}/config/aarch64/$def | \
sed -e 's/^[^,]*,[ ]*//' | \
sed -e 's/,.*$//'`
# Extract the architecture flags from aarch64-arches.def
ext_mask=`grep "^$pattern(\"$base_val\"," \
${srcdir}/config/aarch64/$def | \
sed -e 's/)$//' | \
sed -e 's/^.*,//'`
else
base_id=`grep "^$pattern(\"$base_val\"," \
${srcdir}/config/aarch64/$def | \
@ -4057,10 +4062,8 @@ esac
target_cpu_default2=
case ${target} in
aarch64*-*-*)
if test x$target_cpu_cname = x
if test x"$target_cpu_cname" != x
then
target_cpu_default2=TARGET_CPU_generic
else
target_cpu_default2=$target_cpu_cname
fi
;;

View File

@ -26,4 +26,4 @@
this architecture. ARCH is the architecture revision. FLAGS are
the flags implied by the architecture. */
AARCH64_ARCH("armv8-a", cortexa53, 8, AARCH64_FL_FOR_ARCH8)
AARCH64_ARCH("armv8-a", generic, 8, AARCH64_FL_FOR_ARCH8)

View File

@ -5250,7 +5250,7 @@ aarch64_override_options (void)
/* If the user did not specify a processor, choose the default
one for them. This will be the CPU set during configuration using
--with-cpu, otherwise it is "cortex-a53". */
--with-cpu, otherwise it is "generic". */
if (!selected_cpu)
{
selected_cpu = &all_cores[TARGET_CPU_DEFAULT & 0x3f];

View File

@ -475,10 +475,10 @@ enum target_cpus
TARGET_CPU_generic
};
/* If there is no CPU defined at configure, use "cortex-a53" as default. */
/* If there is no CPU defined at configure, use generic as default. */
#ifndef TARGET_CPU_DEFAULT
#define TARGET_CPU_DEFAULT \
(TARGET_CPU_cortexa53 | (AARCH64_CPU_DEFAULT_FLAGS << 6))
(TARGET_CPU_generic | (AARCH64_CPU_DEFAULT_FLAGS << 6))
#endif
/* The processor for which instructions should be scheduled. */