From 0e6df31e198fd8c0ab0daacc631de05365c2c216 Mon Sep 17 00:00:00 2001 From: Geoffrey Keating Date: Thu, 5 Aug 2004 05:52:01 +0000 Subject: re PR c/14516 (-fleading-underscore does not work correctly for file static variables) 2004-08-04 Geoffrey Keating PR 14516 * c-common.c (c_expand_decl): Don't special-case static VAR_DECLs. * c-common.h (make_rtl_for_local_static): Delete. * c-decl.c (shadow_tag_warned): Clean up comment. (finish_decl): Clean up spacing. Use set_user_assembler_name when appropriate. Don't pass asmspec to rest_of_decl_compilation. * c-semantics.c (make_rtl_for_local_static): Delete. * expr.c (init_block_move_fn): Use set_user_assembler_name. (init_block_clear_fn): Likewise. * passes.c (rest_of_decl_compilation): Remove asmspec parameter, expect it to be in DECL_ASSEMBLER_NAME. Update callers in many files. * toplev.h (rest_of_decl_compilation): Remove asmspec parameter. * tree.h (make_decl_rtl): Remove second parameter. (set_user_assembler_name): New. * varasm.c (set_user_assembler_name): New. (make_decl_rtl): Remove second parameter. Update callers in many files. Index: cp/ChangeLog 2004-08-04 Geoffrey Keating * decl.c (make_rtl_for_nonlocal_decl): Set DECL_ASSEMBLER_NAME rather than passing it as a parameter to rest_of_decl_compilation. * decl2.c (grokfield): Use set_user_assembler_name. From-SVN: r85593 --- gcc/java/resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gcc/java/resource.c') diff --git a/gcc/java/resource.c b/gcc/java/resource.c index 512b903..6257d37 100644 --- a/gcc/java/resource.c +++ b/gcc/java/resource.c @@ -91,8 +91,8 @@ compile_resource_data (const char *name, const char *buffer, int length) DECL_INITIAL (decl) = rinit; layout_decl (decl, 0); pushdecl (decl); - rest_of_decl_compilation (decl, (char*) 0, global_bindings_p (), 0); - make_decl_rtl (decl, (char*) 0); + rest_of_decl_compilation (decl, global_bindings_p (), 0); + make_decl_rtl (decl); assemble_variable (decl, 1, 0, 0); resources = tree_cons (NULL_TREE, decl, resources); -- cgit v1.1