diff options
15 files changed, 11 insertions, 48 deletions
diff --git a/lld/include/lld/ReaderWriter/LinkerScript.h b/lld/include/lld/ReaderWriter/LinkerScript.h index b46adc8f47b..6bd7fa03bdd 100644 --- a/lld/include/lld/ReaderWriter/LinkerScript.h +++ b/lld/include/lld/ReaderWriter/LinkerScript.h @@ -17,14 +17,12 @@ #include "lld/Core/LLVM.h" #include "lld/Core/range.h" - #include "llvm/ADT/StringSwitch.h" #include "llvm/Support/Allocator.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/SourceMgr.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" - #include <memory> #include <vector> diff --git a/lld/lib/ReaderWriter/ELF/ELFFile.h b/lld/lib/ReaderWriter/ELF/ELFFile.h index 48c58d23a80..9ff7a6fae82 100644 --- a/lld/lib/ReaderWriter/ELF/ELFFile.h +++ b/lld/lib/ReaderWriter/ELF/ELFFile.h @@ -11,12 +11,9 @@ #define LLD_READER_WRITER_ELF_FILE_H #include "Atoms.h" - #include "lld/Core/File.h" #include "lld/Core/Reference.h" - #include "lld/ReaderWriter/ELFLinkingContext.h" - #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/StringRef.h" @@ -34,7 +31,6 @@ #include "llvm/Support/Path.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" - #include <map> #include <unordered_map> diff --git a/lld/lib/ReaderWriter/MachO/ExecutableAtoms.hpp b/lld/lib/ReaderWriter/MachO/ExecutableAtoms.hpp index b6d615ae20e..e212f48ed79 100644 --- a/lld/lib/ReaderWriter/MachO/ExecutableAtoms.hpp +++ b/lld/lib/ReaderWriter/MachO/ExecutableAtoms.hpp @@ -18,6 +18,7 @@ #include "lld/Core/Reference.h" #include "lld/Core/Simple.h" #include "lld/Core/UndefinedAtom.h" +#include "lld/ReaderWriter/MachOLinkingContext.h" namespace lld { namespace mach_o { diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp index 5847b3dda97..491211a30b8 100644 --- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp +++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp @@ -24,10 +24,8 @@ #include "MachONormalizedFile.h" #include "MachONormalizedFileBinaryUtils.h" #include "ReferenceKinds.h" - #include "lld/Core/Error.h" #include "lld/Core/LLVM.h" - #include "llvm/ADT/SmallString.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringSwitch.h" @@ -40,7 +38,6 @@ #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" - #include <functional> using namespace llvm::MachO; diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h index 584f6a6c95b..3f3aee2dd2c 100644 --- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h +++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h @@ -9,10 +9,8 @@ #include "MachONormalizedFile.h" - #include "lld/Core/Error.h" #include "lld/Core/LLVM.h" - #include "llvm/ADT/StringRef.h" #include "llvm/Support/Casting.h" #include "llvm/Support/ErrorHandling.h" diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp index 69f62ef0df1..a071771000f 100644 --- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp +++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp @@ -23,10 +23,8 @@ #include "MachONormalizedFile.h" #include "MachONormalizedFileBinaryUtils.h" - #include "lld/Core/Error.h" #include "lld/Core/LLVM.h" - #include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" @@ -40,7 +38,6 @@ #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" - #include <functional> #include <map> diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp index c5bd697d535..5463f773cca 100644 --- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp +++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp @@ -23,10 +23,8 @@ #include "MachONormalizedFile.h" #include "MachONormalizedFileBinaryUtils.h" #include "ReferenceKinds.h" - #include "lld/Core/Error.h" #include "lld/Core/LLVM.h" - #include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/Support/Casting.h" @@ -35,7 +33,6 @@ #include "llvm/Support/Format.h" #include "llvm/Support/MachO.h" #include "llvm/Support/system_error.h" - #include <map> using llvm::StringRef; diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp index f5c3c4d12da..ea740ba544c 100644 --- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp +++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp @@ -16,11 +16,9 @@ /// +------------+ +------+ #include "MachONormalizedFile.h" - #include "lld/Core/Error.h" #include "lld/Core/LLVM.h" #include "lld/ReaderWriter/YamlContext.h" - #include "llvm/ADT/SmallString.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringSwitch.h" @@ -29,10 +27,10 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MachO.h" #include "llvm/Support/MemoryBuffer.h" -#include "llvm/Support/raw_ostream.h" #include "llvm/Support/SourceMgr.h" -#include "llvm/Support/system_error.h" #include "llvm/Support/YAMLTraits.h" +#include "llvm/Support/raw_ostream.h" +#include "llvm/Support/system_error.h" using llvm::StringRef; diff --git a/lld/lib/ReaderWriter/MachO/WriterMachO.cpp b/lld/lib/ReaderWriter/MachO/WriterMachO.cpp index 549229b252f..61da8ef2956 100644 --- a/lld/lib/ReaderWriter/MachO/WriterMachO.cpp +++ b/lld/lib/ReaderWriter/MachO/WriterMachO.cpp @@ -8,7 +8,10 @@ //===----------------------------------------------------------------------===// #include "lld/ReaderWriter/Writer.h" - +#include "ExecutableAtoms.hpp" +#include "MachONormalizedFile.h" +#include "lld/Core/File.h" +#include "lld/ReaderWriter/MachOLinkingContext.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/FileOutputBuffer.h" @@ -16,13 +19,6 @@ #include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" -#include "lld/Core/File.h" -#include "lld/ReaderWriter/MachOLinkingContext.h" - - -#include "MachONormalizedFile.h" -#include "ExecutableAtoms.hpp" - using lld::mach_o::normalized::NormalizedFile; namespace lld { diff --git a/lld/lib/ReaderWriter/Native/WriterNative.cpp b/lld/lib/ReaderWriter/Native/WriterNative.cpp index 8809074151e..b5bba04be4f 100644 --- a/lld/lib/ReaderWriter/Native/WriterNative.cpp +++ b/lld/lib/ReaderWriter/Native/WriterNative.cpp @@ -8,16 +8,13 @@ //===----------------------------------------------------------------------===// #include "lld/ReaderWriter/Writer.h" +#include "NativeFileFormat.h" #include "lld/Core/File.h" - #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" - -#include "NativeFileFormat.h" - #include <cstdint> #include <set> #include <vector> diff --git a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp index 83ef1f1db15..9ba459e96f9 100644 --- a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp +++ b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp @@ -9,13 +9,11 @@ #include "Atoms.h" #include "ReaderImportHeader.h" - #include "lld/Core/Alias.h" #include "lld/Core/File.h" #include "lld/Driver/Driver.h" #include "lld/ReaderWriter/PECOFFLinkingContext.h" #include "lld/ReaderWriter/Reader.h" - #include "llvm/ADT/ArrayRef.h" #include "llvm/Object/COFF.h" #include "llvm/Support/Casting.h" @@ -31,7 +29,6 @@ #include "llvm/Support/Program.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" - #include <algorithm> #include <map> #include <mutex> diff --git a/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp b/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp index 8b03faa10b4..2b97bb10d56 100644 --- a/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp +++ b/lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp @@ -119,16 +119,14 @@ //===----------------------------------------------------------------------===// #include "Atoms.h" - -#include "lld/Core/File.h" #include "lld/Core/Error.h" +#include "lld/Core/File.h" #include "lld/Core/SharedLibraryAtom.h" #include "lld/ReaderWriter/PECOFFLinkingContext.h" - #include "llvm/ADT/ArrayRef.h" #include "llvm/Object/COFF.h" -#include "llvm/Support/Casting.h" #include "llvm/Support/COFF.h" +#include "llvm/Support/Casting.h" #include "llvm/Support/Debug.h" #include "llvm/Support/Endian.h" #include "llvm/Support/ErrorHandling.h" @@ -136,10 +134,9 @@ #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" - +#include <cstring> #include <map> #include <vector> -#include <cstring> using namespace lld; using namespace lld::pecoff; diff --git a/lld/lib/ReaderWriter/Reader.cpp b/lld/lib/ReaderWriter/Reader.cpp index f35a9e60d22..dcae06c4b8f 100644 --- a/lld/lib/ReaderWriter/Reader.cpp +++ b/lld/lib/ReaderWriter/Reader.cpp @@ -8,13 +8,11 @@ //===----------------------------------------------------------------------===// #include "lld/ReaderWriter/Reader.h" - #include "llvm/ADT/StringRef.h" #include "llvm/Support/FileUtilities.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" #include "llvm/Support/system_error.h" - #include <memory> namespace lld { diff --git a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp index 1663c6143f0..4b94e5b495a 100644 --- a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp +++ b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp @@ -17,7 +17,6 @@ #include "lld/ReaderWriter/Reader.h" #include "lld/ReaderWriter/Writer.h" #include "lld/ReaderWriter/YamlContext.h" - #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/StringMap.h" #include "llvm/ADT/Twine.h" @@ -28,7 +27,6 @@ #include "llvm/Support/YAMLTraits.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/system_error.h" - #include <memory> #include <string> diff --git a/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp index e2baa3e0e60..bf23c69205e 100644 --- a/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp +++ b/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp @@ -8,13 +8,11 @@ //===----------------------------------------------------------------------===// #include "gtest/gtest.h" - #include "../../lib/ReaderWriter/MachO/MachONormalizedFile.h" #include "llvm/ADT/Twine.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/MachO.h" #include "llvm/Support/system_error.h" - #include <cassert> #include <memory> #include <vector> |
