From: mgretton Date: Mon, 27 Feb 2012 11:26:49 +0000 (+0000) Subject: Revert: X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=347b9640bb7845af7d810d8affc6a265ad7af9d0 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@184596 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fdd225cfd6c..591749392ca 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 b0bd17237c6..80609e0850d 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 7f0dc6b4aa3..b58877bfaa0 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,