diff options
| author | Sam Clegg <sbc@chromium.org> | 2017-09-01 17:32:01 +0000 |
|---|---|---|
| committer | Sam Clegg <sbc@chromium.org> | 2017-09-01 17:32:01 +0000 |
| commit | 13a2e899265be4ddf72e77ea697f451c580a09e2 (patch) | |
| tree | add24c5c33002cea98c722058a2d0c9d89b6d641 /llvm/lib/MC | |
| parent | f483817fc1c63dc3418c976790c7da6cdf54f423 (diff) | |
| download | bcm5719-llvm-13a2e899265be4ddf72e77ea697f451c580a09e2.tar.gz bcm5719-llvm-13a2e899265be4ddf72e77ea697f451c580a09e2.zip | |
[WebAssembly] Update relocation names to match spec
Summary: See https://github.com/WebAssembly/tool-conventions/blob/master/Linking.md
Differential Revision: https://reviews.llvm.org/D37385
llvm-svn: 312342
Diffstat (limited to 'llvm/lib/MC')
| -rw-r--r-- | llvm/lib/MC/WasmObjectWriter.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/llvm/lib/MC/WasmObjectWriter.cpp b/llvm/lib/MC/WasmObjectWriter.cpp index 0d31f65c49d..35d9a58f6d3 100644 --- a/llvm/lib/MC/WasmObjectWriter.cpp +++ b/llvm/lib/MC/WasmObjectWriter.cpp @@ -142,9 +142,9 @@ struct WasmRelocationEntry { bool hasAddend() const { switch (Type) { - case wasm::R_WEBASSEMBLY_GLOBAL_ADDR_LEB: - case wasm::R_WEBASSEMBLY_GLOBAL_ADDR_SLEB: - case wasm::R_WEBASSEMBLY_GLOBAL_ADDR_I32: + case wasm::R_WEBASSEMBLY_MEMORY_ADDR_LEB: + case wasm::R_WEBASSEMBLY_MEMORY_ADDR_SLEB: + case wasm::R_WEBASSEMBLY_MEMORY_ADDR_I32: return true; default: return false; @@ -495,9 +495,9 @@ uint32_t WasmObjectWriter::getRelocationIndexValue( return IndirectSymbolIndices[RelEntry.Symbol]; case wasm::R_WEBASSEMBLY_FUNCTION_INDEX_LEB: case wasm::R_WEBASSEMBLY_GLOBAL_INDEX_LEB: - case wasm::R_WEBASSEMBLY_GLOBAL_ADDR_LEB: - case wasm::R_WEBASSEMBLY_GLOBAL_ADDR_SLEB: - case wasm::R_WEBASSEMBLY_GLOBAL_ADDR_I32: + case wasm::R_WEBASSEMBLY_MEMORY_ADDR_LEB: + case wasm::R_WEBASSEMBLY_MEMORY_ADDR_SLEB: + case wasm::R_WEBASSEMBLY_MEMORY_ADDR_I32: if (!SymbolIndices.count(RelEntry.Symbol)) report_fatal_error("symbol not found function/global index space: " + RelEntry.Symbol->getName()); @@ -537,17 +537,17 @@ void WasmObjectWriter::applyRelocations( WriteI32(Stream, Index, Offset); break; } - case wasm::R_WEBASSEMBLY_GLOBAL_ADDR_SLEB: { + case wasm::R_WEBASSEMBLY_MEMORY_ADDR_SLEB: { uint32_t Value = ProvisionalValue(RelEntry); WritePatchableSLEB(Stream, Value, Offset); break; } - case wasm::R_WEBASSEMBLY_GLOBAL_ADDR_LEB: { + case wasm::R_WEBASSEMBLY_MEMORY_ADDR_LEB: { uint32_t Value = ProvisionalValue(RelEntry); WritePatchableLEB(Stream, Value, Offset); break; } - case wasm::R_WEBASSEMBLY_GLOBAL_ADDR_I32: { + case wasm::R_WEBASSEMBLY_MEMORY_ADDR_I32: { uint32_t Value = ProvisionalValue(RelEntry); WriteI32(Stream, Value, Offset); break; @@ -967,7 +967,7 @@ void WasmObjectWriter::writeObject(MCAssembler &Asm, for (const WasmRelocationEntry &RelEntry : CodeRelocations) { switch (RelEntry.Type) { case wasm::R_WEBASSEMBLY_TABLE_INDEX_SLEB: - case wasm::R_WEBASSEMBLY_GLOBAL_ADDR_SLEB: + case wasm::R_WEBASSEMBLY_MEMORY_ADDR_SLEB: IsAddressTaken.insert(RelEntry.Symbol); break; default: @@ -977,7 +977,7 @@ void WasmObjectWriter::writeObject(MCAssembler &Asm, for (const WasmRelocationEntry &RelEntry : DataRelocations) { switch (RelEntry.Type) { case wasm::R_WEBASSEMBLY_TABLE_INDEX_I32: - case wasm::R_WEBASSEMBLY_GLOBAL_ADDR_I32: + case wasm::R_WEBASSEMBLY_MEMORY_ADDR_I32: IsAddressTaken.insert(RelEntry.Symbol); break; default: |
