diff options
Diffstat (limited to 'lld')
36 files changed, 55 insertions, 52 deletions
diff --git a/lld/docs/Readers.rst b/lld/docs/Readers.rst index 6424de93e0c..e00406b8c4c 100644 --- a/lld/docs/Readers.rst +++ b/lld/docs/Readers.rst @@ -10,8 +10,8 @@ The purpose of a "Reader" is to take an object file in a particular format and create an `lld::File`:cpp:class: (which is a graph of Atoms) representing the object file. A Reader inherits from `lld::Reader`:cpp:class: which lives in -:file:`include/lld/ReaderWriter/Reader.h` and -:file:`lib/ReaderWriter/Reader.cpp`. +:file:`include/lld/Core/Reader.h` and +:file:`lib/Core/Reader.cpp`. The Reader infrastructure for an object format ``Foo`` requires the following pieces in order to fit into lld: diff --git a/lld/include/lld/Core/LinkingContext.h b/lld/include/lld/Core/LinkingContext.h index 7b5e64612ac..ce7cf66641a 100644 --- a/lld/include/lld/Core/LinkingContext.h +++ b/lld/include/lld/Core/LinkingContext.h @@ -16,7 +16,7 @@ #include "lld/Core/Parallel.h" #include "lld/Core/Reference.h" #include "lld/Core/range.h" -#include "lld/ReaderWriter/Reader.h" +#include "lld/Core/Reader.h" #include "llvm/Support/ErrorOr.h" #include "llvm/Support/raw_ostream.h" #include <string> diff --git a/lld/include/lld/ReaderWriter/Reader.h b/lld/include/lld/Core/Reader.h index 061d8226b45..0b9ee3f0a41 100644 --- a/lld/include/lld/ReaderWriter/Reader.h +++ b/lld/include/lld/Core/Reader.h @@ -1,4 +1,4 @@ -//===- lld/ReaderWriter/Reader.h - Abstract File Format Reading Interface -===// +//===- lld/Core/Reader.h - Abstract File Format Reading Interface ---------===// // // The LLVM Linker // @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLD_READER_WRITER_READER_H -#define LLD_READER_WRITER_READER_H +#ifndef LLD_CORE_READER_H +#define LLD_CORE_READER_H #include "lld/Core/LLVM.h" #include "lld/Core/Reference.h" diff --git a/lld/include/lld/ReaderWriter/Writer.h b/lld/include/lld/Core/Writer.h index c50a2aefc43..78bf4a4f94b 100644 --- a/lld/include/lld/ReaderWriter/Writer.h +++ b/lld/include/lld/Core/Writer.h @@ -1,4 +1,4 @@ -//===- lld/ReaderWriter/Writer.h - Abstract File Format Interface ---------===// +//===- lld/Core/Writer.h - Abstract File Format Interface -----------------===// // // The LLVM Linker // @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLD_READER_WRITER_WRITER_H -#define LLD_READER_WRITER_WRITER_H +#ifndef LLD_CORE_WRITER_H +#define LLD_CORE_WRITER_H #include "lld/Core/LLVM.h" #include <memory> diff --git a/lld/include/lld/Passes/LayoutPass.h b/lld/include/lld/Passes/LayoutPass.h index 2196eb5a1b3..9d28c062d51 100644 --- a/lld/include/lld/Passes/LayoutPass.h +++ b/lld/include/lld/Passes/LayoutPass.h @@ -12,7 +12,7 @@ #include "lld/Core/File.h" #include "lld/Core/Pass.h" -#include "lld/ReaderWriter/Reader.h" +#include "lld/Core/Reader.h" #include "llvm/ADT/DenseMap.h" #include <map> #include <string> diff --git a/lld/include/lld/ReaderWriter/CoreLinkingContext.h b/lld/include/lld/ReaderWriter/CoreLinkingContext.h index b087fd4d8d4..d597ca46ddc 100644 --- a/lld/include/lld/ReaderWriter/CoreLinkingContext.h +++ b/lld/include/lld/ReaderWriter/CoreLinkingContext.h @@ -11,8 +11,8 @@ #define LLD_READER_WRITER_CORE_LINKER_CONTEXT_H #include "lld/Core/LinkingContext.h" -#include "lld/ReaderWriter/Reader.h" -#include "lld/ReaderWriter/Writer.h" +#include "lld/Core/Reader.h" +#include "lld/Core/Writer.h" #include "llvm/Support/ErrorHandling.h" namespace lld { diff --git a/lld/include/lld/ReaderWriter/ELFLinkingContext.h b/lld/include/lld/ReaderWriter/ELFLinkingContext.h index d92acf37b42..c176cf4dcfd 100644 --- a/lld/include/lld/ReaderWriter/ELFLinkingContext.h +++ b/lld/include/lld/ReaderWriter/ELFLinkingContext.h @@ -15,8 +15,8 @@ #include "lld/Core/PassManager.h" #include "lld/Core/STDExtras.h" #include "lld/Core/range.h" -#include "lld/ReaderWriter/Reader.h" -#include "lld/ReaderWriter/Writer.h" +#include "lld/Core/Reader.h" +#include "lld/Core/Writer.h" #include "llvm/ADT/StringSet.h" #include "llvm/ADT/Triple.h" #include "llvm/Object/ELF.h" diff --git a/lld/include/lld/ReaderWriter/MachOLinkingContext.h b/lld/include/lld/ReaderWriter/MachOLinkingContext.h index 3a98d65bc72..c5093c46900 100644 --- a/lld/include/lld/ReaderWriter/MachOLinkingContext.h +++ b/lld/include/lld/ReaderWriter/MachOLinkingContext.h @@ -11,8 +11,8 @@ #define LLD_READER_WRITER_MACHO_LINKING_CONTEXT_H #include "lld/Core/LinkingContext.h" -#include "lld/ReaderWriter/Reader.h" -#include "lld/ReaderWriter/Writer.h" +#include "lld/Core/Reader.h" +#include "lld/Core/Writer.h" #include "llvm/ADT/StringMap.h" #include "llvm/ADT/StringSet.h" #include "llvm/Support/ErrorHandling.h" diff --git a/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h b/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h index f537e08d305..f3bb9117550 100644 --- a/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h +++ b/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h @@ -11,8 +11,8 @@ #define LLD_READER_WRITER_PECOFF_LINKING_CONTEXT_H #include "lld/Core/LinkingContext.h" -#include "lld/ReaderWriter/Reader.h" -#include "lld/ReaderWriter/Writer.h" +#include "lld/Core/Reader.h" +#include "lld/Core/Writer.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/Support/Allocator.h" #include "llvm/Support/COFF.h" diff --git a/lld/lib/Core/CMakeLists.txt b/lld/lib/Core/CMakeLists.txt index 28e50d78a8e..009b50a3833 100644 --- a/lld/lib/Core/CMakeLists.txt +++ b/lld/lib/Core/CMakeLists.txt @@ -3,8 +3,10 @@ add_llvm_library(lldCore Error.cpp File.cpp LinkingContext.cpp + Reader.cpp Resolver.cpp SymbolTable.cpp + Writer.cpp LINK_LIBS LLVMSupport ) diff --git a/lld/lib/Core/LinkingContext.cpp b/lld/lib/Core/LinkingContext.cpp index d684a63a0bf..4b63852cc72 100644 --- a/lld/lib/Core/LinkingContext.cpp +++ b/lld/lib/Core/LinkingContext.cpp @@ -11,7 +11,7 @@ #include "lld/Core/LinkingContext.h" #include "lld/Core/Resolver.h" #include "lld/Core/Simple.h" -#include "lld/ReaderWriter/Writer.h" +#include "lld/Core/Writer.h" #include "llvm/ADT/Triple.h" #include "llvm/Support/Process.h" diff --git a/lld/lib/ReaderWriter/Reader.cpp b/lld/lib/Core/Reader.cpp index 616f475b282..6027c14ebfe 100644 --- a/lld/lib/ReaderWriter/Reader.cpp +++ b/lld/lib/Core/Reader.cpp @@ -1,4 +1,4 @@ -//===- lib/ReaderWriter/Reader.cpp ----------------------------------------===// +//===- lib/Core/Reader.cpp ------------------------------------------------===// // // The LLVM Linker // @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// #include "lld/Core/File.h" -#include "lld/ReaderWriter/Reader.h" +#include "lld/Core/Reader.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/Errc.h" #include "llvm/Support/FileUtilities.h" diff --git a/lld/lib/ReaderWriter/Writer.cpp b/lld/lib/Core/Writer.cpp index 40e0a0b227f..39bcc9e6852 100644 --- a/lld/lib/ReaderWriter/Writer.cpp +++ b/lld/lib/Core/Writer.cpp @@ -1,4 +1,4 @@ -//===- lib/ReaderWriter/Writer.cpp ----------------------------------------===// +//===- lib/Core/Writer.cpp ------------------------------------------------===// // // The LLVM Linker // @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// #include "lld/Core/File.h" -#include "lld/ReaderWriter/Writer.h" +#include "lld/Core/Writer.h" namespace lld { Writer::Writer() { diff --git a/lld/lib/Driver/CoreDriver.cpp b/lld/lib/Driver/CoreDriver.cpp index cc249dfcee5..b8adee55746 100644 --- a/lld/lib/Driver/CoreDriver.cpp +++ b/lld/lib/Driver/CoreDriver.cpp @@ -7,9 +7,9 @@ // //===----------------------------------------------------------------------===// +#include "lld/Core/Reader.h" #include "lld/Driver/Driver.h" #include "lld/ReaderWriter/CoreLinkingContext.h" -#include "lld/ReaderWriter/Reader.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/Triple.h" diff --git a/lld/lib/Driver/Driver.cpp b/lld/lib/Driver/Driver.cpp index dc4b49132d0..4dc04188e20 100644 --- a/lld/lib/Driver/Driver.cpp +++ b/lld/lib/Driver/Driver.cpp @@ -13,12 +13,12 @@ #include "lld/Core/LLVM.h" #include "lld/Core/Parallel.h" #include "lld/Core/PassManager.h" +#include "lld/Core/Reader.h" #include "lld/Core/Resolver.h" +#include "lld/Core/Writer.h" #include "lld/Driver/Driver.h" #include "lld/Passes/RoundTripNativePass.h" #include "lld/Passes/RoundTripYAMLPass.h" -#include "lld/ReaderWriter/Reader.h" -#include "lld/ReaderWriter/Writer.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/Option/Arg.h" diff --git a/lld/lib/Passes/CMakeLists.txt b/lld/lib/Passes/CMakeLists.txt index 367752b5091..21a01b1290f 100644 --- a/lld/lib/Passes/CMakeLists.txt +++ b/lld/lib/Passes/CMakeLists.txt @@ -3,6 +3,8 @@ add_llvm_library(lldPasses RoundTripNativePass.cpp RoundTripYAMLPass.cpp LINK_LIBS - lldReaderWriter + lldCore + lldNative + lldYAML LLVMSupport ) diff --git a/lld/lib/Passes/RoundTripNativePass.cpp b/lld/lib/Passes/RoundTripNativePass.cpp index bf5e8e033c5..43a979a1a67 100644 --- a/lld/lib/Passes/RoundTripNativePass.cpp +++ b/lld/lib/Passes/RoundTripNativePass.cpp @@ -9,8 +9,8 @@ #include "lld/Core/Instrumentation.h" #include "lld/Core/Simple.h" +#include "lld/Core/Writer.h" #include "lld/Passes/RoundTripNativePass.h" -#include "lld/ReaderWriter/Writer.h" #include "llvm/Support/Debug.h" #include "llvm/Support/Path.h" #include <memory> diff --git a/lld/lib/Passes/RoundTripYAMLPass.cpp b/lld/lib/Passes/RoundTripYAMLPass.cpp index bf3cd8aa834..95759dce5f2 100644 --- a/lld/lib/Passes/RoundTripYAMLPass.cpp +++ b/lld/lib/Passes/RoundTripYAMLPass.cpp @@ -9,8 +9,8 @@ #include "lld/Core/Instrumentation.h" #include "lld/Core/Simple.h" +#include "lld/Core/Writer.h" #include "lld/Passes/RoundTripYAMLPass.h" -#include "lld/ReaderWriter/Writer.h" #include "llvm/Support/Debug.h" #include "llvm/Support/Path.h" #include <memory> diff --git a/lld/lib/ReaderWriter/CMakeLists.txt b/lld/lib/ReaderWriter/CMakeLists.txt index 5aa2c2eb223..9b9102b5d63 100644 --- a/lld/lib/ReaderWriter/CMakeLists.txt +++ b/lld/lib/ReaderWriter/CMakeLists.txt @@ -12,11 +12,10 @@ add_llvm_library(lldReaderWriter CoreLinkingContext.cpp FileArchive.cpp LinkerScript.cpp - Reader.cpp - Writer.cpp - FileArchive.cpp LINK_LIBS lldCore + lldPasses + lldYAML LLVMObject LLVMSupport ) diff --git a/lld/lib/ReaderWriter/ELF/ELFReader.h b/lld/lib/ReaderWriter/ELF/ELFReader.h index 08aa7174318..58e2bcc90c2 100644 --- a/lld/lib/ReaderWriter/ELF/ELFReader.h +++ b/lld/lib/ReaderWriter/ELF/ELFReader.h @@ -13,7 +13,7 @@ #include "CreateELF.h" #include "DynamicFile.h" #include "ELFFile.h" -#include "lld/ReaderWriter/Reader.h" +#include "lld/Core/Reader.h" namespace lld { namespace elf { diff --git a/lld/lib/ReaderWriter/ELF/OutputELFWriter.h b/lld/lib/ReaderWriter/ELF/OutputELFWriter.h index c23bd5bf027..46e31461982 100644 --- a/lld/lib/ReaderWriter/ELF/OutputELFWriter.h +++ b/lld/lib/ReaderWriter/ELF/OutputELFWriter.h @@ -16,7 +16,7 @@ #include "lld/Core/Parallel.h" #include "lld/Core/SharedLibraryFile.h" #include "lld/ReaderWriter/ELFLinkingContext.h" -#include "lld/ReaderWriter/Writer.h" +#include "lld/Core/Writer.h" #include "llvm/ADT/StringSet.h" #include "llvm/Support/Path.h" diff --git a/lld/lib/ReaderWriter/ELF/SegmentChunks.h b/lld/lib/ReaderWriter/ELF/SegmentChunks.h index ce563add313..cdee646e904 100644 --- a/lld/lib/ReaderWriter/ELF/SegmentChunks.h +++ b/lld/lib/ReaderWriter/ELF/SegmentChunks.h @@ -15,7 +15,7 @@ #include "SectionChunks.h" #include "Writer.h" #include "lld/Core/range.h" -#include "lld/ReaderWriter/Writer.h" +#include "lld/Core/Writer.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/StringRef.h" #include "llvm/Object/ELF.h" diff --git a/lld/lib/ReaderWriter/ELF/Writer.cpp b/lld/lib/ReaderWriter/ELF/Writer.cpp index 39b2808b6e7..3071827e07d 100644 --- a/lld/lib/ReaderWriter/ELF/Writer.cpp +++ b/lld/lib/ReaderWriter/ELF/Writer.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "lld/ReaderWriter/Writer.h" +#include "lld/Core/Writer.h" #include "DynamicLibraryWriter.h" #include "ExecutableWriter.h" diff --git a/lld/lib/ReaderWriter/ELF/Writer.h b/lld/lib/ReaderWriter/ELF/Writer.h index 08fd5e57d45..1e819467c55 100644 --- a/lld/lib/ReaderWriter/ELF/Writer.h +++ b/lld/lib/ReaderWriter/ELF/Writer.h @@ -11,7 +11,7 @@ #define LLD_READER_WRITER_ELF_WRITER_H #include "lld/Core/File.h" -#include "lld/ReaderWriter/Writer.h" +#include "lld/Core/Writer.h" namespace lld { namespace elf { diff --git a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp index 24e17d0a5cf..9fe16108a56 100644 --- a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp +++ b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp @@ -14,11 +14,11 @@ #include "MachOPasses.h" #include "lld/Core/ArchiveLibraryFile.h" #include "lld/Core/PassManager.h" +#include "lld/Core/Reader.h" +#include "lld/Core/Writer.h" #include "lld/Driver/Driver.h" #include "lld/Passes/LayoutPass.h" #include "lld/Passes/RoundTripYAMLPass.h" -#include "lld/ReaderWriter/Reader.h" -#include "lld/ReaderWriter/Writer.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/Triple.h" #include "llvm/Config/config.h" diff --git a/lld/lib/ReaderWriter/MachO/WriterMachO.cpp b/lld/lib/ReaderWriter/MachO/WriterMachO.cpp index a0e9d434c9a..de1c0e38063 100644 --- a/lld/lib/ReaderWriter/MachO/WriterMachO.cpp +++ b/lld/lib/ReaderWriter/MachO/WriterMachO.cpp @@ -7,10 +7,10 @@ // //===----------------------------------------------------------------------===// -#include "lld/ReaderWriter/Writer.h" #include "ExecutableAtoms.hpp" #include "MachONormalizedFile.h" #include "lld/Core/File.h" +#include "lld/Core/Writer.h" #include "lld/ReaderWriter/MachOLinkingContext.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" diff --git a/lld/lib/ReaderWriter/Native/CMakeLists.txt b/lld/lib/ReaderWriter/Native/CMakeLists.txt index d02ea78822e..e15f3d60e89 100644 --- a/lld/lib/ReaderWriter/Native/CMakeLists.txt +++ b/lld/lib/ReaderWriter/Native/CMakeLists.txt @@ -2,6 +2,6 @@ add_llvm_library(lldNative ReaderNative.cpp WriterNative.cpp LINK_LIBS - lldReaderWriter + lldCore LLVMSupport ) diff --git a/lld/lib/ReaderWriter/Native/Makefile b/lld/lib/ReaderWriter/Native/Makefile index fea2cc56030..6aba3786890 100644 --- a/lld/lib/ReaderWriter/Native/Makefile +++ b/lld/lib/ReaderWriter/Native/Makefile @@ -9,6 +9,6 @@ LLD_LEVEL := ../../.. LIBRARYNAME := lldNative -USEDLIBS = lldReaderWriter.a lldCore.a +USEDLIBS = lldCore.a include $(LLD_LEVEL)/Makefile diff --git a/lld/lib/ReaderWriter/Native/ReaderNative.cpp b/lld/lib/ReaderWriter/Native/ReaderNative.cpp index c73ac2b18e8..00160d05f54 100644 --- a/lld/lib/ReaderWriter/Native/ReaderNative.cpp +++ b/lld/lib/ReaderWriter/Native/ReaderNative.cpp @@ -11,8 +11,8 @@ #include "lld/Core/Atom.h" #include "lld/Core/Error.h" #include "lld/Core/File.h" +#include "lld/Core/Reader.h" #include "lld/Core/Simple.h" -#include "lld/ReaderWriter/Reader.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/Debug.h" diff --git a/lld/lib/ReaderWriter/Native/WriterNative.cpp b/lld/lib/ReaderWriter/Native/WriterNative.cpp index 6569395dddf..fbb9f3267a7 100644 --- a/lld/lib/ReaderWriter/Native/WriterNative.cpp +++ b/lld/lib/ReaderWriter/Native/WriterNative.cpp @@ -7,10 +7,10 @@ // //===----------------------------------------------------------------------===// -#include "lld/ReaderWriter/Writer.h" #include "NativeFileFormat.h" #include "lld/Core/File.h" #include "lld/Core/LinkingContext.h" +#include "lld/Core/Writer.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/StringRef.h" diff --git a/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp b/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp index dbe0244843e..b1159697894 100644 --- a/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp +++ b/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp @@ -16,13 +16,13 @@ #include "LoadConfigPass.h" #include "PDBPass.h" #include "lld/Core/PassManager.h" +#include "lld/Core/Reader.h" #include "lld/Core/Simple.h" +#include "lld/Core/Writer.h" #include "lld/Passes/LayoutPass.h" #include "lld/Passes/RoundTripNativePass.h" #include "lld/Passes/RoundTripYAMLPass.h" #include "lld/ReaderWriter/PECOFFLinkingContext.h" -#include "lld/ReaderWriter/Reader.h" -#include "lld/ReaderWriter/Writer.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/Allocator.h" #include "llvm/Support/Path.h" diff --git a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp index dd261614c1c..92dc5285a6b 100644 --- a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp +++ b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp @@ -10,9 +10,9 @@ #include "Atoms.h" #include "lld/Core/Alias.h" #include "lld/Core/File.h" +#include "lld/Core/Reader.h" #include "lld/Driver/Driver.h" #include "lld/ReaderWriter/PECOFFLinkingContext.h" -#include "lld/ReaderWriter/Reader.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Object/COFF.h" diff --git a/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp b/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp index 2bd24c4338f..89fdd72b90b 100644 --- a/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp +++ b/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp @@ -23,9 +23,9 @@ #include "WriterImportLibrary.h" #include "lld/Core/DefinedAtom.h" #include "lld/Core/File.h" +#include "lld/Core/Writer.h" #include "lld/ReaderWriter/AtomLayout.h" #include "lld/ReaderWriter/PECOFFLinkingContext.h" -#include "lld/ReaderWriter/Writer.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/Object/COFF.h" #include "llvm/Support/COFF.h" diff --git a/lld/lib/ReaderWriter/YAML/CMakeLists.txt b/lld/lib/ReaderWriter/YAML/CMakeLists.txt index 8b071d3d108..b955baa9420 100644 --- a/lld/lib/ReaderWriter/YAML/CMakeLists.txt +++ b/lld/lib/ReaderWriter/YAML/CMakeLists.txt @@ -1,6 +1,6 @@ add_llvm_library(lldYAML ReaderWriterYAML.cpp LINK_LIBS - lldReaderWriter + lldCore LLVMSupport ) diff --git a/lld/lib/ReaderWriter/YAML/Makefile b/lld/lib/ReaderWriter/YAML/Makefile index 02a66f9d6ea..739b6eae747 100644 --- a/lld/lib/ReaderWriter/YAML/Makefile +++ b/lld/lib/ReaderWriter/YAML/Makefile @@ -9,6 +9,6 @@ LLD_LEVEL := ../../.. LIBRARYNAME := lldYAML -USEDLIBS = lldReaderWriter.a lldCore.a +USEDLIBS = lldCore.a include $(LLD_LEVEL)/Makefile diff --git a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp index faa5614e745..cc1c8a5d5c1 100644 --- a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp +++ b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp @@ -12,10 +12,10 @@ #include "lld/Core/Error.h" #include "lld/Core/File.h" #include "lld/Core/LLVM.h" +#include "lld/Core/Reader.h" #include "lld/Core/Reference.h" #include "lld/Core/Simple.h" -#include "lld/ReaderWriter/Reader.h" -#include "lld/ReaderWriter/Writer.h" +#include "lld/Core/Writer.h" #include "lld/ReaderWriter/YamlContext.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/StringMap.h" |
