decl.c, [...]: Remove redundant enum from machine_mode.

gcc/ada/
	* gcc-interface/decl.c, gcc-interface/gigi.h, gcc-interface/misc.c,
	gcc-interface/trans.c, gcc-interface/utils.c, gcc-interface/utils2.c:
	Remove redundant enum from machine_mode.

gcc/c-family/
	* c-common.c, c-common.h, c-cppbuiltin.c, c-lex.c: Remove redundant
	enum from machine_mode.

gcc/c/
	* c-decl.c, c-tree.h, c-typeck.c: Remove redundant enum from
	machine_mode.

gcc/cp/
	* constexpr.c: Remove redundant enum from machine_mode.

gcc/fortran/
	* trans-types.c, trans-types.h: Remove redundant enum from
	machine_mode.

gcc/go/
	* go-lang.c: Remove redundant enum from machine_mode.

gcc/java/
	* builtins.c, java-tree.h, typeck.c: Remove redundant enum from
	machine_mode.

gcc/lto/
	* lto-lang.c: Remove redundant enum from machine_mode.

gcc/
	* addresses.h, alias.c, asan.c, auto-inc-dec.c, bt-load.c, builtins.c,
	builtins.h, caller-save.c, calls.c, calls.h, cfgexpand.c, cfgloop.h,
	cfgrtl.c, combine.c, compare-elim.c, config/aarch64/aarch64-builtins.c,
	config/aarch64/aarch64-protos.h, config/aarch64/aarch64-simd.md,
	config/aarch64/aarch64.c, config/aarch64/aarch64.h,
	config/aarch64/aarch64.md, config/alpha/alpha-protos.h,
	config/alpha/alpha.c, config/arc/arc-protos.h, config/arc/arc.c,
	config/arc/arc.h, config/arc/predicates.md,
	config/arm/aarch-common-protos.h, config/arm/aarch-common.c,
	config/arm/arm-protos.h, config/arm/arm.c, config/arm/arm.h,
	config/arm/arm.md, config/arm/neon.md, config/arm/thumb2.md,
	config/avr/avr-log.c, config/avr/avr-protos.h, config/avr/avr.c,
	config/avr/avr.md, config/bfin/bfin-protos.h, config/bfin/bfin.c,
	config/c6x/c6x-protos.h, config/c6x/c6x.c, config/c6x/c6x.md,
	config/cr16/cr16-protos.h, config/cr16/cr16.c,
	config/cris/cris-protos.h, config/cris/cris.c, config/cris/cris.md,
	config/darwin-protos.h, config/darwin.c,
	config/epiphany/epiphany-protos.h, config/epiphany/epiphany.c,
	config/epiphany/epiphany.md, config/fr30/fr30.c,
	config/frv/frv-protos.h, config/frv/frv.c, config/frv/predicates.md,
	config/h8300/h8300-protos.h, config/h8300/h8300.c,
	config/i386/i386-builtin-types.awk, config/i386/i386-protos.h,
	config/i386/i386.c, config/i386/i386.md, config/i386/predicates.md,
	config/i386/sse.md, config/i386/sync.md, config/ia64/ia64-protos.h,
	config/ia64/ia64.c, config/iq2000/iq2000-protos.h,
	config/iq2000/iq2000.c, config/iq2000/iq2000.md,
	config/lm32/lm32-protos.h, config/lm32/lm32.c,
	config/m32c/m32c-protos.h, config/m32c/m32c.c,
	config/m32r/m32r-protos.h, config/m32r/m32r.c,
	config/m68k/m68k-protos.h, config/m68k/m68k.c,
	config/mcore/mcore-protos.h, config/mcore/mcore.c,
	config/mcore/mcore.md, config/mep/mep-protos.h, config/mep/mep.c,
	config/microblaze/microblaze-protos.h, config/microblaze/microblaze.c,
	config/mips/mips-protos.h, config/mips/mips.c,
	config/mmix/mmix-protos.h, config/mmix/mmix.c,
	config/mn10300/mn10300-protos.h, config/mn10300/mn10300.c,
	config/moxie/moxie.c, config/msp430/msp430-protos.h,
	config/msp430/msp430.c, config/nds32/nds32-cost.c,
	config/nds32/nds32-intrinsic.c, config/nds32/nds32-md-auxiliary.c,
	config/nds32/nds32-protos.h, config/nds32/nds32.c,
	config/nios2/nios2-protos.h, config/nios2/nios2.c,
	config/pa/pa-protos.h, config/pa/pa.c, config/pdp11/pdp11-protos.h,
	config/pdp11/pdp11.c, config/rl78/rl78-protos.h, config/rl78/rl78.c,
	config/rs6000/altivec.md, config/rs6000/rs6000-c.c,
	config/rs6000/rs6000-protos.h, config/rs6000/rs6000.c,
	config/rs6000/rs6000.h, config/rx/rx-protos.h, config/rx/rx.c,
	config/s390/predicates.md, config/s390/s390-protos.h,
	config/s390/s390.c, config/s390/s390.h, config/s390/s390.md,
	config/sh/predicates.md, config/sh/sh-protos.h, config/sh/sh.c,
	config/sh/sh.md, config/sparc/predicates.md,
	config/sparc/sparc-protos.h, config/sparc/sparc.c,
	config/sparc/sparc.md, config/spu/spu-protos.h, config/spu/spu.c,
	config/stormy16/stormy16-protos.h, config/stormy16/stormy16.c,
	config/tilegx/tilegx-protos.h, config/tilegx/tilegx.c,
	config/tilegx/tilegx.md, config/tilepro/tilepro-protos.h,
	config/tilepro/tilepro.c, config/v850/v850-protos.h,
	config/v850/v850.c, config/v850/v850.md, config/vax/vax-protos.h,
	config/vax/vax.c, config/vms/vms-c.c, config/xtensa/xtensa-protos.h,
	config/xtensa/xtensa.c, coverage.c, cprop.c, cse.c, cselib.c, cselib.h,
	dbxout.c, ddg.c, df-problems.c, dfp.c, dfp.h, doc/md.texi,
	doc/rtl.texi, doc/tm.texi, doc/tm.texi.in, dojump.c, dse.c,
	dwarf2cfi.c, dwarf2out.c, dwarf2out.h, emit-rtl.c, emit-rtl.h,
	except.c, explow.c, expmed.c, expmed.h, expr.c, expr.h, final.c,
	fixed-value.c, fixed-value.h, fold-const.c, function.c, function.h,
	fwprop.c, gcse.c, gengenrtl.c, genmodes.c, genopinit.c, genoutput.c,
	genpreds.c, genrecog.c, gensupport.c, gimple-ssa-strength-reduction.c,
	graphite-clast-to-gimple.c, haifa-sched.c, hooks.c, hooks.h, ifcvt.c,
	internal-fn.c, ira-build.c, ira-color.c, ira-conflicts.c, ira-costs.c,
	ira-emit.c, ira-int.h, ira-lives.c, ira.c, ira.h, jump.c, langhooks.h,
	libfuncs.h, lists.c, loop-doloop.c, loop-invariant.c, loop-iv.c,
	loop-unroll.c, lower-subreg.c, lower-subreg.h, lra-assigns.c,
	lra-constraints.c, lra-eliminations.c, lra-int.h, lra-lives.c,
	lra-spills.c, lra.c, lra.h, machmode.h, omp-low.c, optabs.c, optabs.h,
	output.h, postreload.c, print-tree.c, read-rtl.c, real.c, real.h,
	recog.c, recog.h, ree.c, reg-stack.c, regcprop.c, reginfo.c,
	regrename.c, regs.h, reload.c, reload.h, reload1.c, rtl.c, rtl.h,
	rtlanal.c, rtlhash.c, rtlhooks-def.h, rtlhooks.c, sched-deps.c,
	sel-sched-dump.c, sel-sched-ir.c, sel-sched-ir.h, sel-sched.c,
	simplify-rtx.c, stmt.c, stor-layout.c, stor-layout.h, target.def,
	targhooks.c, targhooks.h, tree-affine.c, tree-call-cdce.c,
	tree-complex.c, tree-data-ref.c, tree-dfa.c, tree-if-conv.c,
	tree-inline.c, tree-outof-ssa.c, tree-scalar-evolution.c,
	tree-ssa-address.c, tree-ssa-ccp.c, tree-ssa-loop-ivopts.c,
	tree-ssa-loop-ivopts.h, tree-ssa-loop-manip.c,
	tree-ssa-loop-prefetch.c, tree-ssa-math-opts.c, tree-ssa-reassoc.c,
	tree-ssa-sccvn.c, tree-streamer-in.c, tree-switch-conversion.c,
	tree-vect-data-refs.c, tree-vect-generic.c, tree-vect-loop.c,
	tree-vect-patterns.c, tree-vect-slp.c, tree-vect-stmts.c,
	tree-vrp.c, tree.c, tree.h, tsan.c, ubsan.c, valtrack.c,
	var-tracking.c, varasm.c: Remove redundant enum from
	machine_mode.
