diff options
| author | Sam Clegg <sbc@chromium.org> | 2017-12-21 03:16:34 +0000 |
|---|---|---|
| committer | Sam Clegg <sbc@chromium.org> | 2017-12-21 03:16:34 +0000 |
| commit | ead036a2de0969d50368a097832c0de0acc0780b (patch) | |
| tree | 2056d6737884cc2a552a865e15f59b2e3429fad9 | |
| parent | 0a1aae823bfcf85dbb616f6c635c94e113090a06 (diff) | |
[WebAssembly] Remove unneeded sub-directory
This is the only wasm def (and likely likely will be
for the foreseeable) file so no need for a sub-directory
Differential Revision: https://reviews.llvm.org/D41476
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@321246 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/BinaryFormat/Wasm.h | 2 | ||||
| -rw-r--r-- | include/llvm/BinaryFormat/WasmRelocs.def (renamed from include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def) | 0 | ||||
| -rw-r--r-- | include/llvm/module.modulemap | 2 | ||||
| -rw-r--r-- | lib/Object/WasmObjectFile.cpp | 2 | ||||
| -rw-r--r-- | lib/ObjectYAML/WasmYAML.cpp | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/include/llvm/BinaryFormat/Wasm.h b/include/llvm/BinaryFormat/Wasm.h index 506cd0393e9..57a0b441821 100644 --- a/include/llvm/BinaryFormat/Wasm.h +++ b/include/llvm/BinaryFormat/Wasm.h @@ -208,7 +208,7 @@ const unsigned WASM_SYMBOL_VISIBILITY_HIDDEN = 0x4; #define WASM_RELOC(name, value) name = value, enum : unsigned { -#include "WasmRelocs/WebAssembly.def" +#include "WasmRelocs.def" }; #undef WASM_RELOC diff --git a/include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def b/include/llvm/BinaryFormat/WasmRelocs.def index d6f0e42b33b..d6f0e42b33b 100644 --- a/include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def +++ b/include/llvm/BinaryFormat/WasmRelocs.def diff --git a/include/llvm/module.modulemap b/include/llvm/module.modulemap index 382942be64a..d8b07c4f54d 100644 --- a/include/llvm/module.modulemap +++ b/include/llvm/module.modulemap @@ -61,7 +61,7 @@ module LLVM_BinaryFormat { textual header "BinaryFormat/ELFRelocs/SystemZ.def" textual header "BinaryFormat/ELFRelocs/x86_64.def" textual header "BinaryFormat/ELFRelocs/WebAssembly.def" - textual header "BinaryFormat/WasmRelocs/WebAssembly.def" + textual header "BinaryFormat/WasmRelocs.def" } module LLVM_Config { requires cplusplus umbrella "Config" module * { export * } } diff --git a/lib/Object/WasmObjectFile.cpp b/lib/Object/WasmObjectFile.cpp index d4c3b736d0e..48f98df6f34 100644 --- a/lib/Object/WasmObjectFile.cpp +++ b/lib/Object/WasmObjectFile.cpp @@ -1026,7 +1026,7 @@ void WasmObjectFile::getRelocationTypeName( break; switch (Rel.Type) { -#include "llvm/BinaryFormat/WasmRelocs/WebAssembly.def" +#include "llvm/BinaryFormat/WasmRelocs.def" } #undef WASM_RELOC diff --git a/lib/ObjectYAML/WasmYAML.cpp b/lib/ObjectYAML/WasmYAML.cpp index 8687f22949a..b2411395dc0 100644 --- a/lib/ObjectYAML/WasmYAML.cpp +++ b/lib/ObjectYAML/WasmYAML.cpp @@ -439,7 +439,7 @@ void ScalarEnumerationTraits<WasmYAML::TableType>::enumeration( void ScalarEnumerationTraits<WasmYAML::RelocType>::enumeration( IO &IO, WasmYAML::RelocType &Type) { #define WASM_RELOC(name, value) IO.enumCase(Type, #name, wasm::name); -#include "llvm/BinaryFormat/WasmRelocs/WebAssembly.def" +#include "llvm/BinaryFormat/WasmRelocs.def" #undef WASM_RELOC } |