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.


git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@216834 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 164 insertions, 164 deletions

diff --git a/gcc/config/frv/frv-protos.h b/gcc/config/frv/frv-protos.h
index 7bf8c7a991c..c1f6bbaaa4e 100644
--- a/gcc/config/frv/frv-protos.h
+++ b/gcc/config/frv/frv-protos.h
@@ -27,7 +27,7 @@ extern int frv_initial_elimination_offset	(int, int);
 extern void frv_ifcvt_machdep_init		(void *);
 
 #ifdef RTX_CODE
-extern int frv_legitimate_address_p_1		(enum machine_mode, rtx,
+extern int frv_legitimate_address_p_1		(machine_mode, rtx,
 						 int, int, int);
 extern rtx frv_find_base_term			(rtx);
 
@@ -42,11 +42,11 @@ extern int frv_expand_block_move		(rtx *);
 extern int frv_expand_block_clear		(rtx *);
 extern rtx frv_dynamic_chain_address		(rtx);
 extern rtx frv_return_addr_rtx			(int, rtx);
-extern rtx frv_index_memory			(rtx, enum machine_mode, int);
+extern rtx frv_index_memory			(rtx, machine_mode, int);
 extern const char *frv_asm_output_opcode
 				 	(FILE *, const char *);
 extern void frv_final_prescan_insn	(rtx_insn *, rtx *, int);
-extern void frv_emit_move		(enum machine_mode, rtx, rtx);
+extern void frv_emit_move		(machine_mode, rtx, rtx);
 extern int frv_emit_movsi		(rtx, rtx);
 extern const char *output_move_single	(rtx *, rtx);
 extern const char *output_move_double	(rtx *, rtx);
@@ -73,12 +73,12 @@ extern void frv_ifcvt_modify_cancel	(struct ce_if_block *);
 #endif
 extern enum reg_class frv_secondary_reload_class
 					(enum reg_class,
-					 enum machine_mode, rtx);
-extern int frv_hard_regno_mode_ok	(int, enum machine_mode);
-extern int frv_hard_regno_nregs		(int, enum machine_mode);
+					 machine_mode, rtx);
+extern int frv_hard_regno_mode_ok	(int, machine_mode);
+extern int frv_hard_regno_nregs		(int, machine_mode);
 extern int frv_class_max_nregs		(enum reg_class rclass,
-					 enum machine_mode mode);
-extern enum machine_mode frv_select_cc_mode (enum rtx_code, rtx, rtx);
+					 machine_mode mode);
+extern machine_mode frv_select_cc_mode (enum rtx_code, rtx, rtx);
 #endif	/* RTX_CODE */
 
 extern int frv_trampoline_size		(void);
@@ -91,77 +91,77 @@ extern int frv_adjust_field_align	(tree, int);
 #endif
 
 #ifdef RTX_CODE
