diff options
4 files changed, 4 insertions, 32 deletions
diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonDynamicLibraryWriter.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonDynamicLibraryWriter.h index b6c36818020..b7be758d9fa 100644 --- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonDynamicLibraryWriter.h +++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonDynamicLibraryWriter.h @@ -10,7 +10,6 @@ #define HEXAGON_DYNAMIC_LIBRARY_WRITER_H #include "DynamicLibraryWriter.h" -#include "HexagonExecutableAtoms.h" #include "HexagonLinkingContext.h" namespace lld { @@ -49,7 +48,8 @@ void HexagonDynamicLibraryWriter::createImplicitFiles( std::vector<std::unique_ptr<File>> &result) { DynamicLibraryWriter<ELF32LE>::createImplicitFiles(result); // Add the default atoms as defined for hexagon - auto file = llvm::make_unique<HexagonRuntimeFile>(_ctx); + auto file = + llvm::make_unique<RuntimeFile<ELF32LE>>(_ctx, "Hexagon runtime file"); file->addAbsoluteAtom("_GLOBAL_OFFSET_TABLE_"); file->addAbsoluteAtom("_DYNAMIC"); result.push_back(std::move(file)); diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableAtoms.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableAtoms.h deleted file mode 100644 index 2dc32fa0417..00000000000 --- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableAtoms.h +++ /dev/null @@ -1,27 +0,0 @@ -//===- lib/ReaderWriter/ELF/Hexagon/HexagonExecutableAtoms.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_HEXAGON_HEXAGON_EXECUTABLE_ATOM_H -#define LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_EXECUTABLE_ATOM_H - -#include "ELFFile.h" - -namespace lld { -class ELFLinkingContext; - -namespace elf { -class HexagonRuntimeFile : public RuntimeFile<ELF32LE> { -public: - HexagonRuntimeFile(ELFLinkingContext &ctx) - : RuntimeFile<ELF32LE>(ctx, "Hexagon runtime file") {} -}; -} // elf -} // lld - -#endif // LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_EXECUTABLE_ATOM_H diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableWriter.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableWriter.h index 481a62ee9b3..eb9da6e0e42 100644 --- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableWriter.h +++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableWriter.h @@ -10,7 +10,6 @@ #define HEXAGON_EXECUTABLE_WRITER_H #include "ExecutableWriter.h" -#include "HexagonExecutableAtoms.h" #include "HexagonLinkingContext.h" #include "HexagonTargetHandler.h" @@ -50,7 +49,8 @@ void HexagonExecutableWriter::createImplicitFiles( std::vector<std::unique_ptr<File>> &result) { ExecutableWriter<ELF32LE>::createImplicitFiles(result); // Add the default atoms as defined for hexagon - auto file = llvm::make_unique<HexagonRuntimeFile>(_ctx); + auto file = + llvm::make_unique<RuntimeFile<ELF32LE>>(_ctx, "Hexagon runtime file"); file->addAbsoluteAtom("_SDA_BASE_"); if (this->_ctx.isDynamic()) { file->addAbsoluteAtom("_GLOBAL_OFFSET_TABLE_"); diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h index 7a4d3290dd9..e68243cda2f 100644 --- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h +++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h @@ -12,7 +12,6 @@ #include "ELFReader.h" #include "HexagonELFFile.h" -#include "HexagonExecutableAtoms.h" #include "HexagonRelocationHandler.h" #include "TargetLayout.h" |
