Andrew Pinski <andrew.pin...@caviumnetworks.com> writes:
> +(define_insn_reservation "octeon_imul3_o2" 6
> +  (and (eq_attr "cpu" "octeon2")
> +       (eq_attr "type" "imul3,pop,clz"))
> +  " octeon_pipe1 + octeon_mult")

Excess space before ".

> Index: config/mips/mips.h
> ===================================================================
> --- config/mips/mips.h        (revision 182183)
> +++ config/mips/mips.h        (working copy)
> @@ -250,7 +252,9 @@ struct mips_cpu_info {
>  #define TUNE_MIPS6000               (mips_tune == PROCESSOR_R6000)
>  #define TUNE_MIPS7000               (mips_tune == PROCESSOR_R7000)
>  #define TUNE_MIPS9000               (mips_tune == PROCESSOR_R9000)
> -#define TUNE_OCTEON              (mips_tune == PROCESSOR_OCTEON)
> +#define TUNE_OCTEON              (mips_tune == PROCESSOR_OCTEON      \
> +                                  || mips_tune == PROCESSOR_OCTEON2)
> +#define TUNE_OCTEON2             (mips_tune == PROCESSOR_OCTEON2)
>  #define TUNE_SB1                    (mips_tune == PROCESSOR_SB1              
> \
>                                    || mips_tune == PROCESSOR_SB1A)

Do any follow-on patches need TUNE_OCTEON2?  If not, let's leave it out
for now.  (I realise they'll use TARGET_OCTEON2.)

OK for 4.7 with those (trivial) changes.

Thanks,
Richard

Reply via email to