-extern int integer_register_operand	(rtx, enum machine_mode);
-extern int frv_load_operand		(rtx, enum machine_mode);
-extern int gpr_or_fpr_operand		(rtx, enum machine_mode);
-extern int gpr_no_subreg_operand	(rtx, enum machine_mode);
-extern int gpr_or_int6_operand		(rtx, enum machine_mode);
-extern int fpr_or_int6_operand		(rtx, enum machine_mode);
-extern int gpr_or_int_operand		(rtx, enum machine_mode);
-extern int gpr_or_int12_operand		(rtx, enum machine_mode);
-extern int gpr_fpr_or_int12_operand	(rtx, enum machine_mode);
-extern int gpr_or_int10_operand		(rtx, enum machine_mode);
-extern int move_source_operand		(rtx, enum machine_mode);
-extern int move_destination_operand	(rtx, enum machine_mode);
-extern int condexec_source_operand	(rtx, enum machine_mode);
-extern int condexec_dest_operand	(rtx, enum machine_mode);
-extern int lr_operand			(rtx, enum machine_mode);
-extern int gpr_or_memory_operand	(rtx, enum machine_mode);
-extern int fpr_or_memory_operand	(rtx, enum machine_mode);
-extern int reg_or_0_operand		(rtx, enum machine_mode);
-extern int fcc_operand			(rtx, enum machine_mode);
-extern int icc_operand			(rtx, enum machine_mode);
-extern int cc_operand			(rtx, enum machine_mode);
-extern int fcr_operand			(rtx, enum machine_mode);
-extern int icr_operand			(rtx, enum machine_mode);
-extern int cr_operand			(rtx, enum machine_mode);
-extern int call_operand			(rtx, enum machine_mode);
-extern int fpr_operand			(rtx, enum machine_mode);
-extern int even_reg_operand		(rtx, enum machine_mode);
-extern int odd_reg_operand		(rtx, enum machine_mode);
-extern int even_gpr_operand		(rtx, enum machine_mode);
-extern int odd_gpr_operand		(rtx, enum machine_mode);
-extern int quad_fpr_operand		(rtx, enum machine_mode);
-extern int even_fpr_operand		(rtx, enum machine_mode);
-extern int odd_fpr_operand		(rtx, enum machine_mode);
-extern int dbl_memory_one_insn_operand	(rtx, enum machine_mode);
-extern int dbl_memory_two_insn_operand	(rtx, enum machine_mode);
-extern int int12_operand		(rtx, enum machine_mode);
-extern int int6_operand			(rtx, enum machine_mode);
-extern int int5_operand			(rtx, enum machine_mode);
-extern int uint5_operand		(rtx, enum machine_mode);
-extern int uint4_operand		(rtx, enum machine_mode);
-extern int uint1_operand		(rtx, enum machine_mode);
-extern int int_2word_operand		(rtx, enum machine_mode);
-extern int pic_register_operand		(rtx, enum machine_mode);
-extern int pic_symbolic_operand		(rtx, enum machine_mode);
-extern int small_data_register_operand	(rtx, enum machine_mode);
-extern int small_data_symbolic_operand	(rtx, enum machine_mode);
-extern int upper_int16_operand		(rtx, enum machine_mode);
-extern int uint16_operand		(rtx, enum machine_mode);
-extern int symbolic_operand		(rtx, enum machine_mode);
-extern int relational_operator		(rtx, enum machine_mode);
-extern int signed_relational_operator	(rtx, enum machine_mode);
-extern int unsigned_relational_operator	(rtx, enum machine_mode);
-extern int float_relational_operator	(rtx, enum machine_mode);
-extern int ccr_eqne_operator		(rtx, enum machine_mode);
-extern int minmax_operator		(rtx, enum machine_mode);
-extern int condexec_si_binary_operator	(rtx, enum machine_mode);
-extern int condexec_si_media_operator	(rtx, enum machine_mode);
-extern int condexec_si_divide_operator	(rtx, enum machine_mode);
-extern int condexec_si_unary_operator	(rtx, enum machine_mode);
-extern int condexec_sf_conv_operator	(rtx, enum machine_mode);
-extern int condexec_sf_add_operator	(rtx, enum machine_mode);
-extern int condexec_memory_operand	(rtx, enum machine_mode);
-extern int intop_compare_operator	(rtx, enum machine_mode);
-extern int acc_operand			(rtx, enum machine_mode);
-extern int even_acc_operand		(rtx, enum machine_mode);
-extern int quad_acc_operand		(rtx, enum machine_mode);
-extern int accg_operand			(rtx, enum machine_mode);
+extern int integer_register_operand	(rtx, machine_mode);
+extern int frv_load_operand		(rtx, machine_mode);
+extern int gpr_or_fpr_operand		(rtx, machine_mode);
+extern int gpr_no_subreg_operand	(rtx, machine_mode);
+extern int gpr_or_int6_operand		(rtx, machine_mode);
+extern int fpr_or_int6_operand		(rtx, machine_mode);
+extern int gpr_or_int_operand		(rtx, machine_mode);
+extern int gpr_or_int12_operand		(rtx, machine_mode);
+extern int gpr_fpr_or_int12_operand	(rtx, machine_mode);
+extern int gpr_or_int10_operand		(rtx, machine_mode);
+extern int move_source_operand		(rtx, machine_mode);
+extern int move_destination_operand	(rtx, machine_mode);
+extern int condexec_source_operand	(rtx, machine_mode);
+extern int condexec_dest_operand	(rtx, machine_mode);
+extern int lr_operand			(rtx, machine_mode);
+extern int gpr_or_memory_operand	(rtx, machine_mode);
+extern int fpr_or_memory_operand	(rtx, machine_mode);
+extern int reg_or_0_operand		(rtx, machine_mode);
+extern int fcc_operand			(rtx, machine_mode);
+extern int icc_operand			(rtx, machine_mode);
+extern int cc_operand			(rtx, machine_mode);
+extern int fcr_operand			(rtx, machine_mode);
+extern int icr_operand			(rtx, machine_mode);
+extern int cr_operand			(rtx, machine_mode);
+extern int call_operand			(rtx, machine_mode);
+extern int fpr_operand			(rtx, machine_mode);
+extern int even_reg_operand		(rtx, machine_mode);
+extern int odd_reg_operand		(rtx, machine_mode);
+extern int even_gpr_operand		(rtx, machine_mode);
+extern int odd_gpr_operand		(rtx, machine_mode);
+extern int quad_fpr_operand		(rtx, machine_mode);
+extern int even_fpr_operand		(rtx, machine_mode);
+extern int odd_fpr_operand		(rtx, machine_mode);
+extern int dbl_memory_one_insn_operand	(rtx, machine_mode);
+extern int dbl_memory_two_insn_operand	(rtx, machine_mode);
+extern int int12_operand		(rtx, machine_mode);
+extern int int6_operand			(rtx, machine_mode);
+extern int int5_operand			(rtx, machine_mode);
+extern int uint5_operand		(rtx, machine_mode);
+extern int uint4_operand		(rtx, machine_mode);
+extern int uint1_operand		(rtx, machine_mode);
+extern int int_2word_operand		(rtx, machine_mode);
+extern int pic_register_operand		(rtx, machine_mode);
+extern int pic_symbolic_operand		(rtx, machine_mode);
+extern int small_data_register_operand	(rtx, machine_mode);
+extern int small_data_symbolic_operand	(rtx, machine_mode);
+extern int upper_int16_operand		(rtx, machine_mode);
+extern int uint16_operand		(rtx, machine_mode);
+extern int symbolic_operand		(rtx, machine_mode);
+extern int relational_operator		(rtx, machine_mode);
+extern int signed_relational_operator	(rtx, machine_mode);
+extern int unsigned_relational_operator	(rtx, machine_mode);
+extern int float_relational_operator	(rtx, machine_mode);
+extern int ccr_eqne_operator		(rtx, machine_mode);
+extern int minmax_operator		(rtx, machine_mode);
+extern int condexec_si_binary_operator	(rtx, machine_mode);
+extern int condexec_si_media_operator	(rtx, machine_mode);
+extern int condexec_si_divide_operator	(rtx, machine_mode);
+extern int condexec_si_unary_operator	(rtx, machine_mode);
+extern int condexec_sf_conv_operator	(rtx, machine_mode);
+extern int condexec_sf_add_operator	(rtx, machine_mode);
+extern int condexec_memory_operand	(rtx, machine_mode);
+extern int intop_compare_operator	(rtx, machine_mode);
+extern int acc_operand			(rtx, machine_mode);
+extern int even_acc_operand		(rtx, machine_mode);
+extern int quad_acc_operand		(rtx, machine_mode);
+extern int accg_operand			(rtx, machine_mode);
 extern rtx frv_matching_accg_for_acc	(rtx);
 extern void frv_expand_fdpic_call	(rtx *, bool, bool);
 extern rtx frv_gen_GPsym2reg		(rtx, rtx);
