diff options
author | Rui Ueyama <ruiu@google.com> | 2015-04-02 06:50:29 +0000 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2015-04-02 06:50:29 +0000 |
commit | 0ee57cede02033cbc28a9b566e8c0ab2aa18dedf (patch) | |
tree | e09eaf5d6fd687d02fcc82b782ebb968daa9d8b9 | |
parent | 0a1fbb7b0c9984bc6e515cad70e919d30be10047 (diff) | |
download | bcm5719-llvm-0ee57cede02033cbc28a9b566e8c0ab2aa18dedf.tar.gz bcm5719-llvm-0ee57cede02033cbc28a9b566e8c0ab2aa18dedf.zip |
ELF: Remove {AArch64,X86,X86_64}ELFFile because they are empty.
llvm-svn: 233897
-rw-r--r-- | lld/lib/ReaderWriter/ELF/AArch64/AArch64ELFFile.h | 35 | ||||
-rw-r--r-- | lld/lib/ReaderWriter/ELF/AArch64/AArch64ELFReader.h | 5 | ||||
-rw-r--r-- | lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h | 1 | ||||
-rw-r--r-- | lld/lib/ReaderWriter/ELF/X86/X86ELFFile.h | 35 | ||||
-rw-r--r-- | lld/lib/ReaderWriter/ELF/X86/X86ELFReader.h | 4 | ||||
-rw-r--r-- | lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h | 1 | ||||
-rw-r--r-- | lld/lib/ReaderWriter/ELF/X86_64/X86_64ELFFile.h | 35 | ||||
-rw-r--r-- | lld/lib/ReaderWriter/ELF/X86_64/X86_64ELFReader.h | 4 | ||||
-rw-r--r-- | lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h | 1 |
9 files changed, 7 insertions, 114 deletions
diff --git a/lld/lib/ReaderWriter/ELF/AArch64/AArch64ELFFile.h b/lld/lib/ReaderWriter/ELF/AArch64/AArch64ELFFile.h deleted file mode 100644 index 6bf856ff793..00000000000 --- a/lld/lib/ReaderWriter/ELF/AArch64/AArch64ELFFile.h +++ /dev/null @@ -1,35 +0,0 @@ -//===- lib/ReaderWriter/ELF/AArch64/AArch64ELFFile.h ----------------------===// -// -// The LLVM Linker -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#ifndef LLD_READER_WRITER_ELF_AARCH64_AARCH64_ELF_FILE_H -#define LLD_READER_WRITER_ELF_AARCH64_AARCH64_ELF_FILE_H - -#include "ELFReader.h" - -namespace lld { -namespace elf { - -class AArch64LinkingContext; - -template <class ELFT> class AArch64ELFFile : public ELFFile<ELFT> { -public: - AArch64ELFFile(std::unique_ptr<MemoryBuffer> mb, AArch64LinkingContext &ctx) - : ELFFile<ELFT>(std::move(mb), ctx) {} - - static ErrorOr<std::unique_ptr<AArch64ELFFile>> - create(std::unique_ptr<MemoryBuffer> mb, AArch64LinkingContext &ctx) { - return std::unique_ptr<AArch64ELFFile<ELFT>>( - new AArch64ELFFile<ELFT>(std::move(mb), ctx)); - } -}; - -} // elf -} // lld - -#endif // LLD_READER_WRITER_ELF_AARCH64_AARCH64_ELF_FILE_H diff --git a/lld/lib/ReaderWriter/ELF/AArch64/AArch64ELFReader.h b/lld/lib/ReaderWriter/ELF/AArch64/AArch64ELFReader.h index 5b96b4eb865..592d4f5865d 100644 --- a/lld/lib/ReaderWriter/ELF/AArch64/AArch64ELFReader.h +++ b/lld/lib/ReaderWriter/ELF/AArch64/AArch64ELFReader.h @@ -10,12 +10,13 @@ #ifndef LLD_READER_WRITER_AARCH64_AARCH64_ELF_READER_H #define LLD_READER_WRITER_AARCH64_AARCH64_ELF_READER_H -#include "AArch64ELFFile.h" #include "ELFReader.h" namespace lld { namespace elf { +class AArch64LinkingContext; + typedef llvm::object::ELFType<llvm::support::little, 2, true> AArch64ELFType; struct AArch64ELFFileCreateELFTraits { @@ -24,7 +25,7 @@ struct AArch64ELFFileCreateELFTraits { template <class ELFT> static result_type create(std::unique_ptr<llvm::MemoryBuffer> mb, AArch64LinkingContext &ctx) { - return lld::elf::AArch64ELFFile<ELFT>::create(std::move(mb), ctx); + return lld::elf::ELFFile<ELFT>::create(std::move(mb), ctx); } }; diff --git a/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h b/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h index 07e4c8f393c..476a9f87ceb 100644 --- a/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/AArch64/AArch64TargetHandler.h @@ -10,7 +10,6 @@ #ifndef LLD_READER_WRITER_ELF_AARCH64_AARCH64_TARGET_HANDLER_H #define LLD_READER_WRITER_ELF_AARCH64_AARCH64_TARGET_HANDLER_H -#include "AArch64ELFFile.h" #include "AArch64ELFReader.h" #include "AArch64RelocationHandler.h" #include "TargetLayout.h" diff --git a/lld/lib/ReaderWriter/ELF/X86/X86ELFFile.h b/lld/lib/ReaderWriter/ELF/X86/X86ELFFile.h deleted file mode 100644 index b081506eb7e..00000000000 --- a/lld/lib/ReaderWriter/ELF/X86/X86ELFFile.h +++ /dev/null @@ -1,35 +0,0 @@ -//===- lib/ReaderWriter/ELF/X86/X86ELFFile.h ------------------------------===// -// -// The LLVM Linker -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#ifndef LLD_READER_WRITER_ELF_X86_X86_ELF_FILE_H -#define LLD_READER_WRITER_ELF_X86_X86_ELF_FILE_H - -#include "ELFReader.h" - -namespace lld { -namespace elf { - -class X86LinkingContext; - -template <class ELFT> class X86ELFFile : public ELFFile<ELFT> { -public: - X86ELFFile(std::unique_ptr<MemoryBuffer> mb, X86LinkingContext &ctx) - : ELFFile<ELFT>(std::move(mb), ctx) {} - - static ErrorOr<std::unique_ptr<X86ELFFile>> - create(std::unique_ptr<MemoryBuffer> mb, X86LinkingContext &ctx) { - return std::unique_ptr<X86ELFFile<ELFT>>( - new X86ELFFile<ELFT>(std::move(mb), ctx)); - } -}; - -} // elf -} // lld - -#endif // LLD_READER_WRITER_ELF_X86_X86_ELF_FILE_H diff --git a/lld/lib/ReaderWriter/ELF/X86/X86ELFReader.h b/lld/lib/ReaderWriter/ELF/X86/X86ELFReader.h index d1ec697776b..21f27f7b96b 100644 --- a/lld/lib/ReaderWriter/ELF/X86/X86ELFReader.h +++ b/lld/lib/ReaderWriter/ELF/X86/X86ELFReader.h @@ -11,11 +11,11 @@ #define LLD_READER_WRITER_X86_X86_ELF_READER_H #include "ELFReader.h" -#include "X86ELFFile.h" namespace lld { namespace elf { +class X86LinkingContext; typedef llvm::object::ELFType<llvm::support::little, 2, false> X86ELFType; struct X86ELFFileCreateELFTraits { @@ -24,7 +24,7 @@ struct X86ELFFileCreateELFTraits { template <class ELFT> static result_type create(std::unique_ptr<llvm::MemoryBuffer> mb, X86LinkingContext &ctx) { - return lld::elf::X86ELFFile<ELFT>::create(std::move(mb), ctx); + return lld::elf::ELFFile<ELFT>::create(std::move(mb), ctx); } }; diff --git a/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h b/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h index f6b498925da..b1f67278c35 100644 --- a/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/X86/X86TargetHandler.h @@ -11,7 +11,6 @@ #define LLD_READER_WRITER_ELF_X86_TARGET_HANDLER_H #include "TargetLayout.h" -#include "X86ELFFile.h" #include "X86ELFReader.h" #include "X86RelocationHandler.h" diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64ELFFile.h b/lld/lib/ReaderWriter/ELF/X86_64/X86_64ELFFile.h deleted file mode 100644 index 8e983e21e88..00000000000 --- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64ELFFile.h +++ /dev/null @@ -1,35 +0,0 @@ -//===- lib/ReaderWriter/ELF/X86_64/X86_64ELFFile.h ------------------------===// -// -// The LLVM Linker -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#ifndef LLD_READER_WRITER_ELF_X86_64_ELF_FILE_H -#define LLD_READER_WRITER_ELF_X86_64_ELF_FILE_H - -#include "ELFReader.h" - -namespace lld { -namespace elf { - -class X86_64LinkingContext; - -template <class ELFT> class X86_64ELFFile : public ELFFile<ELFT> { -public: - X86_64ELFFile(std::unique_ptr<MemoryBuffer> mb, X86_64LinkingContext &ctx) - : ELFFile<ELFT>(std::move(mb), ctx) {} - - static ErrorOr<std::unique_ptr<X86_64ELFFile>> - create(std::unique_ptr<MemoryBuffer> mb, X86_64LinkingContext &ctx) { - return std::unique_ptr<X86_64ELFFile<ELFT>>( - new X86_64ELFFile<ELFT>(std::move(mb), ctx)); - } -}; - -} // elf -} // lld - -#endif // LLD_READER_WRITER_ELF_X86_64_ELF_FILE_H diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64ELFReader.h b/lld/lib/ReaderWriter/ELF/X86_64/X86_64ELFReader.h index 556aaba5634..1afe2828d54 100644 --- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64ELFReader.h +++ b/lld/lib/ReaderWriter/ELF/X86_64/X86_64ELFReader.h @@ -11,11 +11,11 @@ #define LLD_READER_WRITER_X86_64_X86_64_ELF_READER_H #include "ELFReader.h" -#include "X86_64ELFFile.h" namespace lld { namespace elf { +class X86_64LinkingContext; typedef llvm::object::ELFType<llvm::support::little, 2, true> X86_64ELFType; struct X86_64ELFFileCreateELFTraits { @@ -24,7 +24,7 @@ struct X86_64ELFFileCreateELFTraits { template <class ELFT> static result_type create(std::unique_ptr<llvm::MemoryBuffer> mb, X86_64LinkingContext &ctx) { - return lld::elf::X86_64ELFFile<ELFT>::create(std::move(mb), ctx); + return lld::elf::ELFFile<ELFT>::create(std::move(mb), ctx); } }; diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h b/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h index 4f7268d4fdf..aa863746fcb 100644 --- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h @@ -11,7 +11,6 @@ #define LLD_READER_WRITER_ELF_X86_64_X86_64_TARGET_HANDLER_H #include "TargetLayout.h" -#include "X86_64ELFFile.h" #include "X86_64ELFReader.h" #include "X86_64LinkingContext.h" #include "X86_64RelocationHandler.h" |