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

3 files changed, 43 insertions, 43 deletions

diff --git a/gcc/config/tilegx/tilegx-protos.h b/gcc/config/tilegx/tilegx-protos.h
index a41cf4a..d45d9e3 100644
--- a/gcc/config/tilegx/tilegx-protos.h
+++ b/gcc/config/tilegx/tilegx-protos.h
@@ -25,22 +25,22 @@ extern void tilegx_init_expanders (void);
 extern void tilegx_compute_pcrel_address (rtx, rtx);
 extern void tilegx_compute_pcrel_plt_address (rtx, rtx);
 extern bool tilegx_legitimate_pic_operand_p (rtx);
-extern rtx tilegx_simd_int (rtx, enum machine_mode);
+extern rtx tilegx_simd_int (rtx, machine_mode);
 
 #ifdef RTX_CODE
 extern bool tilegx_bitfield_operand_p (HOST_WIDE_INT, int *, int *);
 extern void tilegx_expand_set_const64 (rtx, rtx);
-extern bool tilegx_expand_mov (enum machine_mode, rtx *);
+extern bool tilegx_expand_mov (machine_mode, rtx *);
 extern void tilegx_expand_unaligned_load (rtx, rtx, HOST_WIDE_INT,
 					  HOST_WIDE_INT, bool);
-extern void tilegx_expand_movmisalign (enum machine_mode, rtx *);
+extern void tilegx_expand_movmisalign (machine_mode, rtx *);
 extern void tilegx_allocate_stack (rtx, rtx);
 extern bool tilegx_expand_muldi (rtx, rtx, rtx);
 extern void tilegx_expand_smuldi3_highpart (rtx, rtx, rtx);
 extern void tilegx_expand_umuldi3_highpart (rtx, rtx, rtx);
 