-extern int frv_legitimate_memory_operand (rtx, enum machine_mode, int);
+extern int frv_legitimate_memory_operand (rtx, machine_mode, int);
 
 /* Information about a relocation unspec.  SYMBOL is the relocation symbol
    (a SYMBOL_REF or LABEL_REF), RELOC is the type of relocation and OFFSET
diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c
index e3a22e83e35..41cc4974cad 100644
--- a/gcc/config/frv/frv.c
+++ b/gcc/config/frv/frv.c
@@ -275,7 +275,7 @@ static frv_stack_t *frv_stack_cache = (frv_stack_t *)0;
 /* Forward references */
 
 static void frv_option_override			(void);
-static bool frv_legitimate_address_p		(enum machine_mode, rtx, bool);
+static bool frv_legitimate_address_p		(machine_mode, rtx, bool);
 static int frv_default_flags_for_cpu		(void);
 static int frv_string_begins_with		(const char *, const char *);
 static FRV_INLINE bool frv_small_data_reloc_p	(rtx, int);
@@ -289,17 +289,17 @@ static int frv_print_operand_jump_hint		(rtx_insn *);
 static const char *comparison_string		(enum rtx_code, rtx);
 static rtx frv_function_value			(const_tree, const_tree,
 						 bool);
-static rtx frv_libcall_value			(enum machine_mode,
+static rtx frv_libcall_value			(machine_mode,
 						 const_rtx);
 static FRV_INLINE int frv_regno_ok_for_base_p	(int, int);
 static rtx single_set_pattern			(rtx);
 static int frv_function_contains_far_jump	(void);
 static rtx frv_alloc_temp_reg			(frv_tmp_reg_t *,
 						 enum reg_class,
-						 enum machine_mode,
+						 machine_mode,
 						 int, int);
 static rtx frv_frame_offset_rtx			(int);
-static rtx frv_frame_mem			(enum machine_mode, rtx, int);
+static rtx frv_frame_mem			(machine_mode, rtx, int);
 static rtx frv_dwarf_store			(rtx, int);
 static void frv_frame_insn			(rtx, rtx);
 static void frv_frame_access			(frv_frame_accessor_t*,
@@ -310,14 +310,14 @@ static void frv_frame_access_standard_regs	(enum frv_stack_op,
 						 frv_stack_t *);
 static struct machine_function *frv_init_machine_status		(void);
 static rtx frv_int_to_acc			(enum insn_code, int, rtx);
-static enum machine_mode frv_matching_accg_mode	(enum machine_mode);
+static machine_mode frv_matching_accg_mode	(machine_mode);
 static rtx frv_read_argument			(tree, unsigned int);
-static rtx frv_read_iacc_argument		(enum machine_mode, tree, unsigned int);
+static rtx frv_read_iacc_argument		(machine_mode, tree, unsigned int);
 static int frv_check_constant_argument		(enum insn_code, int, rtx);
 static rtx frv_legitimize_target		(enum insn_code, rtx);
 static rtx frv_legitimize_argument		(enum insn_code, int, rtx);
 static rtx frv_legitimize_tls_address		(rtx, enum tls_model);
-static rtx frv_legitimize_address		(rtx, rtx, enum machine_mode);
+static rtx frv_legitimize_address		(rtx, rtx, machine_mode);
 static rtx frv_expand_set_builtin		(enum insn_code, tree, rtx);
 static rtx frv_expand_unop_builtin		(enum insn_code, tree, rtx);
 static rtx frv_expand_binop_builtin		(enum insn_code, tree, rtx);
@@ -336,7 +336,7 @@ static void frv_split_iacc_move			(rtx, rtx);
 static rtx frv_emit_comparison			(enum rtx_code, rtx, rtx);
 static int frv_clear_registers_used		(rtx *, void *);
 static void frv_ifcvt_add_insn			(rtx, rtx, int);
-static rtx frv_ifcvt_rewrite_mem		(rtx, enum machine_mode, rtx);
+static rtx frv_ifcvt_rewrite_mem		(rtx, machine_mode, rtx);
 static rtx frv_ifcvt_load_value			(rtx, rtx);
 static int frv_acc_group_1			(rtx *, void *);
 static unsigned int frv_insn_unit		(rtx_insn *);
@@ -371,47 +371,47 @@ static void frv_function_prologue		(FILE *, HOST_WIDE_INT);
 static void frv_function_epilogue		(FILE *, HOST_WIDE_INT);
 static bool frv_assemble_integer		(rtx, unsigned, int);
 static void frv_init_builtins			(void);
-static rtx frv_expand_builtin			(tree, rtx, rtx, enum machine_mode, int);
+static rtx frv_expand_builtin			(tree, rtx, rtx, machine_mode, int);
 static void frv_init_libfuncs			(void);
 static bool frv_in_small_data_p			(const_tree);
 static void frv_asm_output_mi_thunk
   (FILE *, tree, HOST_WIDE_INT, HOST_WIDE_INT, tree);
 static void frv_setup_incoming_varargs		(cumulative_args_t,
-						 enum machine_mode,
+						 machine_mode,
 						 tree, int *, int);
 static rtx frv_expand_builtin_saveregs		(void);
 static void frv_expand_builtin_va_start		(tree, rtx);
 static bool frv_rtx_costs			(rtx, int, int, int, int*,
 						 bool);
-static int frv_register_move_cost		(enum machine_mode,
+static int frv_register_move_cost		(machine_mode,
 						 reg_class_t, reg_class_t);
-static int frv_memory_move_cost			(enum machine_mode,
+static int frv_memory_move_cost			(machine_mode,
 						 reg_class_t, bool);
 static void frv_asm_out_constructor		(rtx, int);
 static void frv_asm_out_destructor		(rtx, int);
 static bool frv_function_symbol_referenced_p	(rtx);
-static bool frv_legitimate_constant_p		(enum machine_mode, rtx);
-static bool frv_cannot_force_const_mem		(enum machine_mode, rtx);
+static bool frv_legitimate_constant_p		(machine_mode, rtx);
+static bool frv_cannot_force_const_mem		(machine_mode, rtx);
 static const char *unspec_got_name		(int);
 static void frv_output_const_unspec		(FILE *,
 						 const struct frv_unspec *);
 static bool frv_function_ok_for_sibcall		(tree, tree);
 static rtx frv_struct_value_rtx			(tree, int);
-static bool frv_must_pass_in_stack (enum machine_mode mode, const_tree type);
-static int frv_arg_partial_bytes (cumulative_args_t, enum machine_mode,
+static bool frv_must_pass_in_stack (machine_mode mode, const_tree type);
+static int frv_arg_partial_bytes (cumulative_args_t, machine_mode,
 				  tree, bool);
-static rtx frv_function_arg (cumulative_args_t, enum machine_mode,
+static rtx frv_function_arg (cumulative_args_t, machine_mode,
 			     const_tree, bool);
-static rtx frv_function_incoming_arg (cumulative_args_t, enum machine_mode,
+static rtx frv_function_incoming_arg (cumulative_args_t, machine_mode,
 				      const_tree, bool);
-static void frv_function_arg_advance (cumulative_args_t, enum machine_mode,
+static void frv_function_arg_advance (cumulative_args_t, machine_mode,
 				       const_tree, bool);
-static unsigned int frv_function_arg_boundary	(enum machine_mode,
+static unsigned int frv_function_arg_boundary	(machine_mode,
 						 const_tree);
 static void frv_output_dwarf_dtprel		(FILE *, int, rtx)
   ATTRIBUTE_UNUSED;
 static reg_class_t frv_secondary_reload		(bool, rtx, reg_class_t,
-						 enum machine_mode,
+						 machine_mode,
 						 secondary_reload_info *);
 static bool frv_frame_pointer_required		(void);
 static bool frv_can_eliminate			(const int, const int);
@@ -612,7 +612,7 @@ frv_const_unspec_p (rtx x, struct frv_unspec *unspec)
    4. In many cases, it's more efficient to calculate the constant in-line.  */
 
 static bool
-frv_cannot_force_const_mem (enum machine_mode mode ATTRIBUTE_UNUSED,
+frv_cannot_force_const_mem (machine_mode mode ATTRIBUTE_UNUSED,
 			    rtx x ATTRIBUTE_UNUSED)
 {
   return TARGET_FDPIC;
@@ -1496,7 +1496,7 @@ static rtx
 frv_alloc_temp_reg (
      frv_tmp_reg_t *info,	/* which registers are available */
      enum reg_class rclass,	/* register class desired */
-     enum machine_mode mode,	/* mode to allocate register with */
+     machine_mode mode,	/* mode to allocate register with */
      int mark_as_used,		/* register not available after allocation */
      int no_abort)		/* return NULL instead of aborting */
 {
@@ -1560,7 +1560,7 @@ frv_frame_offset_rtx (int offset)
 /* Generate (mem:MODE (plus:Pmode BASE (frv_frame_offset OFFSET)))).  The
    prologue and epilogue uses such expressions to access the stack.  */
 static rtx
-frv_frame_mem (enum machine_mode mode, rtx base, int offset)
+frv_frame_mem (machine_mode mode, rtx base, int offset)
 {
   return gen_rtx_MEM (mode, gen_rtx_PLUS (Pmode,
 					  base,
@@ -1623,7 +1623,7 @@ frv_frame_insn (rtx pattern, rtx dwarf_pattern)
 static void
 frv_frame_access (frv_frame_accessor_t *accessor, rtx reg, int stack_offset)
 {
-  enum machine_mode mode = GET_MODE (reg);
+  machine_mode mode = GET_MODE (reg);
   rtx mem = frv_frame_mem (mode,
 			   accessor->base,
 			   stack_offset - accessor->base_offset);
@@ -2138,7 +2138,7 @@ frv_initial_elimination_offset (int from, int to)
 
 static void
 frv_setup_incoming_varargs (cumulative_args_t cum_v,
-                            enum machine_mode mode,
+                            machine_mode mode,
                             tree type ATTRIBUTE_UNUSED,
                             int *pretend_size,
                             int second_time)
@@ -2235,7 +2235,7 @@ frv_expand_block_move (rtx operands[])
   rtx tmp_reg;
   rtx stores[MAX_MOVE_REG];
   int move_bytes;
-  enum machine_mode mode;
+  machine_mode mode;
 
   /* If this is not a fixed size move, just call memcpy.  */
   if (! constp)
@@ -2326,7 +2326,7 @@ frv_expand_block_clear (rtx operands[])
   rtx dest_addr;
   rtx dest_mem;
   int clear_bytes;
-  enum machine_mode mode;
+  machine_mode mode;
 
   /* If this is not a fixed size move, just call memcpy.  */
   if (! constp)
@@ -2481,7 +2481,7 @@ frv_return_addr_rtx (int count, rtx frame)
    frv_legitimate_address_p forbids register+register addresses, which
    this function cannot handle.  */
 rtx
-frv_index_memory (rtx memref, enum machine_mode mode, int index)
+frv_index_memory (rtx memref, machine_mode mode, int index)
 {
   rtx base = XEXP (memref, 0);
   if (GET_CODE (base) == PRE_MODIFY)
@@ -3111,7 +3111,7 @@ frv_init_cumulative_args (CUMULATIVE_ARGS *cum,
    in registers.  */
 
 static bool
-frv_must_pass_in_stack (enum machine_mode mode, const_tree type)
+frv_must_pass_in_stack (machine_mode mode, const_tree type)
 {
   if (mode == BLKmode)
     return true;
@@ -3125,20 +3125,20 @@ frv_must_pass_in_stack (enum machine_mode mode, const_tree type)
    `PARM_BOUNDARY' is used for all arguments.  */
 
 static unsigned int
-frv_function_arg_boundary (enum machine_mode mode ATTRIBUTE_UNUSED,
+frv_function_arg_boundary (machine_mode mode ATTRIBUTE_UNUSED,
                            const_tree type ATTRIBUTE_UNUSED)
 {
   return BITS_PER_WORD;
 }
 
 static rtx
-frv_function_arg_1 (cumulative_args_t cum_v, enum machine_mode mode,
+frv_function_arg_1 (cumulative_args_t cum_v, machine_mode mode,
 		    const_tree type ATTRIBUTE_UNUSED, bool named,
 		    bool incoming ATTRIBUTE_UNUSED)
 {
   const CUMULATIVE_ARGS *cum = get_cumulative_args (cum_v);
 
-  enum machine_mode xmode = (mode == BLKmode) ? SImode : mode;
+  machine_mode xmode = (mode == BLKmode) ? SImode : mode;
   int arg_num = *cum;
   rtx ret;
   const char *debstr;
@@ -3171,14 +3171,14 @@ frv_function_arg_1 (cumulative_args_t cum_v, enum machine_mode mode,
 }
 
 static rtx
-frv_function_arg (cumulative_args_t cum, enum machine_mode mode,
+frv_function_arg (cumulative_args_t cum, machine_mode mode,
 		  const_tree type, bool named)
 {
   return frv_function_arg_1 (cum, mode, type, named, false);
 }
 
 static rtx
-frv_function_incoming_arg (cumulative_args_t cum, enum machine_mode mode,
+frv_function_incoming_arg (cumulative_args_t cum, machine_mode mode,
 			   const_tree type, bool named)
 {
   return frv_function_arg_1 (cum, mode, type, named, true);
@@ -3196,13 +3196,13 @@ frv_function_incoming_arg (cumulative_args_t cum, enum machine_mode mode,
 
 static void
 frv_function_arg_advance (cumulative_args_t cum_v,
-                          enum machine_mode mode,
+                          machine_mode mode,
                           const_tree type ATTRIBUTE_UNUSED,
                           bool named)
 {
   CUMULATIVE_ARGS *cum = get_cumulative_args (cum_v);
 
-  enum machine_mode xmode = (mode == BLKmode) ? SImode : mode;
+  machine_mode xmode = (mode == BLKmode) ? SImode : mode;
   int bytes = GET_MODE_SIZE (xmode);
   int words = (bytes + UNITS_PER_WORD  - 1) / UNITS_PER_WORD;
   int arg_num = *cum;
@@ -3233,11 +3233,11 @@ frv_function_arg_advance (cumulative_args_t cum_v,
    the called function.  */
 
 static int
-frv_arg_partial_bytes (cumulative_args_t cum, enum machine_mode mode,
+frv_arg_partial_bytes (cumulative_args_t cum, machine_mode mode,
 		       tree type ATTRIBUTE_UNUSED, bool named ATTRIBUTE_UNUSED)
 {
 
-  enum machine_mode xmode = (mode == BLKmode) ? SImode : mode;
+  machine_mode xmode = (mode == BLKmode) ? SImode : mode;
   int bytes = GET_MODE_SIZE (xmode);
   int words = (bytes + UNITS_PER_WORD - 1) / UNITS_PER_WORD;
   int arg_num = *get_cumulative_args (cum);
@@ -3269,7 +3269,7 @@ frv_function_value (const_tree valtype,
 /* Implements TARGET_LIBCALL_VALUE.  */
 
 static rtx
-frv_libcall_value (enum machine_mode mode,
+frv_libcall_value (machine_mode mode,
 		   const_rtx fun ATTRIBUTE_UNUSED)
 {
   return gen_rtx_REG (mode, RETURN_VALUE_REGNUM);
@@ -3337,7 +3337,7 @@ frv_regno_ok_for_base_p (int regno, int strict_p)
    will be given to `TARGET_PRINT_OPERAND_ADDRESS'.  */
 
 int
-frv_legitimate_address_p_1 (enum machine_mode mode,
+frv_legitimate_address_p_1 (machine_mode mode,
                             rtx x,
                             int strict_p,
                             int condexec_p,
@@ -3469,7 +3469,7 @@ frv_legitimate_address_p_1 (enum machine_mode mode,
 }
 
 bool
-frv_legitimate_address_p (enum machine_mode mode, rtx x, bool strict_p)
+frv_legitimate_address_p (machine_mode mode, rtx x, bool strict_p)
 {
   return frv_legitimate_address_p_1 (mode, x, strict_p, FALSE, FALSE);
 }
@@ -3636,7 +3636,7 @@ frv_legitimize_tls_address (rtx addr, enum tls_model model)
 rtx
 frv_legitimize_address (rtx x,
 			rtx oldx ATTRIBUTE_UNUSED,
-			enum machine_mode mode ATTRIBUTE_UNUSED)
+			machine_mode mode ATTRIBUTE_UNUSED)
 {
   if (GET_CODE (x) == SYMBOL_REF)
     {
@@ -3765,7 +3765,7 @@ frv_find_base_term (rtx x)
    the operand is used by a predicated instruction.  */
 
 int
-frv_legitimate_memory_operand (rtx op, enum machine_mode mode, int condexec_p)
+frv_legitimate_memory_operand (rtx op, machine_mode mode, int condexec_p)
 {
   return ((GET_MODE (op) == mode || mode == VOIDmode)
 	  && GET_CODE (op) == MEM
@@ -3906,9 +3906,9 @@ frv_function_symbol_referenced_p (rtx x)
    executed.  */
 
 int
-condexec_memory_operand (rtx op, enum machine_mode mode)
+condexec_memory_operand (rtx op, machine_mode mode)
 {
-  enum machine_mode op_mode = GET_MODE (op);
+  machine_mode op_mode = GET_MODE (op);
   rtx addr;
 
   if (mode != VOIDmode && op_mode != mode)
@@ -3950,7 +3950,7 @@ direct_return_p (void)
 
 
 void
-frv_emit_move (enum machine_mode mode, rtx dest, rtx src)
+frv_emit_move (machine_mode mode, rtx dest, rtx src)
 {
   if (GET_CODE (src) == SYMBOL_REF)
     {
@@ -4248,7 +4248,7 @@ output_move_single (rtx operands[], rtx insn)
   if (GET_CODE (dest) == REG)
     {
       int dest_regno = REGNO (dest);
-      enum machine_mode mode = GET_MODE (dest);
+      machine_mode mode = GET_MODE (dest);
 
       if (GPR_P (dest_regno))
 	{
@@ -4386,7 +4386,7 @@ output_move_single (rtx operands[], rtx insn)
       if (GET_CODE (src) == REG)
 	{
 	  int src_regno = REGNO (src);
-	  enum machine_mode mode = GET_MODE (dest);
+	  machine_mode mode = GET_MODE (dest);
 
 	  if (GPR_P (src_regno))
 	    {
@@ -4459,7 +4459,7 @@ output_move_double (rtx operands[], rtx insn)
 {
   rtx dest = operands[0];
   rtx src  = operands[1];
-  enum machine_mode mode = GET_MODE (dest);
+  machine_mode mode = GET_MODE (dest);
 
   if (GET_CODE (dest) == REG)
     {
@@ -4594,7 +4594,7 @@ output_condmove_single (rtx operands[], rtx insn)
   if (GET_CODE (dest) == REG)
     {
       int dest_regno = REGNO (dest);
-      enum machine_mode mode = GET_MODE (dest);
+      machine_mode mode = GET_MODE (dest);
 
       if (GPR_P (dest_regno))
 	{
@@ -4670,7 +4670,7 @@ output_condmove_single (rtx operands[], rtx insn)
       if (GET_CODE (src) == REG)
 	{
 	  int src_regno = REGNO (src);
-	  enum machine_mode mode = GET_MODE (dest);
+	  machine_mode mode = GET_MODE (dest);
 
 	  if (GPR_P (src_regno))
 	    {
@@ -4697,7 +4697,7 @@ output_condmove_single (rtx operands[], rtx insn)
 
       else if (ZERO_P (src))
 	{
-	  enum machine_mode mode = GET_MODE (dest);
+	  machine_mode mode = GET_MODE (dest);
 	  switch (mode)
 	    {
 	    default:
@@ -4727,7 +4727,7 @@ output_condmove_single (rtx operands[], rtx insn)
 static rtx
 frv_emit_comparison (enum rtx_code test, rtx op0, rtx op1)
 {
-  enum machine_mode cc_mode;
+  machine_mode cc_mode;
   rtx cc_reg;
 
   /* Floating point doesn't have comparison against a constant.  */
@@ -4761,7 +4761,7 @@ frv_emit_cond_branch (rtx operands[])
   rtx if_else;
   enum rtx_code test = GET_CODE (operands[0]);
   rtx cc_reg = frv_emit_comparison (test, operands[1], operands[2]);
-  enum machine_mode cc_mode = GET_MODE (cc_reg);
+  machine_mode cc_mode = GET_MODE (cc_reg);
 
   /* Branches generate:
 	(set (pc)
@@ -4856,7 +4856,7 @@ frv_emit_cond_move (rtx dest, rtx test_rtx, rtx src1, rtx src2)
   enum rtx_code test = GET_CODE (test_rtx);
   rtx cc_reg = frv_emit_comparison (test,
 				    XEXP (test_rtx, 0), XEXP (test_rtx, 1));
-  enum machine_mode cc_mode = GET_MODE (cc_reg);
+  machine_mode cc_mode = GET_MODE (cc_reg);
 
   /* Conditional move instructions generate:
 	(parallel [(set <target>
@@ -4933,7 +4933,7 @@ frv_split_cond_move (rtx operands[])
   rtx src2	= operands[4];
   rtx cr_reg	= operands[5];
   rtx ret;
-  enum machine_mode cr_mode = GET_MODE (cr_reg);
+  machine_mode cr_mode = GET_MODE (cr_reg);
 
   start_sequence ();
 
@@ -5086,7 +5086,7 @@ frv_split_minmax (rtx operands[])
   rtx cr_reg	= operands[5];
   rtx ret;
   enum rtx_code test_code;
-  enum machine_mode cr_mode = GET_MODE (cr_reg);
+  machine_mode cr_mode = GET_MODE (cr_reg);
 
   start_sequence ();
 
@@ -5278,7 +5278,7 @@ frv_ifcvt_modify_tests (ce_if_block *ce_info, rtx *p_true, rtx *p_false)
   rtx cr;
   rtx cc;
   rtx nested_cc;
-  enum machine_mode mode = GET_MODE (true_expr);
+  machine_mode mode = GET_MODE (true_expr);
   int j;
   basic_block *bb;
   int num_bb;
@@ -5644,7 +5644,7 @@ frv_ifcvt_modify_multiple_tests (ce_if_block *ce_info,
   rtx compare;
   rtx cc;
   enum reg_class cr_class;
-  enum machine_mode mode = GET_MODE (true_expr);
+  machine_mode mode = GET_MODE (true_expr);
   rtx (*logical_func)(rtx, rtx, rtx);
 
   if (TARGET_DEBUG_COND_EXEC)
@@ -5827,7 +5827,7 @@ frv_ifcvt_load_value (rtx value, rtx insn ATTRIBUTE_UNUSED)
    into a temporary register, or the new MEM if we were successful.  */
 
 static rtx
-frv_ifcvt_rewrite_mem (rtx mem, enum machine_mode mode, rtx insn)
+frv_ifcvt_rewrite_mem (rtx mem, machine_mode mode, rtx insn)
 {
   rtx addr = XEXP (mem, 0);
 
@@ -5980,7 +5980,7 @@ frv_ifcvt_modify_insn (ce_if_block *ce_info,
     {
       rtx dest = SET_DEST (set);
       rtx src = SET_SRC (set);
-      enum machine_mode mode = GET_MODE (dest);
+      machine_mode mode = GET_MODE (dest);
 
       /* Check for normal binary operators.  */
       if (mode == SImode && ARITHMETIC_P (src))
@@ -6367,7 +6367,7 @@ frv_trampoline_init (rtx m_tramp, tree fndecl, rtx static_chain)
 
 enum reg_class
 frv_secondary_reload_class (enum reg_class rclass,
-                            enum machine_mode mode ATTRIBUTE_UNUSED,
+                            machine_mode mode ATTRIBUTE_UNUSED,
                             rtx x)
 {
   enum reg_class ret;
@@ -6428,7 +6428,7 @@ frv_secondary_reload_class (enum reg_class rclass,
    
 static reg_class_t
 frv_secondary_reload (bool in_p, rtx x, reg_class_t reload_class_i,
-		      enum machine_mode reload_mode,
+		      machine_mode reload_mode,
 		      secondary_reload_info * sri)
 {
   enum reg_class rclass = NO_REGS;
@@ -6635,7 +6635,7 @@ frv_adjust_field_align (tree field, int computed)
    pattern's constraint asks for one.  */
 
 int
-frv_hard_regno_mode_ok (int regno, enum machine_mode mode)
+frv_hard_regno_mode_ok (int regno, machine_mode mode)
 {
   int base;
   int mask;
@@ -6718,7 +6718,7 @@ frv_hard_regno_mode_ok (int regno, enum machine_mode mode)
    for each byte.  */
 
 int
-frv_hard_regno_nregs (int regno, enum machine_mode mode)
+frv_hard_regno_nregs (int regno, machine_mode mode)
 {
   if (ACCG_P (regno))
     return GET_MODE_SIZE (mode);
@@ -6740,7 +6740,7 @@ frv_hard_regno_nregs (int regno, enum machine_mode mode)
    This declaration is required.  */
 
 int
-frv_class_max_nregs (enum reg_class rclass, enum machine_mode mode)
+frv_class_max_nregs (enum reg_class rclass, machine_mode mode)
 {
   if (rclass == ACCG_REGS)
     /* An N-byte value requires N accumulator guards.  */
@@ -6756,7 +6756,7 @@ frv_class_max_nregs (enum reg_class rclass, enum machine_mode mode)
    definition for this macro on machines where anything `CONSTANT_P' is valid.  */
 
 static bool
-frv_legitimate_constant_p (enum machine_mode mode, rtx x)
+frv_legitimate_constant_p (machine_mode mode, rtx x)
 {
   /* frv_cannot_force_const_mem always returns true for FDPIC.  This
      means that the move expanders will be expected to deal with most
@@ -6803,7 +6803,7 @@ frv_legitimate_constant_p (enum machine_mode mode, rtx x)
    is enough, CC_UNS for other unsigned comparisons, and CC for other
    signed comparisons.  */
 
-enum machine_mode
+machine_mode
 frv_select_cc_mode (enum rtx_code code, rtx x, rtx y)
 {
   if (GET_MODE_CLASS (GET_MODE (x)) == MODE_FLOAT)
@@ -6836,7 +6836,7 @@ frv_select_cc_mode (enum rtx_code code, rtx x, rtx y)
 #define LOW_COST 1
 
 static int
-frv_register_move_cost (enum machine_mode mode ATTRIBUTE_UNUSED,
+frv_register_move_cost (machine_mode mode ATTRIBUTE_UNUSED,
 			reg_class_t from, reg_class_t to)
 {
   switch (from)
@@ -6940,7 +6940,7 @@ frv_register_move_cost (enum machine_mode mode ATTRIBUTE_UNUSED,
 /* Worker function for TARGET_MEMORY_MOVE_COST.  */
 
 static int
-frv_memory_move_cost (enum machine_mode mode ATTRIBUTE_UNUSED,
+frv_memory_move_cost (machine_mode mode ATTRIBUTE_UNUSED,
                       reg_class_t rclass ATTRIBUTE_UNUSED,
                       bool in ATTRIBUTE_UNUSED)
 {
@@ -8701,8 +8701,8 @@ frv_int_to_acc (enum insn_code icode, int opnum, rtx opval)
 /* If an ACC rtx has mode MODE, return the mode that the matching ACCG
    should have.  */
 
-static enum machine_mode
-frv_matching_accg_mode (enum machine_mode mode)
+static machine_mode
+frv_matching_accg_mode (machine_mode mode)
 {
   switch (mode)
     {
@@ -8756,7 +8756,7 @@ frv_read_argument (tree exp, unsigned int index)
    of an IACC register and return a (reg:MODE ...) rtx for it.  */
 
 static rtx
-frv_read_iacc_argument (enum machine_mode mode, tree call,
+frv_read_iacc_argument (machine_mode mode, tree call,
 			unsigned int index)
 {
   int i, regno;
@@ -8809,7 +8809,7 @@ frv_check_constant_argument (enum insn_code icode, int opnum, rtx opval)
 static rtx
 frv_legitimize_target (enum insn_code icode, rtx target)
 {
-  enum machine_mode mode = insn_data[icode].operand[0].mode;
+  machine_mode mode = insn_data[icode].operand[0].mode;
 
   if (! target
       || GET_MODE (target) != mode
@@ -8827,7 +8827,7 @@ frv_legitimize_target (enum insn_code icode, rtx target)
 static rtx
 frv_legitimize_argument (enum insn_code icode, int opnum, rtx arg)
 {
-  enum machine_mode mode = insn_data[icode].operand[opnum].mode;
+  machine_mode mode = insn_data[icode].operand[opnum].mode;
 
   if ((*insn_data[icode].operand[opnum].predicate) (arg, mode))
     return arg;
@@ -8838,7 +8838,7 @@ frv_legitimize_argument (enum insn_code icode, int opnum, rtx arg)
 /* Return a volatile memory reference of mode MODE whose address is ARG.  */
 
 static rtx
-frv_volatile_memref (enum machine_mode mode, rtx arg)
+frv_volatile_memref (machine_mode mode, rtx arg)
 {
   rtx mem;
 
@@ -8970,7 +8970,7 @@ frv_expand_voidbinop_builtin (enum insn_code icode, tree call)
   rtx pat;
   rtx op0 = frv_read_argument (call, 0);
   rtx op1 = frv_read_argument (call, 1);
-  enum machine_mode mode0 = insn_data[icode].operand[0].mode;
+  machine_mode mode0 = insn_data[icode].operand[0].mode;
   rtx addr;
 
   if (GET_CODE (op0) != MEM)
@@ -9099,7 +9099,7 @@ frv_expand_voidaccop_builtin (enum insn_code icode, tree call)
    membar and TARGET_MODE is the mode that the loaded value should have.  */
 
 static rtx
-frv_expand_load_builtin (enum insn_code icode, enum machine_mode target_mode,
+frv_expand_load_builtin (enum insn_code icode, machine_mode target_mode,
                          tree call, rtx target)
 {
   rtx op0 = frv_read_argument (call, 0);
@@ -9252,7 +9252,7 @@ frv_expand_mwtacc_builtin (enum insn_code icode, tree call)
 static void
 frv_split_iacc_move (rtx dest, rtx src)
 {
-  enum machine_mode inner;
+  machine_mode inner;
   int i;
 
   inner = GET_MODE (dest);
@@ -9267,7 +9267,7 @@ static rtx
 frv_expand_builtin (tree exp,
                     rtx target,
                     rtx subtarget ATTRIBUTE_UNUSED,
-                    enum machine_mode mode ATTRIBUTE_UNUSED,
+                    machine_mode mode ATTRIBUTE_UNUSED,
                     int ignore ATTRIBUTE_UNUSED)
 {
   tree fndecl = TREE_OPERAND (CALL_EXPR_FN (exp), 0);
diff --git a/gcc/config/frv/predicates.md b/gcc/config/frv/predicates.md
index 972db999187..2aa4da78a47 100644
--- a/gcc/config/frv/predicates.md
+++ b/gcc/config/frv/predicates.md
@@ -1216,7 +1216,7 @@
 (define_predicate "ccr_eqne_operator"
   (match_code "eq,ne")
 {
-  enum machine_mode op_mode = GET_MODE (op);
+  machine_mode op_mode = GET_MODE (op);
   rtx op0;
   rtx op1;
   int regno;
@@ -1279,7 +1279,7 @@
 (define_predicate "condexec_si_binary_operator"
   (match_code "plus,minus,and,ior,xor,ashift,ashiftrt,lshiftrt")
 {
-  enum machine_mode op_mode = GET_MODE (op);
+  machine_mode op_mode = GET_MODE (op);
 
   if (mode != VOIDmode && op_mode != mode)
     return FALSE;
@@ -1307,7 +1307,7 @@
 (define_predicate "condexec_si_media_operator"
   (match_code "and,ior,xor")
 {
-  enum machine_mode op_mode = GET_MODE (op);
+  machine_mode op_mode = GET_MODE (op);
 
   if (mode != VOIDmode && op_mode != mode)
     return FALSE;
@@ -1330,7 +1330,7 @@
 (define_predicate "condexec_si_divide_operator"
   (match_code "div,udiv")
 {
-  enum machine_mode op_mode = GET_MODE (op);
+  machine_mode op_mode = GET_MODE (op);
 
   if (mode != VOIDmode && op_mode != mode)
     return FALSE;
@@ -1352,7 +1352,7 @@
 (define_predicate "condexec_si_unary_operator"
   (match_code "not,neg")
 {
-  enum machine_mode op_mode = GET_MODE (op);
+  machine_mode op_mode = GET_MODE (op);
 
   if (mode != VOIDmode && op_mode != mode)
     return FALSE;
@@ -1375,7 +1375,7 @@
 (define_predicate "condexec_sf_add_operator"
   (match_code "plus,minus")
 {
-  enum machine_mode op_mode = GET_MODE (op);
+  machine_mode op_mode = GET_MODE (op);
 
   if (mode != VOIDmode && op_mode != mode)
     return FALSE;
@@ -1397,7 +1397,7 @@
 (define_predicate "condexec_sf_conv_operator"
   (match_code "abs,neg")
 {
-  enum machine_mode op_mode = GET_MODE (op);
+  machine_mode op_mode = GET_MODE (op);
 
   if (mode != VOIDmode && op_mode != mode)
     return FALSE;