[lld][WebAssembly] Allow linking of pic code into static binaries
Summary: See https://github.com/emscripten-core/emscripten/issues/9013
Subscribers: dschuff, jgravelle-google, aheejin, sunfish, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65922
llvm-svn: 368719
diff --git a/lld/wasm/Writer.cpp b/lld/wasm/Writer.cpp
index 2e1af22..5a3b629 100644
--- a/lld/wasm/Writer.cpp
+++ b/lld/wasm/Writer.cpp
@@ -226,7 +226,9 @@
}
if (WasmSym::globalBase)
- WasmSym::globalBase->setVirtualAddress(config->globalBase);
+ WasmSym::globalBase->setVirtualAddress(memoryPtr);
+ if (WasmSym::definedMemoryBase)
+ WasmSym::definedMemoryBase->setVirtualAddress(memoryPtr);
uint32_t dataStart = memoryPtr;
@@ -617,6 +619,8 @@
for (InputEvent *event : file->events)
out.eventSec->addEvent(event);
}
+
+ out.globalSec->assignIndexes();
}
static StringRef getOutputDataSegmentName(StringRef name) {
@@ -862,8 +866,11 @@
// For PIC code the table base is assigned dynamically by the loader.
// For non-PIC, we start at 1 so that accessing table index 0 always traps.
- if (!config->isPic)
+ if (!config->isPic) {
tableBase = 1;
+ if (WasmSym::definedTableBase)
+ WasmSym::definedTableBase->setVirtualAddress(tableBase);
+ }
log("-- createOutputSegments");
createOutputSegments();