From 86f27ba678fb1db724b0cc1dba3576f8ff0647e0 Mon Sep 17 00:00:00 2001 From: Dinar Temirbulatov Date: Thu, 18 Nov 2010 01:54:05 +0300 Subject: [PATCH] re PR middle-end/31490 (Compile error section type conflict) 2010-11-17 Dinar Temirbulatov Steve Ellcey PR middle-end/31490 * varasm.c (categorize_decl_for_section): Ignore reloc_rw_mask if section attribute used. Co-Authored-By: Steve Ellcey From-SVN: r166887 --- gcc/ChangeLog | 7 +++++++ gcc/varasm.c | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d21e2e96d4e1..162295b15c72 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2010-11-17 Dinar Temirbulatov + Steve Ellcey + + PR middle-end/31490 + * varasm.c (categorize_decl_for_section): Ignore reloc_rw_mask + if section attribute used. + 2010-11-17 Jan Hubicka * builtins.c (expand_builtin_mathfn_2, expand_builtin_mathfn): Do not diff --git a/gcc/varasm.c b/gcc/varasm.c index 215e0edbd592..6171e30799a1 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -6102,13 +6102,17 @@ categorize_decl_for_section (const_tree decl, int reloc) /* Here the reloc_rw_mask is not testing whether the section should be read-only or not, but whether the dynamic link will have to do something. If so, we wish to segregate the data in order to - minimize cache misses inside the dynamic linker. */ - if (reloc & targetm.asm_out.reloc_rw_mask ()) + minimize cache misses inside the dynamic linker. If the data + has a section attribute, ignore reloc_rw_mask() so that all data + in a given named section is catagorized in the same way. */ + if (reloc & targetm.asm_out.reloc_rw_mask () + && !lookup_attribute ("section", DECL_ATTRIBUTES (decl))) ret = reloc == 1 ? SECCAT_DATA_REL_LOCAL : SECCAT_DATA_REL; else ret = SECCAT_DATA; } - else if (reloc & targetm.asm_out.reloc_rw_mask ()) + else if (reloc & targetm.asm_out.reloc_rw_mask () + && !lookup_attribute ("section", DECL_ATTRIBUTES (decl))) ret = reloc == 1 ? SECCAT_DATA_REL_RO_LOCAL : SECCAT_DATA_REL_RO; else if (reloc || flag_merge_constants < 2) /* C and C++ don't allow different variables to share the same