gcc/
	* gengtype.c (main): Treat machine_mode as a scalar typedef.
	* genmodes.c (emit_insn_modes_h): Hide inline functions if
	USED_FOR_TARGET.

From-SVN: r216834

1 files changed, 47 insertions, 47 deletions

diff --git a/gcc/expmed.h b/gcc/expmed.h
index 4d01d1f..446341e 100644
--- a/gcc/expmed.h
+++ b/gcc/expmed.h
@@ -101,7 +101,7 @@ struct alg_hash_entry {
   unsigned HOST_WIDE_INT t;
 
   /* The mode in which we are multiplying something by T.  */
-  enum machine_mode mode;
+  machine_mode mode;
 
   /* The best multiplication algorithm for t.  */
   enum alg_code alg;
@@ -214,7 +214,7 @@ set_alg_hash_used_p (bool usedp)
 /* Compute an index into the cost arrays by mode class.  */
 
 static inline int
-expmed_mode_index (enum machine_mode mode)
+expmed_mode_index (machine_mode mode)
 {
   switch (GET_MODE_CLASS (mode))
     {
@@ -244,7 +244,7 @@ expmed_mode_index (enum machine_mode mode)
 
 static inline bool *
 expmed_op_cheap_ptr (struct expmed_op_cheap *eoc, bool speed,
-		     enum machine_mode mode)
+		     machine_mode mode)
 {
   int idx = expmed_mode_index (mode);
   return &eoc->cheap[speed][idx];
@@ -255,7 +255,7 @@ expmed_op_cheap_ptr (struct expmed_op_cheap *eoc, bool speed,
 
 static inline int *
 expmed_op_cost_ptr (struct expmed_op_costs *costs, bool speed,
-		    enum machine_mode mode)
+		    machine_mode mode)
 {
   int idx = expmed_mode_index (mode);
   return &costs->cost[speed][idx];
@@ -264,7 +264,7 @@ expmed_op_cost_ptr (struct expmed_op_costs *costs, bool speed,
 /* Subroutine of {set_,}sdiv_pow2_cheap.  Not to be used otherwise.  */
 
 static inline bool *
-sdiv_pow2_cheap_ptr (bool speed, enum machine_mode mode)
+sdiv_pow2_cheap_ptr (bool speed, machine_mode mode)
 {
   return expmed_op_cheap_ptr (&this_target_expmed->x_sdiv_pow2_cheap,
 			      speed, mode);
@@ -274,7 +274,7 @@ sdiv_pow2_cheap_ptr (bool speed, enum machine_mode mode)
    when optimizing for SPEED.  */
 
 static inline void
-set_sdiv_pow2_cheap (bool speed, enum machine_mode mode, bool cheap_p)
+set_sdiv_pow2_cheap (bool speed, machine_mode mode, bool cheap_p)
 {
   *sdiv_pow2_cheap_ptr (speed, mode) = cheap_p;
 }
@@ -283,7 +283,7 @@ set_sdiv_pow2_cheap (bool speed, enum machine_mode mode, bool cheap_p)
    when optimizing for SPEED.  */
 
 static inline bool
-sdiv_pow2_cheap (bool speed, enum machine_mode mode)
+sdiv_pow2_cheap (bool speed, machine_mode mode)
 {
   return *sdiv_pow2_cheap_ptr (speed, mode);
 }
@@ -291,7 +291,7 @@ sdiv_pow2_cheap (bool speed, enum machine_mode mode)
 /* Subroutine of {set_,}smod_pow2_cheap.  Not to be used otherwise.  */
 
 static inline bool *
-smod_pow2_cheap_ptr (bool speed, enum machine_mode mode)
+smod_pow2_cheap_ptr (bool speed, machine_mode mode)
 {
   return expmed_op_cheap_ptr (&this_target_expmed->x_smod_pow2_cheap,
 			      speed, mode);
@@ -301,7 +301,7 @@ smod_pow2_cheap_ptr (bool speed, enum machine_mode mode)
    optimizing for SPEED.  */
 
 static inline void
-set_smod_pow2_cheap (bool speed, enum machine_mode mode, bool cheap)
+set_smod_pow2_cheap (bool speed, machine_mode mode, bool cheap)
 {
   *smod_pow2_cheap_ptr (speed, mode) = cheap;
 }
@@ -310,7 +310,7 @@ set_smod_pow2_cheap (bool speed, enum machine_mode mode, bool cheap)
    when optimizing for SPEED.  */
 
 static inline bool
-smod_pow2_cheap (bool speed, enum machine_mode mode)
+smod_pow2_cheap (bool speed, machine_mode mode)
 {
   return *smod_pow2_cheap_ptr (speed, mode);
 }
@@ -342,7 +342,7 @@ zero_cost (bool speed)
 /* Subroutine of {set_,}add_cost.  Not to be used otherwise.  */
 
 static inline int *
-add_cost_ptr (bool speed, enum machine_mode mode)
+add_cost_ptr (bool speed, machine_mode mode)
 {
   return expmed_op_cost_ptr (&this_target_expmed->x_add_cost, speed, mode);
 }
@@ -350,7 +350,7 @@ add_cost_ptr (bool speed, enum machine_mode mode)
 /* Set the COST of computing an add in MODE when optimizing for SPEED.  */
 
 static inline void
-set_add_cost (bool speed, enum machine_mode mode, int cost)
+set_add_cost (bool speed, machine_mode mode, int cost)
 {
   *add_cost_ptr (speed, mode) = cost;
 }
@@ -358,7 +358,7 @@ set_add_cost (bool speed, enum machine_mode mode, int cost)
 /* Return the cost of computing an add in MODE when optimizing for SPEED.  */
 
 static inline int
-add_cost (bool speed, enum machine_mode mode)
+add_cost (bool speed, machine_mode mode)
 {
   return *add_cost_ptr (speed, mode);
 }
@@ -366,7 +366,7 @@ add_cost (bool speed, enum machine_mode mode)
 /* Subroutine of {set_,}neg_cost.  Not to be used otherwise.  */
 
 static inline int *
-neg_cost_ptr (bool speed, enum machine_mode mode)
+neg_cost_ptr (bool speed, machine_mode mode)
 {
   return expmed_op_cost_ptr (&this_target_expmed->x_neg_cost, speed, mode);
 }
@@ -374,7 +374,7 @@ neg_cost_ptr (bool speed, enum machine_mode mode)
 /* Set the COST of computing a negation in MODE when optimizing for SPEED.  */
 
 static inline void
-set_neg_cost (bool speed, enum machine_mode mode, int cost)
+set_neg_cost (bool speed, machine_mode mode, int cost)
 {
   *neg_cost_ptr (speed, mode) = cost;
 }
@@ -383,7 +383,7 @@ set_neg_cost (bool speed, enum machine_mode mode, int cost)
    SPEED.  */
 
 static inline int
-neg_cost (bool speed, enum machine_mode mode)
+neg_cost (bool speed, machine_mode mode)
 {
   return *neg_cost_ptr (speed, mode);
 }
@@ -391,7 +391,7 @@ neg_cost (bool speed, enum machine_mode mode)
 /* Subroutine of {set_,}shift_cost.  Not to be used otherwise.  */
 
 static inline int *
-shift_cost_ptr (bool speed, enum machine_mode mode, int bits)
+shift_cost_ptr (bool speed, machine_mode mode, int bits)
 {
   return expmed_op_cost_ptr (&this_target_expmed->x_shift_cost[bits],
 			     speed, mode);
@@ -400,7 +400,7 @@ shift_cost_ptr (bool speed, enum machine_mode mode, int bits)
 /* Set the COST of doing a shift in MODE by BITS when optimizing for SPEED.  */
 
 static inline void
-set_shift_cost (bool speed, enum machine_mode mode, int bits, int cost)
+set_shift_cost (bool speed, machine_mode mode, int bits, int cost)
 {
   *shift_cost_ptr (speed, mode, bits) = cost;
 }
@@ -409,7 +409,7 @@ set_shift_cost (bool speed, enum machine_mode mode, int bits, int cost)
    SPEED.  */
 
 static inline int
-shift_cost (bool speed, enum machine_mode mode, int bits)
+shift_cost (bool speed, machine_mode mode, int bits)
 {
   return *shift_cost_ptr (speed, mode, bits);
 }
@@ -417,7 +417,7 @@ shift_cost (bool speed, enum machine_mode mode, int bits)
 /* Subroutine of {set_,}shiftadd_cost.  Not to be used otherwise.  */
 
 static inline int *
-shiftadd_cost_ptr (bool speed, enum machine_mode mode, int bits)
+shiftadd_cost_ptr (bool speed, machine_mode mode, int bits)
 {
   return expmed_op_cost_ptr (&this_target_expmed->x_shiftadd_cost[bits],
 			     speed, mode);
@@ -427,7 +427,7 @@ shiftadd_cost_ptr (bool speed, enum machine_mode mode, int bits)
    optimizing for SPEED.  */
 
 static inline void
-set_shiftadd_cost (bool speed, enum machine_mode mode, int bits, int cost)
+set_shiftadd_cost (bool speed, machine_mode mode, int bits, int cost)
 {
   *shiftadd_cost_ptr (speed, mode, bits) = cost;
 }
@@ -436,7 +436,7 @@ set_shiftadd_cost (bool speed, enum machine_mode mode, int bits, int cost)
    when optimizing for SPEED.  */
 
 static inline int
-shiftadd_cost (bool speed, enum machine_mode mode, int bits)
+shiftadd_cost (bool speed, machine_mode mode, int bits)
 {
   return *shiftadd_cost_ptr (speed, mode, bits);
 }
@@ -444,7 +444,7 @@ shiftadd_cost (bool speed, enum machine_mode mode, int bits)
 /* Subroutine of {set_,}shiftsub0_cost.  Not to be used otherwise.  */
 
 static inline int *
-shiftsub0_cost_ptr (bool speed, enum machine_mode mode, int bits)
+shiftsub0_cost_ptr (bool speed, machine_mode mode, int bits)
 {
   return expmed_op_cost_ptr (&this_target_expmed->x_shiftsub0_cost[bits],
 			     speed, mode);
@@ -454,7 +454,7 @@ shiftsub0_cost_ptr (bool speed, enum machine_mode mode, int bits)
    value when optimizing for SPEED.  */
 
 static inline void
-set_shiftsub0_cost (bool speed, enum machine_mode mode, int bits, int cost)
+set_shiftsub0_cost (bool speed, machine_mode mode, int bits, int cost)
 {
   *shiftsub0_cost_ptr (speed, mode, bits) = cost;
 }
@@ -463,7 +463,7 @@ set_shiftsub0_cost (bool speed, enum machine_mode mode, int bits, int cost)
    a value when optimizing for SPEED.  */
 
 static inline int
-shiftsub0_cost (bool speed, enum machine_mode mode, int bits)
+shiftsub0_cost (bool speed, machine_mode mode, int bits)
 {
   return *shiftsub0_cost_ptr (speed, mode, bits);
 }
@@ -471,7 +471,7 @@ shiftsub0_cost (bool speed, enum machine_mode mode, int bits)
 /* Subroutine of {set_,}shiftsub1_cost.  Not to be used otherwise.  */
 
 static inline int *
-shiftsub1_cost_ptr (bool speed, enum machine_mode mode, int bits)
+shiftsub1_cost_ptr (bool speed, machine_mode mode, int bits)
 {
   return expmed_op_cost_ptr (&this_target_expmed->x_shiftsub1_cost[bits],
 			     speed, mode);
@@ -481,7 +481,7 @@ shiftsub1_cost_ptr (bool speed, enum machine_mode mode, int bits)
    optimizing for SPEED.  */
 
 static inline void
-set_shiftsub1_cost (bool speed, enum machine_mode mode, int bits, int cost)
+set_shiftsub1_cost (bool speed, machine_mode mode, int bits, int cost)
 {
   *shiftsub1_cost_ptr (speed, mode, bits) = cost;
 }
@@ -490,7 +490,7 @@ set_shiftsub1_cost (bool speed, enum machine_mode mode, int bits, int cost)
    when optimizing for SPEED.  */
 
 static inline int
-shiftsub1_cost (bool speed, enum machine_mode mode, int bits)
+shiftsub1_cost (bool speed, machine_mode mode, int bits)
 {
   return *shiftsub1_cost_ptr (speed, mode, bits);
 }
@@ -498,7 +498,7 @@ shiftsub1_cost (bool speed, enum machine_mode mode, int bits)
 /* Subroutine of {set_,}mul_cost.  Not to be used otherwise.  */
 
 static inline int *
-mul_cost_ptr (bool speed, enum machine_mode mode)
+mul_cost_ptr (bool speed, machine_mode mode)
 {
   return expmed_op_cost_ptr (&this_target_expmed->x_mul_cost, speed, mode);
 }
@@ -507,7 +507,7 @@ mul_cost_ptr (bool speed, enum machine_mode mode)
    SPEED.  */
 
 static inline void
-set_mul_cost (bool speed, enum machine_mode mode, int cost)
+set_mul_cost (bool speed, machine_mode mode, int cost)
 {
   *mul_cost_ptr (speed, mode) = cost;
 }
@@ -516,7 +516,7 @@ set_mul_cost (bool speed, enum machine_mode mode, int cost)
    for SPEED.  */
 
 static inline int
-mul_cost (bool speed, enum machine_mode mode)
+mul_cost (bool speed, machine_mode mode)
 {
   return *mul_cost_ptr (speed, mode);
 }
@@ -524,7 +524,7 @@ mul_cost (bool speed, enum machine_mode mode)
 /* Subroutine of {set_,}sdiv_cost.  Not to be used otherwise.  */
 
 static inline int *
-sdiv_cost_ptr (bool speed, enum machine_mode mode)
+sdiv_cost_ptr (bool speed, machine_mode mode)
 {
   return expmed_op_cost_ptr (&this_target_expmed->x_sdiv_cost, speed, mode);
 }
@@ -533,7 +533,7 @@ sdiv_cost_ptr (bool speed, enum machine_mode mode)
    for SPEED.  */
 
 static inline void
-set_sdiv_cost (bool speed, enum machine_mode mode, int cost)
+set_sdiv_cost (bool speed, machine_mode mode, int cost)
 {
   *sdiv_cost_ptr (speed, mode) = cost;
 }
@@ -542,7 +542,7 @@ set_sdiv_cost (bool speed, enum machine_mode mode, int cost)
    for SPEED.  */
 
 static inline int
-sdiv_cost (bool speed, enum machine_mode mode)
+sdiv_cost (bool speed, machine_mode mode)
 {
   return *sdiv_cost_ptr (speed, mode);
 }
@@ -550,7 +550,7 @@ sdiv_cost (bool speed, enum machine_mode mode)
 /* Subroutine of {set_,}udiv_cost.  Not to be used otherwise.  */
 
 static inline int *
-udiv_cost_ptr (bool speed, enum machine_mode mode)
+udiv_cost_ptr (bool speed, machine_mode mode)
 {
   return expmed_op_cost_ptr (&this_target_expmed->x_udiv_cost, speed, mode);
 }
@@ -559,7 +559,7 @@ udiv_cost_ptr (bool speed, enum machine_mode mode)
    for SPEED.  */
 
 static inline void
-set_udiv_cost (bool speed, enum machine_mode mode, int cost)
+set_udiv_cost (bool speed, machine_mode mode, int cost)
 {
   *udiv_cost_ptr (speed, mode) = cost;
 }
@@ -568,7 +568,7 @@ set_udiv_cost (bool speed, enum machine_mode mode, int cost)
    optimizing for SPEED.  */
 
 static inline int
-udiv_cost (bool speed, enum machine_mode mode)
+udiv_cost (bool speed, machine_mode mode)
 {
   return *udiv_cost_ptr (speed, mode);
 }
@@ -576,7 +576,7 @@ udiv_cost (bool speed, enum machine_mode mode)
 /* Subroutine of {set_,}mul_widen_cost.  Not to be used otherwise.  */
 
 static inline int *
-mul_widen_cost_ptr (bool speed, enum machine_mode mode)
+mul_widen_cost_ptr (bool speed, machine_mode mode)
 {
   gcc_assert (GET_MODE_CLASS (mode) == MODE_INT);
 
@@ -587,7 +587,7 @@ mul_widen_cost_ptr (bool speed, enum machine_mode mode)
    optimizing for SPEED.  */
 
 static inline void
-set_mul_widen_cost (bool speed, enum machine_mode mode, int cost)
+set_mul_widen_cost (bool speed, machine_mode mode, int cost)
 {
   *mul_widen_cost_ptr (speed, mode) = cost;
 }
@@ -596,7 +596,7 @@ set_mul_widen_cost (bool speed, enum machine_mode mode, int cost)
    optimizing for SPEED.  */
 
 static inline int
-mul_widen_cost (bool speed, enum machine_mode mode)
+mul_widen_cost (bool speed, machine_mode mode)
 {
   return *mul_widen_cost_ptr (speed, mode);
 }
@@ -604,7 +604,7 @@ mul_widen_cost (bool speed, enum machine_mode mode)
 /* Subroutine of {set_,}mul_highpart_cost.  Not to be used otherwise.  */
 
 static inline int *
-mul_highpart_cost_ptr (bool speed, enum machine_mode mode)
+mul_highpart_cost_ptr (bool speed, machine_mode mode)
 {
   gcc_assert (GET_MODE_CLASS (mode) == MODE_INT);
 
@@ -615,7 +615,7 @@ mul_highpart_cost_ptr (bool speed, enum machine_mode mode)
    when optimizing for SPEED.  */
 
 static inline void
-set_mul_highpart_cost (bool speed, enum machine_mode mode, int cost)
+set_mul_highpart_cost (bool speed, machine_mode mode, int cost)
 {
   *mul_highpart_cost_ptr (speed, mode) = cost;
 }
@@ -624,7 +624,7 @@ set_mul_highpart_cost (bool speed, enum machine_mode mode, int cost)
    when optimizing for SPEED.  */
 
 static inline int
-mul_highpart_cost (bool speed, enum machine_mode mode)
+mul_highpart_cost (bool speed, machine_mode mode)
 {
   return *mul_highpart_cost_ptr (speed, mode);
 }
@@ -632,7 +632,7 @@ mul_highpart_cost (bool speed, enum machine_mode mode)
 /* Subroutine of {set_,}convert_cost.  Not to be used otherwise.  */
 
 static inline int *
-convert_cost_ptr (enum machine_mode to_mode, enum machine_mode from_mode,
+convert_cost_ptr (machine_mode to_mode, machine_mode from_mode,
 		  bool speed)
 {
   int to_idx = expmed_mode_index (to_mode);
@@ -648,7 +648,7 @@ convert_cost_ptr (enum machine_mode to_mode, enum machine_mode from_mode,
    for SPEED.  */
 
 static inline void
-set_convert_cost (enum machine_mode to_mode, enum machine_mode from_mode,
+set_convert_cost (machine_mode to_mode, machine_mode from_mode,
 		  bool speed, int cost)
 {
   *convert_cost_ptr (to_mode, from_mode, speed) = cost;
@@ -658,11 +658,11 @@ set_convert_cost (enum machine_mode to_mode, enum machine_mode from_mode,
    for SPEED.  */
 
 static inline int
-convert_cost (enum machine_mode to_mode, enum machine_mode from_mode,
+convert_cost (machine_mode to_mode, machine_mode from_mode,
 	      bool speed)
 {
   return *convert_cost_ptr (to_mode, from_mode, speed);
 }
 
-extern int mult_by_coeff_cost (HOST_WIDE_INT, enum machine_mode, bool);
+extern int mult_by_coeff_cost (HOST_WIDE_INT, machine_mode, bool);
 #endif