authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-12-04 11:42:22-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-12-04 11:42:22-05:00
log9ac838c8e3f5c3e77533e30f72bac30487b9ae23
treeadfa076911a7d1879b349a8b1d6a89cf21464fd8
parent3a1612a0f5a41f5cfc9598dc4512b43ee17d030a
signature Commit is signed but in an unrecognized format.

LLD patch: allow non-allocated sections to go into allocated sections

Patch submitted upstream: https://reviews.llvm.org/D55276

1 files changed, 1 insertions(+), 1 deletions(-)

deps/lld/ELF/OutputSections.cpp+1-1
...@@ -95,7 +95,7 @@ void OutputSection::addSection(InputSection *IS) {...@@ -95,7 +95,7 @@ void OutputSection::addSection(InputSection *IS) {
95 Flags = IS->Flags;95 Flags = IS->Flags;
96 } else {96 } else {
97 // Otherwise, check if new type or flags are compatible with existing ones.97 // Otherwise, check if new type or flags are compatible with existing ones.
98 unsigned Mask = SHF_ALLOC | SHF_TLS | SHF_LINK_ORDER;98 unsigned Mask = SHF_TLS | SHF_LINK_ORDER;
99 if ((Flags & Mask) != (IS->Flags & Mask))99 if ((Flags & Mask) != (IS->Flags & Mask))
100 error("incompatible section flags for " + Name + "\n>>> " + toString(IS) +100 error("incompatible section flags for " + Name + "\n>>> " + toString(IS) +
101 ": 0x" + utohexstr(IS->Flags) + "\n>>> output section " + Name +101 ": 0x" + utohexstr(IS->Flags) + "\n>>> output section " + Name +