From: Matthew Gretton-Dann Date: Mon, 27 Feb 2012 11:26:49 +0000 (+0000) Subject: revert: arm-cores.def (cortex-a15): Use cortex_a15_tune for tuning parameters. X-Git-Tag: releases/gcc-4.7.0~197 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2d6bcce98d1960d52d7dbcb5344df824b07ecce;p=thirdparty%2Fgcc.git revert: arm-cores.def (cortex-a15): Use cortex_a15_tune for tuning parameters. Revert: 2012-01-09 Matthew Gretton-Dann * 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 fdd225cfd6ce..591749392ca4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2012-02-27 Matthew Gretton-Dann + + Revert: + 2012-01-09 Matthew Gretton-Dann + * 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 * 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 b0bd17237c6b..80609e0850d2 100644 --- 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 7f0dc6b4aa32..b58877bfaa04 100644 --- 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,