diff options
| -rw-r--r-- | lld/wasm/InputFiles.cpp | 17 | ||||
| -rw-r--r-- | lld/wasm/Writer.cpp | 6 |
2 files changed, 15 insertions, 8 deletions
diff --git a/lld/wasm/InputFiles.cpp b/lld/wasm/InputFiles.cpp index 99314953248..e7463da39db 100644 --- a/lld/wasm/InputFiles.cpp +++ b/lld/wasm/InputFiles.cpp @@ -139,6 +139,14 @@ InputSegment *ObjFile::getSegment(const WasmSymbol &WasmSym) { return nullptr; } +static void copyRelocationsRange(std::vector<WasmRelocation> &To, + ArrayRef<WasmRelocation> From, size_t Start, + size_t End) { + for (const WasmRelocation &R : From) + if (R.Offset >= Start && R.Offset < End) + To.push_back(R); +} + void ObjFile::initializeSymbols() { Symbols.reserve(WasmObj->getNumberOfSymbols()); @@ -156,8 +164,13 @@ void ObjFile::initializeSymbols() { FunctionSymbols.resize(FunctionImports + WasmObj->functions().size()); GlobalSymbols.resize(GlobalImports + WasmObj->globals().size()); - for (const WasmSegment &Seg : WasmObj->dataSegments()) - Segments.emplace_back(make<InputSegment>(&Seg, this)); + for (const WasmSegment &S : WasmObj->dataSegments()) { + InputSegment *Seg = make<InputSegment>(&S, this); + copyRelocationsRange(Seg->Relocations, DataSection->Relocations, + Seg->getInputSectionOffset(), + Seg->getInputSectionOffset() + Seg->getSize()); + Segments.emplace_back(Seg); + } // Populate `FunctionSymbols` and `GlobalSymbols` based on the WasmSymbols // in the object diff --git a/lld/wasm/Writer.cpp b/lld/wasm/Writer.cpp index 17f0bc46014..61ac54a3e4b 100644 --- a/lld/wasm/Writer.cpp +++ b/lld/wasm/Writer.cpp @@ -646,12 +646,6 @@ void Writer::createOutputSegments() { } S->addInputSegment(Segment); DEBUG(dbgs() << "added data: " << Name << ": " << S->Size << "\n"); - for (const WasmRelocation &R : File->DataSection->Relocations) { - if (R.Offset >= Segment->getInputSectionOffset() && - R.Offset < Segment->getInputSectionOffset() + Segment->getSize()) { - Segment->Relocations.push_back(R); - } - } } } } |
