revert: arm-cores.def (cortex-a15): Use cortex_a15_tune for tuning parameters.

	Revert:
	2012-01-09  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
	* gcc/config/arm/arm-cores.def (cortex-a15): Use cortex_a15_tune for
	tuning parameters.
	* gcc/config/arm/arm.c (arm_cortex_a15_tune): New static variable.

From-SVN: r184596

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fdd225cfd6cee1c72ca29847e362d533e8c2ed4b..591749392ca4c98a64d6b8936bec83ef7ad131bd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-27  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+       Revert:
+       2012-01-09  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+       * config/arm/arm-cores.def (cortex-a15): Use cortex_a15_tune for
+       tuning parameters.
+       * config/arm/arm.c (arm_cortex_a15_tune): New static variable.
+
 2012-02-27  Oleg Endo  <olegendo@gcc.gnu.org>
 
        * config/sh/sh.h: Delete dead GO_IF_LEGITIMATE_INDEX macro.

diff --git a/gcc/config/arm/arm-cores.def b/gcc/config/arm/arm-cores.def
index b0bd17237c6b096df3a573a26eed295818a8ed41..80609e0850d2c8a32c05142476510d4a617d2fe3 100644 (file)
--- a/gcc/config/arm/arm-cores.def
+++ b/gcc/config/arm/arm-cores.def
@@ -129,7 +129,7 @@ ARM_CORE("cortex-a5",         cortexa5,     7A,                              FL_LDSCHED, cortex_a5)
 ARM_CORE("cortex-a7",    cortexa7,     7A,                              FL_LDSCHED | FL_THUMB_DIV | FL_ARM_DIV, cortex)
 ARM_CORE("cortex-a8",    cortexa8,     7A,                              FL_LDSCHED, cortex)
 ARM_CORE("cortex-a9",    cortexa9,     7A,                              FL_LDSCHED, cortex_a9)
-ARM_CORE("cortex-a15",   cortexa15,    7A,                              FL_LDSCHED | FL_THUMB_DIV | FL_ARM_DIV, cortex_a15)
+ARM_CORE("cortex-a15",   cortexa15,    7A,                              FL_LDSCHED | FL_THUMB_DIV | FL_ARM_DIV, cortex)
 ARM_CORE("cortex-r4",    cortexr4,     7R,                              FL_LDSCHED, cortex)
 ARM_CORE("cortex-r4f",   cortexr4f,    7R,                              FL_LDSCHED, cortex)
 ARM_CORE("cortex-r5",    cortexr5,     7R,                              FL_LDSCHED | FL_ARM_DIV, cortex)

diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 7f0dc6b4aa3280eda3c3fe1c2edcfca8c02d7d7a..b58877bfaa0439f822abb031de3cd4def7f35ec6 100644 (file)
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -968,17 +968,6 @@ const struct tune_params arm_cortex_a9_tune =
   arm_default_branch_cost
 };
 
-const struct tune_params arm_cortex_a15_tune =
-{
-  arm_9e_rtx_costs,
-  NULL,
-  1,                                           /* Constant limit.  */
-  1,                                           /* Max cond insns.  */
-  ARM_PREFETCH_NOT_BENEFICIAL,                 /* TODO: Calculate correct values.  */
-  false,                                       /* Prefer constant pool.  */
-  arm_cortex_a5_branch_cost
-};
-
 const struct tune_params arm_fa726te_tune =
 {
   arm_9e_rtx_costs,