From 09f8b75b52f1dded407d00cee4c582e7c5b094f0 Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Sat, 4 Apr 2015 03:24:42 +0000 Subject: [PATCH] ELF: Merge ELFTargets.h with ELFLinkingContext.h. These functions are "constructors" of the LinkingContexts. We already have auxiliary classes and functions for ELFLinkingContext in the header. They fall in the same category. llvm-svn: 234082 --- lld/include/lld/ReaderWriter/ELFLinkingContext.h | 9 +++++++ lld/include/lld/ReaderWriter/ELFTargets.h | 29 ---------------------- lld/lib/Driver/GnuLdDriver.cpp | 1 - .../ELF/AArch64/AArch64LinkingContext.cpp | 1 - .../ELF/Hexagon/HexagonLinkingContext.cpp | 1 - .../ReaderWriter/ELF/Mips/MipsLinkingContext.cpp | 1 - lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.cpp | 1 - .../ExampleSubTarget/ExampleLinkingContext.cpp | 1 - .../ELF/X86_64/X86_64LinkingContext.cpp | 1 - 9 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 lld/include/lld/ReaderWriter/ELFTargets.h diff --git a/lld/include/lld/ReaderWriter/ELFLinkingContext.h b/lld/include/lld/ReaderWriter/ELFLinkingContext.h index eaf12c3..12e4123 100644 --- a/lld/include/lld/ReaderWriter/ELFLinkingContext.h +++ b/lld/include/lld/ReaderWriter/ELFLinkingContext.h @@ -38,6 +38,14 @@ class Reference; namespace elf { class ELFWriter; +std::unique_ptr createAArch64LinkingContext(llvm::Triple); +std::unique_ptr createARMLinkingContext(llvm::Triple); +std::unique_ptr createExampleLinkingContext(llvm::Triple); +std::unique_ptr createHexagonLinkingContext(llvm::Triple); +std::unique_ptr createMipsLinkingContext(llvm::Triple); +std::unique_ptr createX86LinkingContext(llvm::Triple); +std::unique_ptr createX86_64LinkingContext(llvm::Triple); + class TargetRelocationHandler { public: virtual ~TargetRelocationHandler() {} @@ -361,6 +369,7 @@ protected: // in the current linking context via _linkerScriptSema. script::Sema _linkerScriptSema; }; + } // end namespace lld #endif diff --git a/lld/include/lld/ReaderWriter/ELFTargets.h b/lld/include/lld/ReaderWriter/ELFTargets.h deleted file mode 100644 index 3eed62c..0000000 --- a/lld/include/lld/ReaderWriter/ELFTargets.h +++ /dev/null @@ -1,29 +0,0 @@ -//===- lld/ReaderWriter/ELFTargets.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_TARGETS_H -#define LLD_READER_WRITER_ELF_TARGETS_H - -#include "ELFLinkingContext.h" - -namespace lld { -namespace elf { - -std::unique_ptr createAArch64LinkingContext(llvm::Triple); -std::unique_ptr createARMLinkingContext(llvm::Triple); -std::unique_ptr createExampleLinkingContext(llvm::Triple); -std::unique_ptr createHexagonLinkingContext(llvm::Triple); -std::unique_ptr createMipsLinkingContext(llvm::Triple); -std::unique_ptr createX86LinkingContext(llvm::Triple); -std::unique_ptr createX86_64LinkingContext(llvm::Triple); - -} // end namespace elf -} // end namespace lld - -#endif diff --git a/lld/lib/Driver/GnuLdDriver.cpp b/lld/lib/Driver/GnuLdDriver.cpp index 3e10da1..e0e8f23 100644 --- a/lld/lib/Driver/GnuLdDriver.cpp +++ b/lld/lib/Driver/GnuLdDriver.cpp @@ -15,7 +15,6 @@ #include "lld/Driver/Driver.h" #include "lld/ReaderWriter/ELFLinkingContext.h" -#include "lld/ReaderWriter/ELFTargets.h" #include "lld/ReaderWriter/LinkerScript.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/Optional.h" diff --git a/lld/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.cpp b/lld/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.cpp index 5630d64a..ba883f7 100644 --- a/lld/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.cpp +++ b/lld/lib/ReaderWriter/ELF/AArch64/AArch64LinkingContext.cpp @@ -10,7 +10,6 @@ #include "AArch64LinkingContext.h" #include "AArch64RelocationPass.h" #include "AArch64TargetHandler.h" -#include "lld/ReaderWriter/ELFTargets.h" using namespace lld; using namespace lld::elf; diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp index dec6504..7c055ca 100644 --- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp +++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.cpp @@ -9,7 +9,6 @@ #include "HexagonLinkingContext.h" #include "HexagonTargetHandler.h" -#include "lld/ReaderWriter/ELFTargets.h" using namespace lld; using namespace lld::elf; diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp b/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp index 308bd69..ea91fcf 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsLinkingContext.cpp @@ -12,7 +12,6 @@ #include "MipsLinkingContext.h" #include "MipsRelocationPass.h" #include "MipsTargetHandler.h" -#include "lld/ReaderWriter/ELFTargets.h" using namespace lld; using namespace lld::elf; diff --git a/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.cpp b/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.cpp index 46940d4..dc45efc 100644 --- a/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.cpp +++ b/lld/lib/ReaderWriter/ELF/X86/X86LinkingContext.cpp @@ -10,7 +10,6 @@ #include "X86LinkingContext.h" #include "X86TargetHandler.h" #include "lld/Core/LLVM.h" -#include "lld/ReaderWriter/ELFTargets.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/Support/ErrorOr.h" diff --git a/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleLinkingContext.cpp b/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleLinkingContext.cpp index d655140..cb3e819 100644 --- a/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleLinkingContext.cpp +++ b/lld/lib/ReaderWriter/ELF/X86_64/ExampleSubTarget/ExampleLinkingContext.cpp @@ -9,7 +9,6 @@ #include "ExampleLinkingContext.h" #include "ExampleTargetHandler.h" -#include "lld/ReaderWriter/ELFTargets.h" using namespace lld; using namespace elf; diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.cpp b/lld/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.cpp index 77dd44d..0dcd6ac 100644 --- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.cpp +++ b/lld/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.cpp @@ -7,7 +7,6 @@ // //===----------------------------------------------------------------------===// -#include "lld/ReaderWriter/ELFTargets.h" #include "X86_64LinkingContext.h" #include "X86_64RelocationPass.h" #include "X86_64TargetHandler.h" -- 2.7.4