diff --git a/lld/wasm/SyntheticSections.h b/lld/wasm/SyntheticSections.h index 335bfe843184a9..079de93492f1fd 100644 --- a/lld/wasm/SyntheticSections.h +++ b/lld/wasm/SyntheticSections.h @@ -19,7 +19,7 @@ #include "llvm/ADT/SmallSet.h" #include "llvm/ADT/StringMap.h" -#include "llvm/Object/WasmTraits.h" +#include "llvm/BinaryFormat/WasmTraits.h" #define DEBUG_TYPE "lld" diff --git a/lld/wasm/Writer.cpp b/lld/wasm/Writer.cpp index 3d4941747bbc94..90dd96bd1c894a 100644 --- a/lld/wasm/Writer.cpp +++ b/lld/wasm/Writer.cpp @@ -26,7 +26,7 @@ #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringMap.h" #include "llvm/BinaryFormat/Wasm.h" -#include "llvm/Object/WasmTraits.h" +#include "llvm/BinaryFormat/WasmTraits.h" #include "llvm/Support/FileOutputBuffer.h" #include "llvm/Support/Format.h" #include "llvm/Support/FormatVariadic.h" diff --git a/llvm/include/llvm/Object/WasmTraits.h b/llvm/include/llvm/BinaryFormat/WasmTraits.h similarity index 94% rename from llvm/include/llvm/Object/WasmTraits.h rename to llvm/include/llvm/BinaryFormat/WasmTraits.h index 3eee8e71b1876a..e34182499187fc 100644 --- a/llvm/include/llvm/Object/WasmTraits.h +++ b/llvm/include/llvm/BinaryFormat/WasmTraits.h @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_OBJECT_WASMTRAITS_H -#define LLVM_OBJECT_WASMTRAITS_H +#ifndef LLVM_BINARYFORMAT_WASMTRAITS_H +#define LLVM_BINARYFORMAT_WASMTRAITS_H #include "llvm/ADT/Hashing.h" #include "llvm/BinaryFormat/Wasm.h" @@ -65,4 +65,4 @@ template <> struct DenseMapInfo { } // end namespace llvm -#endif // LLVM_OBJECT_WASMTRAITS_H +#endif // LLVM_BINARYFORMAT_WASMTRAITS_H diff --git a/llvm/lib/MC/WasmObjectWriter.cpp b/llvm/lib/MC/WasmObjectWriter.cpp index aad81b74f7c040..a0e65aa6108aba 100644 --- a/llvm/lib/MC/WasmObjectWriter.cpp +++ b/llvm/lib/MC/WasmObjectWriter.cpp @@ -13,6 +13,7 @@ #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/BinaryFormat/Wasm.h" +#include "llvm/BinaryFormat/WasmTraits.h" #include "llvm/Config/llvm-config.h" #include "llvm/MC/MCAsmBackend.h" #include "llvm/MC/MCAsmLayout.h" @@ -25,7 +26,6 @@ #include "llvm/MC/MCSymbolWasm.h" #include "llvm/MC/MCValue.h" #include "llvm/MC/MCWasmObjectWriter.h" -#include "llvm/Object/WasmTraits.h" #include "llvm/Support/Casting.h" #include "llvm/Support/Debug.h" #include "llvm/Support/EndianStream.h"