This patch from Alan Modra fixes a section type conflict error. See also http://gcc.gnu.org/ml/gcc-patches/2012-10/msg02172.html
Test results on PowerPC without this patch: http://gcc.gnu.org/ml/gcc-testresults/2013-02/msg01351.html Test results on PowerPC with this patch: http://gcc.gnu.org/ml/gcc-testresults/2013-02/msg01371.html Test results for x86_64-unknown-linux-gnu with and without this patch: http://gcc.gnu.org/ml/gcc-testresults/2013-02/msg01358.html http://gcc.gnu.org/ml/gcc-testresults/2013-02/msg01376.html The patch has no impact on x86_64-unknown-linux-gnu test results. Alan Modra * varasm.c (default_elf_select_section): Move !DECL_P check.. (get_named_section): ..to here before calling get_section_name. Adjust assertion. (default_section_type_flags): Add DECL_P check. * config/i386/winnt.c (i386_pe_section_type_flags): Likewise. * config/rs6000/rs6000.c (rs6000_xcoff_section_type_flags): * Likewise. --- gcc/config/i386/winnt.c | 2 +- gcc/config/rs6000/rs6000.c | 2 +- gcc/varasm.c | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c index 118b1ec..7e7c155 100644 --- a/gcc/config/i386/winnt.c +++ b/gcc/config/i386/winnt.c @@ -476,7 +476,7 @@ i386_pe_section_type_flags (tree decl, const char *name, int reloc) flags |= SECTION_PE_SHARED; } - if (decl && DECL_ONE_ONLY (decl)) + if (decl && DECL_P (decl) && DECL_ONE_ONLY (decl)) flags |= SECTION_LINKONCE; /* See if we already have an entry for this section. */ diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index fbf57be..bf0cacb 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -25913,7 +25913,7 @@ rs6000_xcoff_section_type_flags (tree decl, const char *name, int reloc) unsigned int flags = default_section_type_flags (decl, name, reloc); /* Align to at least UNIT size. */ - if (flags & SECTION_CODE || !decl) + if ((flags & SECTION_CODE) != 0 || !decl || !DECL_P (decl)) align = MIN_UNITS_PER_WORD; else /* Increase alignment of large objects if not already stricter. */ diff --git a/gcc/varasm.c b/gcc/varasm.c index 6648103..ea709fd 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -402,12 +402,16 @@ get_named_section (tree decl, const char *name, int reloc) { unsigned int flags; - gcc_assert (!decl || DECL_P (decl)); if (name == NULL) - name = TREE_STRING_POINTER (DECL_SECTION_NAME (decl)); + { + gcc_assert (decl && DECL_P (decl) && DECL_SECTION_NAME (decl)); + name = TREE_STRING_POINTER (DECL_SECTION_NAME (decl)); + } flags = targetm.section_type_flags (decl, name, reloc); + if (decl && !DECL_P (decl)) + decl = NULL_TREE; return get_section (name, flags, decl); } @@ -5989,7 +5993,7 @@ default_section_type_flags (tree decl, const char *name, int reloc) flags |= SECTION_RELRO; } - if (decl && DECL_ONE_ONLY (decl)) + if (decl && DECL_P (decl) && DECL_ONE_ONLY (decl)) flags |= SECTION_LINKONCE; if (decl && TREE_CODE (decl) == VAR_DECL && DECL_THREAD_LOCAL_P (decl)) @@ -6348,8 +6352,6 @@ default_elf_select_section (tree decl, int reloc, gcc_unreachable (); } - if (!DECL_P (decl)) - decl = NULL_TREE; return get_named_section (decl, sname, reloc); } -- 1.7.7
