diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/varasm.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 820bcbd..1c9fa02 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2011-06-08 Andi Kleen <ak@linux.intel.com> + * varasm.c (get_section): Print location of other conflict + for section conflicts. + +2011-06-08 Andi Kleen <ak@linux.intel.com> + * config/i386/driver-i386.c (host_detect_local_cpu): Add model 0x2d Intel CPU. diff --git a/gcc/varasm.c b/gcc/varasm.c index 3311c86..a0a0582 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -313,7 +313,11 @@ get_section (const char *name, unsigned int flags, tree decl) if (decl == 0) decl = sect->named.decl; gcc_assert (decl); - error ("%+D causes a section type conflict", decl); + error ("%+D causes a section type conflict with %D", + decl, sect->named.decl); + if (decl != sect->named.decl) + inform (DECL_SOURCE_LOCATION (sect->named.decl), + "%qD was declared here", sect->named.decl); /* Make sure we don't error about one section multiple times. */ sect->common.flags |= SECTION_OVERRIDE; } |