diff options
| author | danglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-21 16:27:40 +0000 |
|---|---|---|
| committer | danglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-21 16:27:40 +0000 |
| commit | ee7897ee67e3375a58ff2800b097d3da3dbd59a9 (patch) | |
| tree | 8901d311e20a5c58a891745c3b7d84b0d45e8a1c | |
| parent | 6a17c9e0718fff61ea7388747865740678c564d4 (diff) | |
| download | gcc-ee7897ee67e3375a58ff2800b097d3da3dbd59a9.tar.gz | |
PR java/52815
* class.c (emit_register_classes_in_jcr_section): Revise placement
of #ifdef JCR_SECTION_NAME.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187724 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/class.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 532a6bf26ee..78694410527 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2012-05-21 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + PR java/52815 + * class.c (emit_register_classes_in_jcr_section): Revise placement + of #ifdef JCR_SECTION_NAME. + 2012-04-22 Jan Hubicka <jh@suse.cz> * class.c (build_utf8_ref): Do not mark varpool node as needed. diff --git a/gcc/java/class.c b/gcc/java/class.c index 33a39998034..268a06ba59c 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -2789,17 +2789,12 @@ emit_indirect_register_classes (tree *list_p) static void emit_register_classes_in_jcr_section (void) { +#ifdef JCR_SECTION_NAME tree klass, cdecl, class_array_type; int i; int size = VEC_length (tree, registered_class); VEC(constructor_elt,gc) *init = VEC_alloc (constructor_elt, gc, size); -#ifndef JCR_SECTION_NAME - /* A target has defined TARGET_USE_JCR_SECTION, - but doesn't have a JCR_SECTION_NAME. */ - gcc_unreachable (); -#endif - FOR_EACH_VEC_ELT (tree, registered_class, i, klass) CONSTRUCTOR_APPEND_ELT (init, NULL_TREE, build_fold_addr_expr (klass)); @@ -2825,6 +2820,11 @@ emit_register_classes_in_jcr_section (void) relayout_decl (cdecl); rest_of_decl_compilation (cdecl, 1, 0); mark_decl_referenced (cdecl); +#else + /* A target has defined TARGET_USE_JCR_SECTION, + but doesn't have a JCR_SECTION_NAME. */ + gcc_unreachable (); +#endif } |