diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/builtins.c | 8 | ||||
| -rw-r--r-- | gcc/java/java-tree.h | 2 | ||||
| -rw-r--r-- | gcc/java/typeck.c | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 731d2d4..4a027e2 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2014-10-29 Richard Sandiford <richard.sandiford@arm.com> + + * builtins.c, java-tree.h, typeck.c: Remove redundant enum from + machine_mode. + 2014-10-28 Andrew MacLeod <amacleod@redhat.com> * class.c: Adjust include files. diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c index 12c427d..7c6b0ab 100644 --- a/gcc/java/builtins.c +++ b/gcc/java/builtins.c @@ -319,7 +319,7 @@ static tree compareAndSwapInt_builtin (tree method_return_type ATTRIBUTE_UNUSED, tree orig_call) { - enum machine_mode mode = TYPE_MODE (int_type_node); + machine_mode mode = TYPE_MODE (int_type_node); if (can_compare_and_swap_p (mode, flag_use_atomic_builtins)) { tree addr, stmt; @@ -340,7 +340,7 @@ static tree compareAndSwapLong_builtin (tree method_return_type ATTRIBUTE_UNUSED, tree orig_call) { - enum machine_mode mode = TYPE_MODE (long_type_node); + machine_mode mode = TYPE_MODE (long_type_node); /* We don't trust flag_use_atomic_builtins for multi-word compareAndSwap. Some machines such as ARM have atomic libfuncs but not the multi-word versions. */ @@ -365,7 +365,7 @@ static tree compareAndSwapObject_builtin (tree method_return_type ATTRIBUTE_UNUSED, tree orig_call) { - enum machine_mode mode = TYPE_MODE (ptr_type_node); + machine_mode mode = TYPE_MODE (ptr_type_node); if (can_compare_and_swap_p (mode, flag_use_atomic_builtins)) { tree addr, stmt; @@ -444,7 +444,7 @@ static tree VMSupportsCS8_builtin (tree method_return_type, tree orig_call ATTRIBUTE_UNUSED) { - enum machine_mode mode = TYPE_MODE (long_type_node); + machine_mode mode = TYPE_MODE (long_type_node); gcc_assert (method_return_type == boolean_type_node); if (can_compare_and_swap_p (mode, false)) return boolean_true_node; diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index 40b687d..7b827df 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -952,7 +952,7 @@ struct GTY(()) lang_type { struct eh_range; extern void java_parse_file (void); -extern tree java_type_for_mode (enum machine_mode, int); +extern tree java_type_for_mode (machine_mode, int); extern tree java_type_for_size (unsigned int, int); extern tree java_truthvalue_conversion (tree); extern void add_assume_compiled (const char *, int); diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c index 2019b2d..d68ef45 100644 --- a/gcc/java/typeck.c +++ b/gcc/java/typeck.c @@ -157,7 +157,7 @@ convert (tree type, tree expr) then UNSIGNEDP selects between signed and unsigned types. */ tree -java_type_for_mode (enum machine_mode mode, int unsignedp) +java_type_for_mode (machine_mode mode, int unsignedp) { if (mode == TYPE_MODE (int_type_node)) return unsignedp ? unsigned_int_type_node : int_type_node; |