diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 4 | ||||
| -rw-r--r-- | gcc/cp/vtable-class-hierarchy.c | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 70156eb..df9f3b9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-06-11 Jan Hubicka <hubicka@ucw.cz> + + * vtable-class-hierarchy.c: Update handling for section names + that are no longer trees. + * decl.c (duplicate_decls): Likewise. + 2014-06-11 Paolo Carlini <paolo.carlini@oracle.com> PR c++/19200 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 08f621a..fba0cc9 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2020,8 +2020,8 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend) done later in decl_attributes since we are called before attributes are assigned. */ if ((DECL_EXTERNAL (olddecl) || TREE_PUBLIC (olddecl) || TREE_STATIC (olddecl)) - && DECL_SECTION_NAME (newdecl) == NULL_TREE - && DECL_SECTION_NAME (olddecl) != NULL_TREE) + && DECL_SECTION_NAME (newdecl) == NULL + && DECL_SECTION_NAME (olddecl) != NULL) set_decl_section_name (newdecl, DECL_SECTION_NAME (olddecl)); if (TREE_CODE (newdecl) == FUNCTION_DECL) diff --git a/gcc/cp/vtable-class-hierarchy.c b/gcc/cp/vtable-class-hierarchy.c index 15a8a1c..b481273 100644 --- a/gcc/cp/vtable-class-hierarchy.c +++ b/gcc/cp/vtable-class-hierarchy.c @@ -1247,8 +1247,7 @@ vtable_find_or_create_map_decl (tree base_type) /* Put these mmap variables in thr .vtable_map_vars section, so we can find and protect them. */ - set_decl_section_name (var_decl, build_string (strlen (".vtable_map_vars"), - ".vtable_map_vars")); + set_decl_section_name (var_decl, ".vtable_map_vars"); symtab_get_node (var_decl)->implicit_section = true; DECL_INITIAL (var_decl) = initial_value; |