diff options
-rw-r--r-- | lld/ELF/Bits.h | 34 | ||||
-rw-r--r-- | lld/ELF/SyntheticSections.cpp | 12 |
2 files changed, 11 insertions, 35 deletions
diff --git a/lld/ELF/Bits.h b/lld/ELF/Bits.h deleted file mode 100644 index 7686a9e626a..00000000000 --- a/lld/ELF/Bits.h +++ /dev/null @@ -1,34 +0,0 @@ -//===- Bits.h ---------------------------------------------------*- C++ -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef LLD_ELF_BITS_H -#define LLD_ELF_BITS_H - -#include "Config.h" -#include "llvm/Support/Endian.h" - -namespace lld { -namespace elf { - -inline uint64_t readUint(uint8_t *Buf) { - if (Config->Is64) - return llvm::support::endian::read64(Buf, Config->Endianness); - return llvm::support::endian::read32(Buf, Config->Endianness); -} - -inline void writeUint(uint8_t *Buf, uint64_t Val) { - if (Config->Is64) - llvm::support::endian::write64(Buf, Val, Config->Endianness); - else - llvm::support::endian::write32(Buf, Val, Config->Endianness); -} - -} // namespace elf -} // namespace lld - -#endif diff --git a/lld/ELF/SyntheticSections.cpp b/lld/ELF/SyntheticSections.cpp index f1b5c77dda0..bd7bbe2c419 100644 --- a/lld/ELF/SyntheticSections.cpp +++ b/lld/ELF/SyntheticSections.cpp @@ -14,7 +14,6 @@ //===----------------------------------------------------------------------===// #include "SyntheticSections.h" -#include "Bits.h" #include "Config.h" #include "InputFiles.h" #include "LinkerScript.h" @@ -58,6 +57,17 @@ using llvm::support::endian::write64le; constexpr size_t MergeNoTailSection::NumShards; +static uint64_t readUint(uint8_t *Buf) { + return Config->Is64 ? read64(Buf) : read32(Buf); +} + +static void writeUint(uint8_t *Buf, uint64_t Val) { + if (Config->Is64) + write64(Buf, Val); + else + write32(Buf, Val); +} + // Returns an LLD version string. static ArrayRef<uint8_t> getVersion() { // Check LLD_VERSION first for ease of testing. |