aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
authorJohn David Anglin <dave.anglin@nrc-cnrc.gc.ca>2012-05-21 16:27:40 +0000
committerJohn David Anglin <danglin@gcc.gnu.org>2012-05-21 16:27:40 +0000
commitbbe9ae518072d74bd5c1d8c0b365d9037b0c9ecb (patch)
tree8901d311e20a5c58a891745c3b7d84b0d45e8a1c /gcc/java
parentce863f5d61eaa275789930a5e41058531b3fb5e9 (diff)
downloadgcc-bbe9ae518072d74bd5c1d8c0b365d9037b0c9ecb.zip
gcc-bbe9ae518072d74bd5c1d8c0b365d9037b0c9ecb.tar.gz
gcc-bbe9ae518072d74bd5c1d8c0b365d9037b0c9ecb.tar.bz2
re PR java/52815 (class.c:2815:53: error: 'JCR_SECTION_NAME' was not declared in this scope)
PR java/52815 * class.c (emit_register_classes_in_jcr_section): Revise placement of #ifdef JCR_SECTION_NAME. From-SVN: r187724
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog6
-rw-r--r--gcc/java/class.c12
2 files changed, 12 insertions, 6 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 532a6bf..7869441 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 33a3999..268a06b 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
}