aboutsummaryrefslogtreecommitdiffstats
path: root/ELF/OutputSections.cpp
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-04-26 19:24:42 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-04-26 19:24:42 +0000
commite06a19b85dfce9ea18be97247d4ca315963edc5c (patch)
treeea315682e394f1c39a30049e4497e1a723f18e3c /ELF/OutputSections.cpp
parentbe08ec96063be8c1a1a8621eccd05a4ebeecfb42 (diff)
downloadsrc-e06a19b85dfce9ea18be97247d4ca315963edc5c.tar.gz
src-e06a19b85dfce9ea18be97247d4ca315963edc5c.zip
Vendor import of lld trunk r301441:vendor/lld/lld-trunk-r301441
Notes
Notes: svn path=/vendor/lld/dist/; revision=317453 svn path=/vendor/lld/lld-trunk-r301441/; revision=317454; tag=vendor/lld/lld-trunk-r301441
Diffstat (limited to 'ELF/OutputSections.cpp')
-rw-r--r--ELF/OutputSections.cpp6
1 files changed, 4 insertions, 2 deletions
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;