From e06a19b85dfce9ea18be97247d4ca315963edc5c Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 26 Apr 2017 19:24:42 +0000 Subject: Vendor import of lld trunk r301441: https://llvm.org/svn/llvm-project/lld/trunk@301441 --- ELF/OutputSections.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ELF/OutputSections.cpp') diff --git a/ELF/OutputSections.cpp b/ELF/OutputSections.cpp index a40818d2d301..71fc00ac35e7 100644 --- a/ELF/OutputSections.cpp +++ b/ELF/OutputSections.cpp @@ -405,8 +405,10 @@ void OutputSectionFactory::addInputSec(InputSectionBase *IS, OutputSection *&Sec = Map[Key]; if (Sec) { if (getIncompatibleFlags(Sec->Flags) != getIncompatibleFlags(IS->Flags)) - error("Section has flags incompatible with others with the same name " + - toString(IS)); + error("incompatible section flags for " + Sec->Name + + "\n>>> " + toString(IS) + ": 0x" + utohexstr(IS->Flags) + + "\n>>> output section " + Sec->Name + ": 0x" + + utohexstr(Sec->Flags)); if (Sec->Type != IS->Type) { if (canMergeToProgbits(Sec->Type) && canMergeToProgbits(IS->Type)) Sec->Type = SHT_PROGBITS; -- cgit v1.2.3