-extern bool tilegx_emit_setcc (rtx[], enum machine_mode);
-extern void tilegx_emit_conditional_branch (rtx[], enum machine_mode);
+extern bool tilegx_emit_setcc (rtx[], machine_mode);
+extern void tilegx_emit_conditional_branch (rtx[], machine_mode);
 extern rtx tilegx_emit_conditional_move (rtx);
 extern const char *tilegx_output_cbranch_with_opcode (rtx_insn *, rtx *,
 						      const char *,
@@ -48,8 +48,8 @@ extern const char *tilegx_output_cbranch_with_opcode (rtx_insn *, rtx *,
 extern const char *tilegx_output_cbranch (rtx_insn *, rtx *, bool);
 extern void tilegx_expand_tablejump (rtx, rtx);
 extern void tilegx_expand_builtin_vector_binop (rtx (*)(rtx, rtx, rtx),
-						enum machine_mode, rtx,
-						enum machine_mode, rtx, rtx,
+						machine_mode, rtx,
+						machine_mode, rtx, rtx,
 						bool);
 extern void tilegx_pre_atomic_barrier (enum memmodel);
 extern void tilegx_post_atomic_barrier (enum memmodel);
diff --git a/gcc/config/tilegx/tilegx.c b/gcc/config/tilegx/tilegx.c
index ca9a91a..e807fff 100644
--- a/gcc/config/tilegx/tilegx.c
+++ b/gcc/config/tilegx/tilegx.c
@@ -81,7 +81,7 @@ static GTY(()) rtx g_got_symbol = NULL;
 /* In case of a POST_INC or POST_DEC memory reference, we must report
    the mode of the memory reference from TARGET_PRINT_OPERAND to
    TARGET_PRINT_OPERAND_ADDRESS.  */
-static enum machine_mode output_memory_reference_mode;
+static machine_mode output_memory_reference_mode;
 
 /* Report whether we're printing out the first address fragment of a
    POST_INC or POST_DEC memory reference, from TARGET_PRINT_OPERAND to
@@ -129,7 +129,7 @@ tilegx_option_override (void)
 
 /* Implement TARGET_SCALAR_MODE_SUPPORTED_P.  */
 static bool
-tilegx_scalar_mode_supported_p (enum machine_mode mode)
+tilegx_scalar_mode_supported_p (machine_mode mode)
 {
   switch (mode)
     {
@@ -152,7 +152,7 @@ tilegx_scalar_mode_supported_p (enum machine_mode mode)
 
 /* Implement TARGET_VECTOR_MODE_SUPPORTED_P.  */
 static bool
-tilegx_vector_mode_supported_p (enum machine_mode mode)
+tilegx_vector_mode_supported_p (machine_mode mode)
 {
   return mode == V8QImode || mode == V4HImode || mode == V2SImode;
 }
@@ -160,7 +160,7 @@ tilegx_vector_mode_supported_p (enum machine_mode mode)
 
 /* Implement TARGET_CANNOT_FORCE_CONST_MEM.  */
 static bool
-tilegx_cannot_force_const_mem (enum machine_mode mode ATTRIBUTE_UNUSED,
+tilegx_cannot_force_const_mem (machine_mode mode ATTRIBUTE_UNUSED,
 			       rtx x ATTRIBUTE_UNUSED)
 {
   return true;
@@ -180,7 +180,7 @@ tilegx_function_ok_for_sibcall (tree decl, tree exp ATTRIBUTE_UNUSED)
    passed by reference.  */
 static bool
 tilegx_pass_by_reference (cumulative_args_t cum ATTRIBUTE_UNUSED,
-			  enum machine_mode mode ATTRIBUTE_UNUSED,
+			  machine_mode mode ATTRIBUTE_UNUSED,
 			  const_tree type, bool named ATTRIBUTE_UNUSED)
 {
   return (type && TYPE_SIZE (type)
@@ -210,7 +210,7 @@ tilegx_return_in_memory (const_tree type, const_tree fndecl ATTRIBUTE_UNUSED)
 
 /* Implement TARGET_MODE_REP_EXTENDED.  */
 static int
-tilegx_mode_rep_extended (enum machine_mode mode, enum machine_mode mode_rep)
+tilegx_mode_rep_extended (machine_mode mode, machine_mode mode_rep)
 {
   /* SImode register values are sign-extended to DImode.  */
   if (mode == SImode && mode_rep == DImode)
@@ -222,7 +222,7 @@ tilegx_mode_rep_extended (enum machine_mode mode, enum machine_mode mode_rep)
 
 /* Implement TARGET_FUNCTION_ARG_BOUNDARY.  */
 static unsigned int
-tilegx_function_arg_boundary (enum machine_mode mode, const_tree type)
+tilegx_function_arg_boundary (machine_mode mode, const_tree type)
 {
   unsigned int alignment;
 
@@ -238,7 +238,7 @@ tilegx_function_arg_boundary (enum machine_mode mode, const_tree type)
 /* Implement TARGET_FUNCTION_ARG.  */
 static rtx
 tilegx_function_arg (cumulative_args_t cum_v,
-		     enum machine_mode mode,
+		     machine_mode mode,
 		     const_tree type, bool named ATTRIBUTE_UNUSED)
 {
   CUMULATIVE_ARGS cum = *get_cumulative_args (cum_v);
@@ -269,7 +269,7 @@ tilegx_function_arg (cumulative_args_t cum_v,
 /* Implement TARGET_FUNCTION_ARG_ADVANCE.  */
 static void
 tilegx_function_arg_advance (cumulative_args_t cum_v,
-			     enum machine_mode mode,
+			     machine_mode mode,
 			     const_tree type, bool named ATTRIBUTE_UNUSED)
 {
   CUMULATIVE_ARGS *cum = get_cumulative_args (cum_v);
@@ -301,7 +301,7 @@ static rtx
 tilegx_function_value (const_tree valtype, const_tree fn_decl_or_type,
 		       bool outgoing ATTRIBUTE_UNUSED)
 {
-  enum machine_mode mode;
+  machine_mode mode;
   int unsigned_p;
 
   mode = TYPE_MODE (valtype);
@@ -316,7 +316,7 @@ tilegx_function_value (const_tree valtype, const_tree fn_decl_or_type,
 
 /* Implement TARGET_LIBCALL_VALUE.  */
 static rtx
-tilegx_libcall_value (enum machine_mode mode,
+tilegx_libcall_value (machine_mode mode,
 		       const_rtx fun ATTRIBUTE_UNUSED)
 {
   return gen_rtx_REG (mode, 0);
@@ -411,7 +411,7 @@ tilegx_va_start (tree valist, rtx nextarg ATTRIBUTE_UNUSED)
 /* Implement TARGET_SETUP_INCOMING_VARARGS.  */
 static void
 tilegx_setup_incoming_varargs (cumulative_args_t cum,
-			       enum machine_mode mode,
+			       machine_mode mode,
 			       tree type, int *pretend_args, int no_rtl)
 {
   CUMULATIVE_ARGS local_cum = *get_cumulative_args (cum);
@@ -738,7 +738,7 @@ tilegx_rtx_costs (rtx x, int code, int outer_code, int opno, int *total,
 /* Create a temporary variable to hold a partial result, to enable
    CSE.  */
 static rtx
-create_temp_reg_if_possible (enum machine_mode mode, rtx default_reg)
+create_temp_reg_if_possible (machine_mode mode, rtx default_reg)
 {
   return can_create_pseudo_p () ? gen_reg_rtx (mode) : default_reg;
 }
@@ -798,7 +798,7 @@ tilegx_expand_to_rtl_hook (void)
    modulo 64.  SImode shifts sometimes use the 64 bit version so do
    not hold such guarantee.  */
 static unsigned HOST_WIDE_INT
-tilegx_shift_truncation_mask (enum machine_mode mode)
+tilegx_shift_truncation_mask (machine_mode mode)
 {
   return mode == DImode ? 63 : 0;
 }
@@ -858,7 +858,7 @@ tilegx_pic_address_needs_scratch (rtx x)
    pattern.  TLS cannot be treated as a constant because it can
    include a function call.  */
 static bool
-tilegx_legitimate_constant_p (enum machine_mode mode ATTRIBUTE_UNUSED, rtx x)
+tilegx_legitimate_constant_p (machine_mode mode ATTRIBUTE_UNUSED, rtx x)
 {
   switch (GET_CODE (x))
     {
@@ -890,7 +890,7 @@ tilegx_legitimate_pic_operand_p (rtx x)
 
 /* Return true if the rtx X can be used as an address operand.  */
 static bool
-tilegx_legitimate_address_p (enum machine_mode ARG_UNUSED (mode), rtx x,
+tilegx_legitimate_address_p (machine_mode ARG_UNUSED (mode), rtx x,
 			     bool strict)
 {
   if (GET_CODE (x) == SUBREG)
@@ -1223,7 +1223,7 @@ tilegx_compute_pcrel_plt_address (rtx result, rtx addr)
    nonzero, otherwise we allocate register(s) as necessary.  */
 static rtx
 tilegx_legitimize_pic_address (rtx orig,
-			       enum machine_mode mode ATTRIBUTE_UNUSED,
+			       machine_mode mode ATTRIBUTE_UNUSED,
 			       rtx reg)
 {
   if (GET_CODE (orig) == SYMBOL_REF)
@@ -1379,7 +1379,7 @@ tilegx_legitimize_pic_address (rtx orig,
 /* Implement TARGET_LEGITIMIZE_ADDRESS.  */
 static rtx
 tilegx_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED,
-			   enum machine_mode mode)
+			   machine_mode mode)
 {
   if (GET_MODE_SIZE (mode) <= UNITS_PER_WORD
       && symbolic_operand (x, Pmode) && tilegx_tls_referenced_p (x))
@@ -1475,7 +1475,7 @@ load_pic_register (bool delay_pic_helper ATTRIBUTE_UNUSED)
    replicating it to fill an interger of mode DImode.  NUM is first
    truncated to fit in MODE.  */
 rtx
-tilegx_simd_int (rtx num, enum machine_mode mode)
+tilegx_simd_int (rtx num, machine_mode mode)
 {
   HOST_WIDE_INT n = 0;
 
@@ -1820,7 +1820,7 @@ tilegx_expand_set_const64 (rtx op0, rtx op1)
 
 /* Expand a move instruction.  Return true if all work is done.  */
 bool
-tilegx_expand_mov (enum machine_mode mode, rtx *operands)
+tilegx_expand_mov (machine_mode mode, rtx *operands)
 {
   /* Handle sets of MEM first.  */
   if (MEM_P (operands[0]))
@@ -1874,7 +1874,7 @@ void
 tilegx_expand_unaligned_load (rtx dest_reg, rtx mem, HOST_WIDE_INT bitsize,
 			      HOST_WIDE_INT bit_offset, bool sign)
 {
-  enum machine_mode mode;
+  machine_mode mode;
   rtx addr_lo, addr_hi;
   rtx mem_lo, mem_hi, hi;
   rtx mema, wide_result;
@@ -2030,7 +2030,7 @@ tilegx_expand_unaligned_store (rtx mem, rtx src, HOST_WIDE_INT bitsize,
    memory that is not naturally aligned.  Emit instructions to load
    it.  */
 void
-tilegx_expand_movmisalign (enum machine_mode mode, rtx *operands)
+tilegx_expand_movmisalign (machine_mode mode, rtx *operands)
 {
   if (MEM_P (operands[1]))
     {
@@ -2344,7 +2344,7 @@ tilegx_expand_umuldi3_highpart (rtx op0, rtx op1, rtx op2)
 /* Produce the rtx yielding a bool for a floating point
    comparison.  */
 static bool
-tilegx_emit_fp_setcc (rtx res, enum rtx_code code, enum machine_mode mode,
+tilegx_emit_fp_setcc (rtx res, enum rtx_code code, machine_mode mode,
 		      rtx op0, rtx op1)
 {
   /* TODO: Certain compares again constants can be done using entirely
@@ -2391,7 +2391,7 @@ tilegx_emit_fp_setcc (rtx res, enum rtx_code code, enum machine_mode mode,
    work.  */
 static bool
 tilegx_emit_setcc_internal (rtx res, enum rtx_code code, rtx op0, rtx op1,
-			    enum machine_mode cmp_mode)
+			    machine_mode cmp_mode)
 {
   rtx tmp;
   bool swap = false;
@@ -2449,7 +2449,7 @@ tilegx_emit_setcc_internal (rtx res, enum rtx_code code, rtx op0, rtx op1,
 
 /* Implement cstore patterns.  */
 bool
-tilegx_emit_setcc (rtx operands[], enum machine_mode cmp_mode)
+tilegx_emit_setcc (rtx operands[], machine_mode cmp_mode)
 {
   return
     tilegx_emit_setcc_internal (operands[0], GET_CODE (operands[1]),
@@ -2469,7 +2469,7 @@ signed_compare_p (enum rtx_code code)
 /* Generate the comparison for a DImode conditional branch.  */
 static rtx
 tilegx_emit_cc_test (enum rtx_code code, rtx op0, rtx op1,
-		     enum machine_mode cmp_mode, bool eq_ne_only)
+		     machine_mode cmp_mode, bool eq_ne_only)
 {
   enum rtx_code branch_code;
   rtx temp;
@@ -2606,7 +2606,7 @@ tilegx_emit_cc_test (enum rtx_code code, rtx op0, rtx op1,
 
 /* Generate the comparison for a conditional branch.  */
 void
-tilegx_emit_conditional_branch (rtx operands[], enum machine_mode cmp_mode)
+tilegx_emit_conditional_branch (rtx operands[], machine_mode cmp_mode)
 {
   rtx cmp_rtx =
     tilegx_emit_cc_test (GET_CODE (operands[0]), operands[1], operands[2],
@@ -2803,9 +2803,9 @@ tilegx_post_atomic_barrier (enum memmodel model)
    src0 and src1 (if DO_SRC1 is true) is converted to SRC_MODE.  */
 void
 tilegx_expand_builtin_vector_binop (rtx (*gen) (rtx, rtx, rtx),
-				    enum machine_mode dest_mode,
+				    machine_mode dest_mode,
 				    rtx dest,
-				    enum machine_mode src_mode,
+				    machine_mode src_mode,
 				    rtx src0, rtx src1, bool do_src1)
 {
   dest = gen_lowpart (dest_mode, dest);
@@ -3544,7 +3544,7 @@ static rtx
 tilegx_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)
 {
 #define MAX_BUILTIN_ARGS 4
@@ -3583,7 +3583,7 @@ tilegx_expand_builtin (tree exp,
 
       if (!(*insn_op->predicate) (op[opnum], insn_op->mode))
 	{
-	  enum machine_mode opmode = insn_op->mode;
+	  machine_mode opmode = insn_op->mode;
 
 	  /* pointer_operand and pmode_register_operand operands do
 	     not specify a mode, so use the operand's mode instead
@@ -3591,7 +3591,7 @@ tilegx_expand_builtin (tree exp,
 	     except for constants, which are VOIDmode).  */
 	  if (opmode == VOIDmode)
 	    {
-	      enum machine_mode m = GET_MODE (op[opnum]);
+	      machine_mode m = GET_MODE (op[opnum]);
 	      gcc_assert (m == Pmode || m == VOIDmode);
 	      opmode = Pmode;
 	    }
@@ -3613,7 +3613,7 @@ tilegx_expand_builtin (tree exp,
 
   if (nonvoid)
     {
-      enum machine_mode tmode = insn_data[icode].operand[0].mode;
+      machine_mode tmode = insn_data[icode].operand[0].mode;
       if (!target
 	  || GET_MODE (target) != tmode
 	  || !(*insn_data[icode].operand[0].predicate) (target, tmode))
@@ -4399,7 +4399,7 @@ tilegx_frame_pointer_required (void)
 int
 tilegx_adjust_insn_length (rtx_insn *insn, int length)
 {
-  enum machine_mode mode = GET_MODE (insn);
+  machine_mode mode = GET_MODE (insn);
 
   /* A non-termininating instruction in a bundle has length 0.  */
   if (mode == SImode)
@@ -5475,7 +5475,7 @@ tilegx_print_operand_address (FILE *file, rtx addr)
 
 /* Machine mode of current insn, for determining curly brace
    placement.  */
-static enum machine_mode insn_mode;
+static machine_mode insn_mode;
 
 
 /* Implement FINAL_PRESCAN_INSN.  This is used to emit bundles.  */
diff --git a/gcc/config/tilegx/tilegx.md b/gcc/config/tilegx/tilegx.md
index 94946bb..a555a54 100644
--- a/gcc/config/tilegx/tilegx.md
+++ b/gcc/config/tilegx/tilegx.md
@@ -2434,7 +2434,7 @@
      rtx s0;
      rtx bcomp;
      rtx loc_ref;
-     enum machine_mode mode = GET_MODE (operands[0]);
+     machine_mode mode = GET_MODE (operands[0]);
 
      /* only deal with loop counters in SImode or DImode  */
      if (mode != SImode && mode != DImode)