[llvm] r321246 - [WebAssembly] Remove unneeded sub-directory

[Sam Clegg via llvm-commits]

Author: sbc
Date: Wed Dec 20 19:16:34 2017
New Revision: 321246

URL: http://llvm.org/viewvc/llvm-project?rev=321246&view=rev
Log:
[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

Added:
    llvm/trunk/include/llvm/BinaryFormat/WasmRelocs.def   (contents, props changed)
      - copied, changed from r321243, llvm/trunk/include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def
Removed:
    llvm/trunk/include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def
Modified:
    llvm/trunk/include/llvm/BinaryFormat/Wasm.h
    llvm/trunk/include/llvm/module.modulemap
    llvm/trunk/lib/Object/WasmObjectFile.cpp
    llvm/trunk/lib/ObjectYAML/WasmYAML.cpp

Modified: llvm/trunk/include/llvm/BinaryFormat/Wasm.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/BinaryFormat/Wasm.h?rev=321246&r1=321245&r2=321246&view=diff
==============================================================================
--- llvm/trunk/include/llvm/BinaryFormat/Wasm.h (original)
+++ llvm/trunk/include/llvm/BinaryFormat/Wasm.h Wed Dec 20 19:16:34 2017
@@ -208,7 +208,7 @@ const unsigned WASM_SYMBOL_VISIBILITY_HI
 #define WASM_RELOC(name, value) name = value,
 
 enum : unsigned {
-#include "WasmRelocs/WebAssembly.def"
+#include "WasmRelocs.def"
 };
 
 #undef WASM_RELOC

Copied: llvm/trunk/include/llvm/BinaryFormat/WasmRelocs.def (from r321243, llvm/trunk/include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/BinaryFormat/WasmRelocs.def?p2=llvm/trunk/include/llvm/BinaryFormat/WasmRelocs.def&p1=llvm/trunk/include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def&r1=321243&r2=321246&rev=321246&view=diff
==============================================================================
    (empty)

Propchange: llvm/trunk/include/llvm/BinaryFormat/WasmRelocs.def
------------------------------------------------------------------------------
    svn:eol-style = LF

Removed: llvm/trunk/include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def?rev=321245&view=auto
==============================================================================
--- llvm/trunk/include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def (original)
+++ llvm/trunk/include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def (removed)
@@ -1,13 +0,0 @@
-
-#ifndef WASM_RELOC
-#error "WASM_RELOC must be defined"
-#endif
-
-WASM_RELOC(R_WEBASSEMBLY_FUNCTION_INDEX_LEB,   0)
-WASM_RELOC(R_WEBASSEMBLY_TABLE_INDEX_SLEB,     1)
-WASM_RELOC(R_WEBASSEMBLY_TABLE_INDEX_I32,      2)
-WASM_RELOC(R_WEBASSEMBLY_MEMORY_ADDR_LEB,      3)
-WASM_RELOC(R_WEBASSEMBLY_MEMORY_ADDR_SLEB,     4)
-WASM_RELOC(R_WEBASSEMBLY_MEMORY_ADDR_I32,      5)
-WASM_RELOC(R_WEBASSEMBLY_TYPE_INDEX_LEB,       6)
-WASM_RELOC(R_WEBASSEMBLY_GLOBAL_INDEX_LEB,     7)

Modified: llvm/trunk/include/llvm/module.modulemap
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/module.modulemap?rev=321246&r1=321245&r2=321246&view=diff
==============================================================================
--- llvm/trunk/include/llvm/module.modulemap (original)
+++ llvm/trunk/include/llvm/module.modulemap Wed Dec 20 19:16:34 2017
@@ -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 * } }

Modified: llvm/trunk/lib/Object/WasmObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/WasmObjectFile.cpp?rev=321246&r1=321245&r2=321246&view=diff
==============================================================================
--- llvm/trunk/lib/Object/WasmObjectFile.cpp (original)
+++ llvm/trunk/lib/Object/WasmObjectFile.cpp Wed Dec 20 19:16:34 2017
@@ -1026,7 +1026,7 @@ void WasmObjectFile::getRelocationTypeNa
     break;
 
   switch (Rel.Type) {
-#include "llvm/BinaryFormat/WasmRelocs/WebAssembly.def"
+#include "llvm/BinaryFormat/WasmRelocs.def"
   }
 
 #undef WASM_RELOC

Modified: llvm/trunk/lib/ObjectYAML/WasmYAML.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/WasmYAML.cpp?rev=321246&r1=321245&r2=321246&view=diff
==============================================================================
--- llvm/trunk/lib/ObjectYAML/WasmYAML.cpp (original)
+++ llvm/trunk/lib/ObjectYAML/WasmYAML.cpp Wed Dec 20 19:16:34 2017
@@ -439,7 +439,7 @@ void ScalarEnumerationTraits<WasmYAML::T
 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
 }