diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-04-27 12:45:13 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-04-27 12:45:13 +0000 |
| commit | 268b9e9e95f56a59a8817b28ad59b53f40fc668d (patch) | |
| tree | 5e9529982daf11d5b3ab800d4c58bc3fbee99d28 /gcc/java/builtins.c | |
| parent | e1910362719612f58bd1ea5050fa7a5175036abc (diff) | |
| download | gcc-268b9e9e95f56a59a8817b28ad59b53f40fc668d.tar.gz | |
2009-04-27 Basile Starynkevitch <basile@starynkevitch.net>
MERGED WITH TRUNK r146824::
* gcc/basilys.h: all GTY goes before the identifiers.
* gcc/basilys.c: removed errors.h include.
* gcc/run-basilys.h: ditto.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@146839 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/builtins.c')
| -rw-r--r-- | gcc/java/builtins.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c index c9f9f4a2a79..4fac1446f97 100644 --- a/gcc/java/builtins.c +++ b/gcc/java/builtins.c @@ -65,15 +65,13 @@ typedef tree builtin_creator_function (tree, tree); /* Hold a char*, before initialization, or a tree, after initialization. */ -union string_or_tree GTY(()) -{ +union GTY(()) string_or_tree { const char * GTY ((tag ("0"))) s; tree GTY ((tag ("1"))) t; }; /* Used to hold a single builtin record. */ -struct builtin_record GTY(()) -{ +struct GTY(()) builtin_record { union string_or_tree GTY ((desc ("1"))) class_name; union string_or_tree GTY ((desc ("1"))) method_name; builtin_creator_function * GTY((skip)) creator; @@ -304,8 +302,7 @@ compareAndSwapInt_builtin (tree method_return_type ATTRIBUTE_UNUSED, tree orig_call) { enum machine_mode mode = TYPE_MODE (int_type_node); - if (sync_compare_and_swap_cc[mode] != CODE_FOR_nothing - || sync_compare_and_swap[mode] != CODE_FOR_nothing) + if (sync_compare_and_swap[mode] != CODE_FOR_nothing) { tree addr, stmt; UNMARSHAL5 (orig_call); @@ -324,8 +321,7 @@ compareAndSwapLong_builtin (tree method_return_type ATTRIBUTE_UNUSED, tree orig_call) { enum machine_mode mode = TYPE_MODE (long_type_node); - if (sync_compare_and_swap_cc[mode] != CODE_FOR_nothing - || sync_compare_and_swap[mode] != CODE_FOR_nothing) + if (sync_compare_and_swap[mode] != CODE_FOR_nothing) { tree addr, stmt; UNMARSHAL5 (orig_call); @@ -343,8 +339,7 @@ compareAndSwapObject_builtin (tree method_return_type ATTRIBUTE_UNUSED, tree orig_call) { enum machine_mode mode = TYPE_MODE (ptr_type_node); - if (sync_compare_and_swap_cc[mode] != CODE_FOR_nothing - || sync_compare_and_swap[mode] != CODE_FOR_nothing) + if (sync_compare_and_swap[mode] != CODE_FOR_nothing) { tree addr, stmt; int builtin; @@ -422,8 +417,7 @@ VMSupportsCS8_builtin (tree method_return_type, { enum machine_mode mode = TYPE_MODE (long_type_node); gcc_assert (method_return_type == boolean_type_node); - if (sync_compare_and_swap_cc[mode] != CODE_FOR_nothing - || sync_compare_and_swap[mode] != CODE_FOR_nothing) + if (sync_compare_and_swap[mode] != CODE_FOR_nothing) return boolean_true_node; else return boolean_false_node; |