Skip to content

R
riscv-gcc-1
Commit 3895ec53 by Jakub Jelinek Committed by Jakub Jelinek
Options

re PR c++/44059 (Static initializers executed more than once when using unique global symbols) 

	PR c++/44059
	* config/elfos.h (ASM_DECLARE_OBJECT_NAME): Use qnu_unique_object
	even for DECL_ONE_ONLY DECL_ARTIFICIAL !TREE_READONLY decls.
	* config/alpha/elf.h (ASM_DECLARE_OBJECT_NAME): Likewise.
	* dwarf2asm.c (dw2_output_indirect_constant_1): Set TREE_READONLY
	on DW.ref.* decls.

From-SVN: r159287
parent 056928b2
Showing with 23 additions and 11 deletions
gcc/ChangeLog
2010-05-11 Jakub Jelinek <jakub@redhat.com>
PR c++/44059
* config/elfos.h (ASM_DECLARE_OBJECT_NAME): Use qnu_unique_object
even for DECL_ONE_ONLY DECL_ARTIFICIAL !TREE_READONLY decls.
* config/alpha/elf.h (ASM_DECLARE_OBJECT_NAME): Likewise.
* dwarf2asm.c (dw2_output_indirect_constant_1): Set TREE_READONLY
on DW.ref.* decls.
PR c++/44062
* c-parser.c (c_parser_expression): Mark LHS of a comma
expression as read if it is a decl, handled component or
......
gcc/config/alpha/elf.h
/* Definitions of target machine for GNU compiler, for DEC Alpha w/ELF.
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2007, 2008,
2009 Free Software Foundation, Inc.
2009, 2010 Free Software Foundation, Inc.
Contributed by Richard Henderson (rth@tamu.edu).
This file is part of GCC.
......@@ -284,10 +284,12 @@ do { \
HOST_WIDE_INT size; \
\
/* For template static data member instantiations or \
inline fn local statics, use gnu_unique_object so that \
they will be combined even under RTLD_LOCAL. */ \
if (USE_GNU_UNIQUE_OBJECT \
&& !DECL_ARTIFICIAL (DECL) && DECL_ONE_ONLY (DECL)) \
inline fn local statics and their guard variables, use \
gnu_unique_object so that they will be combined even under \
RTLD_LOCAL. Don't use gnu_unique_object for typeinfo, \
vtables and other read-only artificial decls. */ \
if (USE_GNU_UNIQUE_OBJECT && DECL_ONE_ONLY (DECL) \
&& (!DECL_ARTIFICIAL (DECL) || !TREE_READONLY (DECL))) \
ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "gnu_unique_object"); \
else \
ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \
......
gcc/config/elfos.h
/* elfos.h -- operating system specific defines to be used when
targeting GCC for some generic ELF system
Copyright (C) 1991, 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2004,
2007, 2009 Free Software Foundation, Inc.
2007, 2009, 2010 Free Software Foundation, Inc.
Based on svr4.h contributed by Ron Guilmette (rfg@netcom.com).
This file is part of GCC.
......@@ -301,10 +301,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
HOST_WIDE_INT size; \
\
/* For template static data member instantiations or \
inline fn local statics, use gnu_unique_object so that \
they will be combined even under RTLD_LOCAL. */ \
if (USE_GNU_UNIQUE_OBJECT \
&& !DECL_ARTIFICIAL (DECL) && DECL_ONE_ONLY (DECL)) \
inline fn local statics and their guard variables, use \
gnu_unique_object so that they will be combined even under \
RTLD_LOCAL. Don't use gnu_unique_object for typeinfo, \
vtables and other read-only artificial decls. */ \
if (USE_GNU_UNIQUE_OBJECT && DECL_ONE_ONLY (DECL) \
&& (!DECL_ARTIFICIAL (DECL) || !TREE_READONLY (DECL))) \
ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "gnu_unique_object"); \
else \
ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object"); \
......
gcc/dwarf2asm.c
/* Dwarf2 assembler output helper routines.
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
This file is part of GCC.
......@@ -877,6 +877,7 @@ dw2_output_indirect_constant_1 (splay_tree_node node,
DECL_ARTIFICIAL (decl) = 1;
DECL_IGNORED_P (decl) = 1;
DECL_INITIAL (decl) = decl;
TREE_READONLY (decl) = 1;
if (TREE_PUBLIC (id))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment