From 8bc7a740215a43a3189aeeb5caa8381582cf5816 Mon Sep 17 00:00:00 2001 From: Mohan Embar Date: Wed, 26 Nov 2003 01:34:32 +0000 Subject: [PATCH] re PR middle-end/12548 ([non-weak] gcj now failes to compile included example) PR java/12548 * resource.c (write_resource_constructor): Append "_resource" to constructor identifier name. From-SVN: r73940 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/resource.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 1a34e36a6a7..695f317b8dd 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2003-11-25 Mohan Embar + + PR java/12548 + * resource.c (write_resource_constructor): Append + "_resource" to constructor identifier name. + 2003-11-25 Jeff Sturm Fix PR java/13183. diff --git a/gcc/java/resource.c b/gcc/java/resource.c index b71a6709f5e..5d4b72a13ae 100644 --- a/gcc/java/resource.c +++ b/gcc/java/resource.c @@ -105,12 +105,16 @@ write_resource_constructor (void) tree init_name, init_type, init_decl; tree iter; location_t saved_loc = input_location; + char *resource_ctor_name; /* Only do work if required. */ if (resources == NULL_TREE) return; - init_name = get_file_function_name ('I'); + resource_ctor_name = concat (IDENTIFIER_POINTER (get_file_function_name ('I')), + "_resource", NULL); + init_name = get_identifier (resource_ctor_name); + free (resource_ctor_name); init_type = build_function_type (void_type_node, end_params_node); init_decl = build_decl (FUNCTION_DECL, init_name, init_type);