From a95cd5a0d46e37922e5a0c5eb4cd4d22bc21da29 Mon Sep 17 00:00:00 2001 From: Roger Sayle Date: Thu, 22 Apr 2004 15:46:09 +0000 Subject: [PATCH] resource.c (write_resource_constructor): Guard call to possibly NULL targetm.asm_out.constructor with... * resource.c (write_resource_constructor): Guard call to possibly NULL targetm.asm_out.constructor with targetm.have_ctors_dtors. From-SVN: r81012 --- gcc/java/ChangeLog | 5 +++++ gcc/java/resource.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index e2933a8dcb4..17e6794d31c 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2004-04-22 Roger Sayle + + * resource.c (write_resource_constructor): Guard call to possibly + NULL targetm.asm_out.constructor with targetm.have_ctors_dtors. + 2004-04-19 Bryce McKinlay * class.c (make_class_data): Add new field aux_info. diff --git a/gcc/java/resource.c b/gcc/java/resource.c index 5d4b72a13ae..bc2860dfd1f 100644 --- a/gcc/java/resource.c +++ b/gcc/java/resource.c @@ -129,6 +129,9 @@ write_resource_constructor (void) to scan the object file to find its ctor/dtor routine. */ TREE_PUBLIC (init_decl) = ! targetm.have_ctors_dtors; + /* Suppress spurious warnings. */ + TREE_USED (init_decl) = 1; + pushlevel (0); make_decl_rtl (init_decl, NULL); init_function_start (init_decl); @@ -156,8 +159,9 @@ write_resource_constructor (void) flag_inline_functions = saved_flag; } current_function_decl = NULL_TREE; - (* targetm.asm_out.constructor) (XEXP (DECL_RTL (init_decl), 0), - DEFAULT_INIT_PRIORITY); + if (targetm.have_ctors_dtors) + targetm.asm_out.constructor (XEXP (DECL_RTL (init_decl), 0), + DEFAULT_INIT_PRIORITY); input_location = saved_loc; } -- 2.30.2