[ELF]: Initial implementation for ARM static linking

[denis-protivensky]

Summary

The skeleton code for ELF binary generation for ARM platform.
The code is "almost" able to statically link the simplest case of void main() { return 0; } sample.

Added all needed relocations, GOT and TLS handling.
Some of these may still be improper which causes segfaults.

[denis-protivensky]

Provided the diff with extended context.

[shankarke]

lib/ReaderWriter/ELF/ARM/ARMELFFile.h

2

80 columns.

104–109

All of the above would need to be done in the relocation handler. We should not interpret the bits in the Reader, this way the Reader is agnostic to the symbol value.

lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h

37

This should be done only for dynamic executables.

74

same here, only for dynamic executables.

lib/ReaderWriter/ELF/ARM/ARMLinkingContext.h

46

Why is this a dynamic relocation ?

lib/ReaderWriter/ELF/ARM/ARMRelocationPass.cpp

159–162

You may need to manually indent.

lib/ReaderWriter/ELF/ARM/TODO.rst

9

you should also add ARM interoperability.

[atanasyan]

Just curious, does the only test case cover the most part of new functionality?

lib/ReaderWriter/ELF/ARM/ARMELFFile.h

26

Strange indentation here. I recommend you to run the clang-format other all new files.

104–109

But the relocation handler does not know about used relocation section format (.rel/.rela) so it cannot decide how and where to read an addendum. So I think it is a good approach to read addendums here, construct Reference objects, and call the Reference::addend() method further.

[shankarke]

As Simon mentioned, This change needs more tests as it includes changes to handle dynamic linking too.

lib/ReaderWriter/ELF/ARM/ARMELFFile.h

104–109

I have two concerns (a), (b) :-

a) Doing this in the Reader may not be idempotent (Need to consider cases like partial linking and ELF to yam conversions and back to atoms).
b) We may be losing some data because of the transformation in the Reader too, to preserve what was in the object file.

ELFLinkingContext::isRelaOutputFormat() can be used to figure out if the Target is using Rela/Rel. In addition the Target knows the relocation types that it handles.

[atanasyan]

lib/ReaderWriter/ELF/ARM/ARMELFFile.h

104–109

In general, I agree with you. As far as I can see ARM relocation addendums can be read in the ARMRelocationHandler class.

MIPS has some unusual relocations like R_MIPS_HI16 / R_MIPS_LO16. These relocations form pairs and to apply each of such relocation we need to know addendums from both paired relocations. The bad thing is that the paired relocations can belong to different atoms. So it is difficult to search a paired relocation in the applyRelocation method. That is why I have to read addendums for MIPS target in the MipsELFFile class. I think Denis’ implementation is inspired by this code.

By the way, if anybody knows a better solution I would be happy to hear it.

[denis-protivensky]

In D6446#13, @atanasyan wrote:

Just curious, does the only test case cover the most part of new functionality?

The code is not ready yet, it doesn't even link statically, so I'm not sure if adding test cases won't result in a needless work.

In D6446#14, @shankarke wrote:

As Simon mentioned, This change needs more tests as it includes changes to handle dynamic linking too.

I didn't plan to add support for dynamic linking right now, I'm still working on the static linking.

lib/ReaderWriter/ELF/ARM/ARMELFFile.h

26

Thanks, didn't know about that tool. It revealed couple more formatting misses.

104–109

I used MIPS implementation as a reference, while I initially planned to put addend calculation to the relocation handler. Okay, I'll move the code to the relocation handler.

Here's just a little thing that I don't like in this solution, but it's not critical of course:
some relocations will have Reference::addend field filled, because they are processed and formed in the relocation pass. And other relocations will have Reference::addend empty, and this value will be calculated in-palce. I'm not sure if Reference's addends are used somewhere before the relocation handler, but for me it was more consistent when they all were filled before and came to applyRelocation already formed.

By the way, if anybody knows a better solution I would be happy to hear it.
If there are limitations when putting addend calculation to ELFFile, isn't it better to add a separate pass to process these initial addends (and maybe cross-references between them as for MIPS) for example, after relocation pass?
While it requires more work and additional instance, it looks cleaner, and also removes that little miss I described above for the relocation handler.

lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h

37

This is needed for handling STT_GNU_IFUNC. While this handing is not here, I've already implemented it and want to send as a separate diff.

lib/ReaderWriter/ELF/ARM/ARMLinkingContext.h

46

Because these all marked as dynamic in the ARM ELF reference.

lib/ReaderWriter/ELF/ARM/ARMRelocationPass.cpp

159–162

Will do.

lib/ReaderWriter/ELF/ARM/TODO.rst

9

What does that mean? Can you please explain so I understand what I'm adding?

[denis-protivensky]

Updated:

• fixed indentations & formatting
• initial addend calculation is moved to the relocation handler

[shankarke]

lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h

34–35

I couldnt find any place where this gets fixed up.

lib/ReaderWriter/ELF/ARM/ARMLinkingContext.h

33–34

Is the base address correct for ARM ?

lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp

421–422

llvm::report_fatal_error (or) provide a reason with the assert.

lib/ReaderWriter/ELF/ARM/ARMRelocationPass.cpp

146–148

indentation is not right.

224

I dont see any initialization to _PLT0. If you are not supporting dynamic linking with this patch, Please remove dynamic linking code from this patch as its difficult to follow.

242

Why is this empty ?

[shankarke]

lib/ReaderWriter/ELF/ARM/TODO.rst

9

Sorry I meant ARM interworking here.

http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0203j/BCGDIHEC.html

[denis-protivensky]

Updated:

• removed unused code related to PLT processing
• removed all handlers of dynamic linking (now dynamic linking attempt fails)
• updated test to link statically
• corrected debug output formatting & assert
• corrected TODO list items

Still in question:

• image's default base address
• __exidx_start/__exidx_end handling

[shankarke]

Need some more tests

a) TLS
b) Check the ARM relocations that you have implemented.

You havent fixed up the exidx_start/end symbol.

I dont see the defsym test testing pieces of ARM functionality that you have implemented.

lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp

102–104

Can you indent some of these manually.

190–193

Isnt this suppose to use a veneer/shim to reach if the target is ARM ?

417–418

I think you should cache this address.

[denis-protivensky]

In D6446#25, @shankarke wrote:

Need some more tests

a) TLS
b) Check the ARM relocations that you have implemented.

You havent fixed up the exidx_start/end symbol.

I dont see the defsym test testing pieces of ARM functionality that you have implemented.

Shankar,

Thanks for reviewing this.

The goal of this initial patch is to make a start of ARM ELF generation. The patch doesn't even make static linking possible. All relocation handlres, including TLS handlers, those requiring veneer generation and others come from libc which I'm linking against during manual testing.
I mean that, I can't reproduce these in tests unless making specific samples with TLS variables, or with BL/BLX instructions, and if I start adding them - we end up having not working code in general, with [highly possibly] not working tests, because there's no guarantee that I can implement everything correctly without real testing.

So I propose to add all these things into the TODO list, and also mark them as requiring tests. This is related to TLS handlers, veneers, .exidx section's symbols and others.

lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h

34–35

It doesn't because my goal is to make the simplest case link statically. I suspect there shouldn't be any exception handling sections, so I decided to drop it for some time. These two atoms needed to make the linker happy and don't break with unresolved symbols error.

I'd prefer adding handling of these later since it at least requires reading exception handling ABI addendum, and maybe writing separate test cases. I noted in the TODO list about the need of .ARM.exidx section handling.

lib/ReaderWriter/ELF/ARM/ARMLinkingContext.h

33–34

That's a good question. This also was a point of concern to me. Didn't manage to find the answer. Do you know where it may be specified?

lib/ReaderWriter/ELF/ARM/TODO.rst

9

Shankar, thank you for the explanation. Added to the TODO list.

[denis-protivensky]

Updated:

• fixed indentation/formatting again
• added caching for finding segments by atoms in the layout
• added fixups for exidx_start/end symbols

[wnewton]

This looks ok to me as an initial revision, although obviously it is missing functionality and test coverage.

[denis-protivensky]

Replaced this with http://reviews.llvm.org/D6716.
This one should be dropped.

lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp

102–104

Ok.

190–193

In general - yes, but it's not implemented in this initial work.

417–418

Good.

docs/open_projects.rst

 .. _open_projects:
 
 Open Projects
 =============
 
 .. include:: ../include/lld/Core/TODO.txt
 .. include:: ../lib/Core/TODO.txt
 .. include:: ../lib/Driver/TODO.rst
 .. include:: ../lib/ReaderWriter/ELF/X86_64/TODO.rst
 .. include:: ../lib/ReaderWriter/ELF/AArch64/TODO.rst
+.. include:: ../lib/ReaderWriter/ELF/ARM/TODO.rst
 .. include:: ../tools/lld/TODO.txt
 
 Documentation TODOs
 ~~~~~~~~~~~~~~~~~~~
 
 .. todolist::

lib/Driver/GnuLdDriver.cpp

getArchType(const llvm::Triple &triple, StringRef value) {
   case llvm::Triple::mipsel:
     if (value == "elf32ltsmip")
       return llvm::Triple::mipsel;
     return llvm::None;
   case llvm::Triple::aarch64:
     if (value == "aarch64linux")
       return llvm::Triple::aarch64;
     return llvm::None;
+  case llvm::Triple::arm:
+    if (value == "armelf_linux_eabi")
+      return llvm::Triple::arm;
+    return llvm::None;
   default:
     return llvm::None;
   }
 }
 
 bool GnuLdDriver::applyEmulation(llvm::Triple &triple,
                                  llvm::opt::InputArgList &args,
                                  raw_ostream &diagnostics) {

lib/ReaderWriter/ELF/ARM/ARMELFFile.h

+//===--------- lib/ReaderWriter/ELF/ARM/ARMELFFile.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_ARM_ARM_ELF_FILE_H
+#define LLD_READER_WRITER_ELF_ARM_ARM_ELF_FILE_H
+
+#include "ELFReader.h"
+
+namespace lld {
+namespace elf {
+
+class ARMLinkingContext;
+
+template <class ELFT> class ARMELFFile : public ELFFile<ELFT> {
+public:
+  ARMELFFile(StringRef name, bool atomizeStrings)
+      : ELFFile<ELFT>(name, atomizeStrings) {}
+
+  ARMELFFile(std::unique_ptr<MemoryBuffer> mb, bool atomizeStrings,
+             std::error_code &ec)
+      : ELFFile<ELFT>(std::move(mb), atomizeStrings, ec) {}
+
+  static ErrorOr<std::unique_ptr<ARMELFFile>>
+  create(std::unique_ptr<MemoryBuffer> mb, bool atomizeStrings) {
+    std::error_code ec;
+    std::unique_ptr<ARMELFFile<ELFT>> file(
+        new ARMELFFile<ELFT>(mb->getBufferIdentifier(), atomizeStrings));
+
+    file->_objFile.reset(
+        new llvm::object::ELFFile<ELFT>(mb.release()->getBuffer(), ec));
+
+    if (ec)
+      return ec;
+
+    // Read input sections from the input file that need to be converted to
+    // atoms
+    if ((ec = file->createAtomizableSections()))
+      return ec;
+
+    // For mergeable strings, we would need to split the section into various
+    // atoms
+    if ((ec = file->createMergeableAtoms()))
+      return ec;
+
+    // Create the necessary symbols that are part of the section that we
+    // created in createAtomizableSections function
+    if ((ec = file->createSymbolsFromAtomizableSections()))
+      return ec;
+
+    // Create the appropriate atoms from the file
+    if ((ec = file->createAtoms()))
+      return ec;
+
+    return std::move(file);
+  }
+};
+
+template <class ELFT> class ARMDynamicFile : public DynamicFile<ELFT> {
+public:
+  ARMDynamicFile(const ARMLinkingContext &context, StringRef name)
+      : DynamicFile<ELFT>(context, name) {}
+};
+
+} // elf
+} // lld
+
+#endif // LLD_READER_WRITER_ELF_ARM_ARM_ELF_FILE_H

lib/ReaderWriter/ELF/ARM/ARMELFReader.h

+//===--------- lib/ReaderWriter/ELF/ARM/ARMELFReader.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_ARM_ARM_ELF_READER_H
+#define LLD_READER_WRITER_ARM_ARM_ELF_READER_H
+
+#include "ARMELFFile.h"
+#include "ELFReader.h"
+
+namespace lld {
+namespace elf {
+
+typedef llvm::object::ELFType<llvm::support::little, 2, false> ARMELFType;
+
+struct ARMDynamicFileCreateELFTraits {
+  typedef llvm::ErrorOr<std::unique_ptr<lld::SharedLibraryFile>> result_type;
+
+  template <class ELFT>
+  static result_type create(std::unique_ptr<llvm::MemoryBuffer> mb,
+                            bool useUndefines) {
+    return lld::elf::ARMDynamicFile<ELFT>::create(std::move(mb), useUndefines);
+  }
+};
+
+struct ARMELFFileCreateELFTraits {
+  typedef llvm::ErrorOr<std::unique_ptr<lld::File>> result_type;
+
+  template <class ELFT>
+  static result_type create(std::unique_ptr<llvm::MemoryBuffer> mb,
+                            bool atomizeStrings) {
+    return lld::elf::ARMELFFile<ELFT>::create(std::move(mb), atomizeStrings);
+  }
+};
+
+class ARMELFObjectReader
+    : public ELFObjectReader<ARMELFType, ARMELFFileCreateELFTraits> {
+public:
+  ARMELFObjectReader(bool atomizeStrings)
+      : ELFObjectReader<ARMELFType, ARMELFFileCreateELFTraits>(
+            atomizeStrings, llvm::ELF::EM_ARM) {}
+};
+
+class ARMELFDSOReader
+    : public ELFDSOReader<ARMELFType, ARMDynamicFileCreateELFTraits> {
+public:
+  ARMELFDSOReader(bool useUndefines)
+      : ELFDSOReader<ARMELFType, ARMDynamicFileCreateELFTraits>(
+            useUndefines, llvm::ELF::EM_ARM) {}
+};
+
+} // namespace elf
+} // namespace lld
+
+#endif // LLD_READER_WRITER_ARM_ARM_ELF_READER_H

lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h

+//===--------- lib/ReaderWriter/ELF/ARM/ARMExecutableWriter.h -------------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+#ifndef ARM_EXECUTABLE_WRITER_H
+#define ARM_EXECUTABLE_WRITER_H
+
+#include "ExecutableWriter.h"
+#include "ARMLinkingContext.h"
+
+namespace lld {
+namespace elf {
+
+template <class ELFT>
+class ARMExecutableWriter : public ExecutableWriter<ELFT> {
+public:
+  ARMExecutableWriter(ARMLinkingContext &context,
+                      ARMTargetLayout<ELFT> &layout);
+
+protected:
+  // Add any runtime files and their atoms to the output
+  bool createImplicitFiles(std::vector<std::unique_ptr<File>> &) override;
+
+  // Finalize custom atom values
+  void finalizeARMAtomValues();
+
+  void finalizeDefaultAtomValues() override {
+    // Finalize the atom values that are part of the parent.
+    ExecutableWriter<ELFT>::finalizeDefaultAtomValues();
+    finalizeARMAtomValues();
+  }
+
+  void addDefaultAtoms() override {
+    _armRuntimeFile->addAbsoluteAtom("__exidx_start");
+    _armRuntimeFile->addAbsoluteAtom("__exidx_end");
+
+    _gotFile->addAtom(*new (_gotFile->_alloc)
+                          GLOBAL_OFFSET_TABLEAtom(*_gotFile));
+  }
+
+private:
+  class GOTFile : public SimpleFile {
+  public:
+    GOTFile(const ELFLinkingContext &eti) : SimpleFile("GOTFile") {}
+    llvm::BumpPtrAllocator _alloc;
+  };
+
+  /// \brief ARM Runtime file.
+  template <class ELFType>
+  class ARMRuntimeFile final : public CRuntimeFile<ELFType> {
+  public:
+    ARMRuntimeFile(const ARMLinkingContext &ctx)
+        : CRuntimeFile<ELFType>(ctx, "ARM runtime file") {}
+  };
+
+  std::unique_ptr<GOTFile> _gotFile;
+  std::unique_ptr<ARMRuntimeFile<ELFT>> _armRuntimeFile;
+  ARMLinkingContext &_context;
+  ARMTargetLayout<ELFT> &_ARMLayout;
+};
+
+template <class ELFT>
+ARMExecutableWriter<ELFT>::ARMExecutableWriter(ARMLinkingContext &context,
+                                               ARMTargetLayout<ELFT> &layout)
+    : ExecutableWriter<ELFT>(context, layout), _gotFile(new GOTFile(context)),
+      _armRuntimeFile(new ARMRuntimeFile<ELFT>(context)), _context(context),
+      _ARMLayout(layout) {}
+
+template <class ELFT>
+bool ARMExecutableWriter<ELFT>::createImplicitFiles(
+    std::vector<std::unique_ptr<File>> &result) {
+  ExecutableWriter<ELFT>::createImplicitFiles(result);
+  // Add the default atoms as defined for ARM
+  addDefaultAtoms();
+  result.push_back(std::move(_armRuntimeFile));
+  result.push_back(std::move(_gotFile));
+  return true;
+}
+
+template <class ELFT>
+void ARMExecutableWriter<ELFT>::finalizeARMAtomValues() {
+  auto startEnd = [&](StringRef sym, StringRef sec) -> void {
+    std::string start = ("__" + sym + "_start").str();
+    std::string end = ("__" + sym + "_end").str();
+    auto s = this->_layout.findAbsoluteAtom(start);
+    auto e = this->_layout.findAbsoluteAtom(end);
+    auto section = this->_layout.findOutputSection(sec);
+    if (section) {
+      (*s)->_virtualAddr = section->virtualAddr();
+      (*e)->_virtualAddr = section->virtualAddr() + section->memSize();
+    } else {
+      (*s)->_virtualAddr = 0;
+      (*e)->_virtualAddr = 0;
+    }
+  };
+
+  startEnd("exidx", ".ARM.exidx");
+}
+
+} // namespace elf
+} // namespace lld
+
+#endif

lib/ReaderWriter/ELF/ARM/ARMLinkingContext.h

+//===--------- lib/ReaderWriter/ELF/ARM/ARMLinkingContext.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_ARM_ARM_LINKING_CONTEXT_H
+#define LLD_READER_WRITER_ELF_ARM_ARM_LINKING_CONTEXT_H
+
+#include "ARMTargetHandler.h"
+
+#include "lld/ReaderWriter/ELFLinkingContext.h"
+
+#include "llvm/Object/ELF.h"
+#include "llvm/Support/ELF.h"
+
+namespace lld {
+namespace elf {
+
+class ARMLinkingContext final : public ELFLinkingContext {
+public:
+  ARMLinkingContext(llvm::Triple triple)
+      : ELFLinkingContext(triple, std::unique_ptr<TargetHandlerBase>(
+                                      new ARMTargetHandler(*this))) {}
+
+  void addPasses(PassManager &) override;
+
+  uint64_t getBaseAddress() const override {
+    if (_baseAddress == 0)
+      return 0x400000;
+    return _baseAddress;
+  }
+
+  bool isDynamicRelocation(const DefinedAtom &,
+                           const Reference &r) const override {
+    if (r.kindNamespace() != Reference::KindNamespace::ELF)
+      return false;
+    assert(r.kindArch() == Reference::KindArch::ARM);
+    switch (r.kindValue()) {
+    case llvm::ELF::R_ARM_TLS_DTPMOD32:
+    case llvm::ELF::R_ARM_TLS_DTPOFF32:
+    case llvm::ELF::R_ARM_TLS_TPOFF32:
+    case llvm::ELF::R_ARM_COPY:
+    case llvm::ELF::R_ARM_GLOB_DAT:
+    case llvm::ELF::R_ARM_JUMP_SLOT:
+    case llvm::ELF::R_ARM_RELATIVE:
+      return true;
+    default:
+      return false;
+    }
+  }
+
+  bool isPLTRelocation(const DefinedAtom &, const Reference &r) const override {
+    if (r.kindNamespace() != Reference::KindNamespace::ELF)
+      return false;
+    assert(r.kindArch() == Reference::KindArch::ARM);
+    switch (r.kindValue()) {
+    case llvm::ELF::R_ARM_JUMP_SLOT:
+      return true;
+    default:
+      return false;
+    }
+  }
+
+  bool isRelativeReloc(const Reference &r) const override {
+    if (r.kindNamespace() != Reference::KindNamespace::ELF)
+      return false;
+    assert(r.kindArch() == Reference::KindArch::ARM);
+    switch (r.kindValue()) {
+    case llvm::ELF::R_ARM_RELATIVE:
+      return true;
+    default:
+      return false;
+    }
+  }
+};
+} // end namespace elf
+} // end namespace lld
+
+#endif

lib/ReaderWriter/ELF/ARM/ARMLinkingContext.cpp

+//===--------- lib/ReaderWriter/ELF/ARM/ARMLinkingContext.cpp -------------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "ARMLinkingContext.h"
+#include "ARMRelocationPass.h"
+
+using namespace lld;
+using namespace lld::elf;
+
+void elf::ARMLinkingContext::addPasses(PassManager &pm) {
+  auto pass = createARMRelocationPass(*this);
+  if (pass)
+    pm.add(std::move(pass));
+  ELFLinkingContext::addPasses(pm);
+}

lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.h

+//===--------- lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.h ------------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef ARM_RELOCATION_HANDLER_H
+#define ARM_RELOCATION_HANDLER_H
+
+#include "ARMTargetHandler.h"
+
+namespace lld {
+namespace elf {
+typedef llvm::object::ELFType<llvm::support::little, 2, false> ARMELFType;
+
+template <class ELFT> class ARMTargetLayout;
+
+class ARMTargetRelocationHandler final
+    : public TargetRelocationHandler<ARMELFType> {
+public:
+  ARMTargetRelocationHandler(ARMTargetLayout<ARMELFType> &layout)
+      : _ARMTargetLayout(layout) {}
+
+  std::error_code applyRelocation(ELFWriter &, llvm::FileOutputBuffer &,
+                                  const lld::AtomLayout &,
+                                  const Reference &) const override;
+
+private:
+  ARMTargetLayout<ARMELFType> &_ARMTargetLayout;
+};
+
+} // end namespace elf
+} // end namespace lld
+
+#endif // ARM_RELOCATION_HANDLER_H

lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp

+//===--------- lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp ----------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "ARMTargetHandler.h"
+#include "ARMLinkingContext.h"
+#include "llvm/Support/Debug.h"
+
+using namespace lld;
+using namespace elf;
+
+template <class Type>
+static Reference::Addend signExtend(Type value, Type highBitPos) {
+  if (value & highBitPos) {
+    // calculate all higher bits for filling
+    const Type fillBits = ~((highBitPos << 1) - 1);
+
+    assert(!(value & fillBits));
+    value |= fillBits;
+  }
+  return value;
+}
+
+static Reference::Addend readAddend_THM_MOV(const uint8_t *location) {
+  const auto halfHi = int16_t(
+      *reinterpret_cast<const llvm::support::little16_t *>(location));
+  const auto halfLo = int16_t(
+      *reinterpret_cast<const llvm::support::little16_t *>(location + 2));
+
+  const int16_t imm8 = halfLo & 0xFF;
+  const int16_t imm3 = (halfLo >> 12) & 0x7;
+
+  const int16_t imm4 = halfHi & 0xF;
+  const int16_t bitI = (halfHi >> 10) & 0x1;
+
+  const int16_t result = (imm4 << 12) | (bitI << 11) | (imm3 << 8) | imm8;
+  return result;
+}
+
+static Reference::Addend readAddend_THM_CALL(const uint8_t *location) {
+  const auto halfHi = int16_t(
+      *reinterpret_cast<const llvm::support::little16_t *>(location));
+  const auto halfLo = int16_t(
+      *reinterpret_cast<const llvm::support::little16_t *>(location + 2));
+
+  const int16_t imm10 = halfHi & 0x3FF;
+  const int16_t bitS = (halfHi >> 10) & 0x1;
+
+  const int16_t imm11 = halfLo & 0x7FF;
+  const int16_t bitJ2 = (halfLo >> 11) & 0x1;
+  const int16_t bitI2 = (~(bitJ2 ^ bitS)) & 0x1;
+  const int16_t bitJ1 = (halfLo >> 13) & 0x1;
+  const int16_t bitI1 = (~(bitJ1 ^ bitS)) & 0x1;
+
+  const int32_t result = (bitS << 24) | (bitI1 << 23) | (bitI2 << 22) |
+                         (imm10 << 12) | (imm11 << 1);
+  return signExtend(result, 0x1000000);
+}
+
+static Reference::Addend readAddend_ARM_CALL(const uint8_t *location) {
+  const auto value = int32_t(
+      *reinterpret_cast<const llvm::support::little32_t *>(location));
+
+  const bool isBLX = (value & 0xF0000000) == 0xF0000000;
+  const int32_t bitH = isBLX ? ((value & 0x1000000) >> 24) : 0;
+
+  const int32_t result = ((value & 0xFFFFFF) << 2) | (bitH << 1);
+  return signExtend(result, 0x2000000);
+}
+
+static Reference::Addend readInitialAddend(const uint8_t *location,
+                                    Reference::KindValue kindValue) {
+  switch (kindValue) {
+  case R_ARM_ABS32:
+  case R_ARM_REL32:
+  case R_ARM_BASE_PREL:
+  case R_ARM_TARGET1:
+  case R_ARM_TLS_IE32:
+  case R_ARM_TLS_LE32:
+    return int32_t(
+        *reinterpret_cast<const llvm::support::little32_t *>(location));
+  case R_ARM_PREL31:
+    return int32_t(*reinterpret_cast<const llvm::support::little32_t *>(
+        location)) & 0x7FFFFFFF;
+  case R_ARM_THM_CALL:
+  case R_ARM_THM_JUMP24:
+    return readAddend_THM_CALL(location);
+  case R_ARM_CALL:
+  case R_ARM_JUMP24:
+    return readAddend_ARM_CALL(location);
+  case R_ARM_THM_MOVW_ABS_NC:
+  case R_ARM_THM_MOVT_ABS:
+    return readAddend_THM_MOV(location);
+  case R_ARM_THM_JUMP11:
+    return int16_t(*reinterpret_cast<const llvm::support::little16_t *>(
+        location)) & 0x7FF;
+  default:
+    return 0;
+  }
+}
+
+static Reference::Addend readAddend(const uint8_t *location,
+                                    Reference::KindValue kindValue,
+                                    Reference::Addend addend) {
+  return addend + readInitialAddend(location, kindValue);
+}
+
+static inline void applyArmReloc(uint8_t *location, uint32_t result,
+                                 uint32_t mask = 0xFFFFFFFF) {
+  assert(!(result & ~mask));
+  *reinterpret_cast<llvm::support::ulittle32_t *>(location) =
+      (uint32_t(*reinterpret_cast<llvm::support::ulittle32_t *>(location)) &
+       ~mask) | (result & mask);
+}
+
+static inline void applyThmReloc(uint8_t *location, uint16_t resHi,
+                                 uint16_t resLo, uint16_t maskHi,
+                                 uint16_t maskLo = 0xFFFF) {
+  assert(!(resHi & ~maskHi) && !(resLo & ~maskLo));
+  *reinterpret_cast<llvm::support::ulittle16_t *>(location) =
+      (uint16_t(*reinterpret_cast<llvm::support::ulittle16_t *>(location)) &
+       ~maskHi) | (resHi & maskHi);
+  location += 2;
+  *reinterpret_cast<llvm::support::ulittle16_t *>(location) =
+      (uint16_t(*reinterpret_cast<llvm::support::ulittle16_t *>(location)) &
+       ~maskLo) | (resLo & maskLo);
+}
+
+/// \brief R_ARM_ABS32 - (S + A) | T => S + A
+static void relocR_ARM_ABS32(uint8_t *location, uint64_t P, uint64_t S,
+                             int64_t A) {
+  uint32_t result = (uint32_t)(S + A);
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+      llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+      llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+      llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
+  applyArmReloc(location, result);
+}
+
+/// \brief R_ARM_REL32 - ((S + A) | T) - P => S + A - P
+static void relocR_ARM_REL32(uint8_t *location, uint64_t P, uint64_t S,
+                             int64_t A) {
+  uint32_t result = (uint32_t)((S + A) - P);
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+      llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+      llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+      llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
+  applyArmReloc(location, result);
+}
+
+/// \brief Relocate B/BL instructions. useJs defines whether J1 & J2 are used
+static void relocR_ARM_THM_B_L(uint8_t *location, uint64_t P, uint64_t S,
+                               int64_t A, bool useJs) {
+  uint32_t result = (uint32_t)((S + A) - P);
+  result = (result & 0x01FFFFFE) >> 1;
+
+  const uint16_t imm10 = (result >> 11) & 0x3FF;
+  const uint16_t bitS = (result >> 23) & 0x1;
+  const uint16_t resHi = (bitS << 10) | imm10;
+
+  const uint16_t imm11 = result & 0x7FF;
+  const uint16_t bitJ2 = useJs ? ((result >> 21) & 0x1) : bitS;
+  const uint16_t bitI2 = (~(bitJ2 ^ bitS)) & 0x1;
+  const uint16_t bitJ1 = useJs ? ((result >> 22) & 0x1) : bitS;
+  const uint16_t bitI1 = (~(bitJ1 ^ bitS)) & 0x1;
+  const uint16_t resLo = (bitI1 << 13) | (bitI2 << 11) | imm11;
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+      llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+      llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+      llvm::dbgs() << " resHi: 0x" << Twine::utohexstr(resHi);
+      llvm::dbgs() << " resLo: 0x" << Twine::utohexstr(resLo) << "\n");
+  applyThmReloc(location, resHi, resLo, 0x7FF, 0x2FFF);
+}
+
+/// \brief R_ARM_THM_CALL - ((S + A) | T) - P => S + A - P
+static void relocR_ARM_THM_CALL(uint8_t *location, uint64_t P, uint64_t S,
+                                int64_t A, bool useJs) {
+  return relocR_ARM_THM_B_L(location, P, S, A, useJs);
+}
+
+/// \brief R_ARM_THM_JUMP24 - ((S + A) | T) - P => S + A - P
+static void relocR_ARM_THM_JUMP24(uint8_t *location, uint64_t P, uint64_t S,
+                                  int64_t A) {
+  return relocR_ARM_THM_B_L(location, P, S, A, true);
+}
+
+/// \brief R_ARM_TARGET1 - R_ARM_ABS32 or R_ARM_REL32 depending
+/// on absNotRel flag
+static void relocR_ARM_TARGET1(uint8_t *location, uint64_t P, uint64_t S,
+                               int64_t A, bool absNotRel) {
+  if (absNotRel) {
+    return relocR_ARM_ABS32(location, P, S, A);
+  } else {
+    return relocR_ARM_REL32(location, P, S, A);
+  }
+}
+
+/// \brief R_ARM_BASE_PREL - B(S) + A - P => S + A - P
+static void relocR_ARM_BASE_PREL(uint8_t *location, uint64_t P, uint64_t S,
+                                 int64_t A) {
+  uint32_t result = (uint32_t)(S + A - P);
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+      llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+      llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+      llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
+  applyArmReloc(location, result);
+}
+
+/// \brief R_ARM_GOT_BREL - GOT(S) + A - GOT_ORG => S + A - GOT_ORG
+static void relocR_ARM_GOT_BREL(uint8_t *location, uint64_t P, uint64_t S,
+                                int64_t A, uint64_t GOT_ORG) {
+  uint32_t result = (uint32_t)(S + A - GOT_ORG);
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+      llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+      llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+      llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
+  applyArmReloc(location, result);
+}
+
+/// \brief R_ARM_CALL - ((S + A) | T) - P => S + A - P
+static void relocR_ARM_CALL(uint8_t *location, uint64_t P, uint64_t S,
+                            int64_t A) {
+  uint32_t result = (uint32_t)((S + A) - P);
+
+  const uint32_t bitH = S & 0x1 ? ((result & 0x2) >> 1) : 1;
+  result = (result & 0x03FFFFFC) >> 2;
+  result |= (bitH << 24);
+
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+      llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+      llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+      llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
+  applyArmReloc(location, result, 0x1FFFFFF);
+}
+
+/// \brief R_ARM_JUMP24 - ((S + A) | T) - P => S + A - P
+static void relocR_ARM_JUMP24(uint8_t *location, uint64_t P, uint64_t S,
+                              int64_t A) {
+  uint32_t result = (uint32_t)((S + A) - P);
+  result = (result & 0x03FFFFFC) >> 2;
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+      llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+      llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+      llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
+  applyArmReloc(location, result, 0xFFFFFF);
+}
+
+/// \brief R_ARM_PREL31 - ((S + A) | T) - P => S + A - P
+static void relocR_ARM_PREL31(uint8_t *location, uint64_t P, uint64_t S,
+                              int64_t A) {
+  uint32_t result = (uint32_t)((S + A) - P);
+
+  const uint32_t mask = 0x7FFFFFFF;
+  result &= mask;
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+      llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+      llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+      llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
+  applyArmReloc(location, result, mask);
+}
+
+/// \brief Relocate MOVW/MOVT instructions
+static void relocR_ARM_THM_MOV(uint8_t *location, uint32_t result) {
+  const uint16_t imm8 = result & 0xFF;
+  const uint16_t imm3 = (result >> 8) & 0x7;
+  const uint16_t resLo = (imm3 << 12) | imm8;
+
+  const uint16_t imm4 = (result >> 12) & 0xF;
+  const uint16_t bitI = (result >> 11) & 0x1;
+  const uint16_t resHi = (bitI << 10) | imm4;
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " resHi: 0x" << Twine::utohexstr(resHi);
+      llvm::dbgs() << " resLo: 0x" << Twine::utohexstr(resLo) << "\n");
+  applyThmReloc(location, resHi, resLo, 0x40F, 0x70FF);
+}
+
+/// \brief R_ARM_THM_MOVW_ABS_NC - (S + A) | T => S + A
+static void relocR_ARM_THM_MOVW_ABS_NC(uint8_t *location, uint64_t P,
+                                       uint64_t S, int64_t A) {
+  uint32_t result = (uint32_t)(S + A);
+  result &= 0x0000FFFF;
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+      llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+      llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+      llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
+  return relocR_ARM_THM_MOV(location, result);
+}
+
+/// \brief R_ARM_THM_MOVT_ABS - S + A
+static void relocR_ARM_THM_MOVT_ABS(uint8_t *location, uint64_t P, uint64_t S,
+                                    int64_t A) {
+  uint32_t result = (uint32_t)(S + A);
+  result &= 0xFFFF0000;
+  result >>= 16;
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+      llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+      llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+      llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
+  return relocR_ARM_THM_MOV(location, result);
+}
+
+/// \brief R_ARM_THM_JUMP11 - S + A - P
+static void relocR_ARM_THM_JUMP11(uint8_t *location, uint64_t P, uint64_t S,
+                                  int64_t A) {
+  uint32_t result = (uint32_t)((S + A) - P);
+  result = (result & 0xFFE) >> 1;
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+      llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+      llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+      llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
+  applyArmReloc(location, result, 0x7FF);
+}
+
+/// \brief R_ARM_TLS_IE32 - GOT(S) + A - P
+static void relocR_ARM_TLS_IE32(uint8_t *location, uint64_t P, uint64_t S,
+                                int64_t A) {
+  uint32_t result = (uint32_t)((S + A) - P);
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+      llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+      llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+      llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
+  applyArmReloc(location, result);
+}
+
+/// \brief R_ARM_TLS_LE32 - S + A - tp => S + A
+static void relocR_ARM_TLS_LE32(uint8_t *location, uint64_t P, uint64_t S,
+                                int64_t A) {
+  uint32_t result = (uint32_t)(S + A);
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+      llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+      llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+      llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
+  applyArmReloc(location, result);
+}
+
+/// \brief R_ARM_TLS_TPOFF32 - S + A - tp => S + A
+static void relocR_ARM_TLS_TPOFF32(uint8_t *location, uint64_t P, uint64_t S,
+                                   int64_t A) {
+  uint32_t result = (uint32_t)(S + A);
+  DEBUG_WITH_TYPE(
+      "ARM", llvm::dbgs() << "\t\tHandle " << LLVM_FUNCTION_NAME << " -";
+      llvm::dbgs() << " S: 0x" << Twine::utohexstr(S);
+      llvm::dbgs() << " A: 0x" << Twine::utohexstr(A);
+      llvm::dbgs() << " P: 0x" << Twine::utohexstr(P);
+      llvm::dbgs() << " result: 0x" << Twine::utohexstr(result) << "\n");
+  applyArmReloc(location, result);
+}
+
+std::error_code ARMTargetRelocationHandler::applyRelocation(
+    ELFWriter &writer, llvm::FileOutputBuffer &buf, const lld::AtomLayout &atom,
+    const Reference &ref) const {
+  uint8_t *atomContent = buf.getBufferStart() + atom._fileOffset;
+  uint8_t *location = atomContent + ref.offsetInAtom();
+  uint64_t targetVAddress = writer.addressOfAtom(ref.target());
+  uint64_t relocVAddress = atom._virtualAddr + ref.offsetInAtom();
+
+  // Calculate proper initial addend for the relocation
+  const Reference::Addend addend =
+      readAddend(location, ref.kindValue(), ref.addend());
+
+  if (ref.kindNamespace() != Reference::KindNamespace::ELF)
+    return std::error_code();
+  assert(ref.kindArch() == Reference::KindArch::ARM);
+  switch (ref.kindValue()) {
+  case R_ARM_NONE:
+    break;
+  case R_ARM_ABS32:
+    relocR_ARM_ABS32(location, relocVAddress, targetVAddress, addend);
+    break;
+  case R_ARM_REL32:
+    relocR_ARM_REL32(location, relocVAddress, targetVAddress, addend);
+    break;
+  case R_ARM_THM_CALL:
+    // TODO: consider adding bool variable to disable J1 & J2 for archs
+    // before ARMv6
+    relocR_ARM_THM_CALL(location, relocVAddress, targetVAddress, addend, true);
+    break;
+  case R_ARM_BASE_PREL:
+    if (!targetVAddress) {
+      // GOT origin is used for NULL symbol
+      targetVAddress = _ARMTargetLayout.getGOTSymAddr();
+    } else if (auto segment =
+                   _ARMTargetLayout.findSegmentByAtom(ref.target())) {
+      targetVAddress = segment->virtualAddr();
+    } else {
+      llvm_unreachable("The atom is not in any of the loadable segments");
+    }
+    relocR_ARM_BASE_PREL(location, relocVAddress, targetVAddress, addend);
+    break;
+  case R_ARM_GOT_BREL:
+    relocR_ARM_GOT_BREL(location, relocVAddress, targetVAddress, addend,
+                        _ARMTargetLayout.getGOTSymAddr());
+    break;
+  case R_ARM_CALL:
+    relocR_ARM_CALL(location, relocVAddress, targetVAddress, addend);
+    break;
+  case R_ARM_JUMP24:
+    relocR_ARM_JUMP24(location, relocVAddress, targetVAddress, addend);
+    break;
+  case R_ARM_THM_JUMP24:
+    relocR_ARM_THM_JUMP24(location, relocVAddress, targetVAddress, addend);
+    break;
+  case R_ARM_TARGET1:
+    // TODO: add cases of handling relative relocations
+    relocR_ARM_TARGET1(location, relocVAddress, targetVAddress, addend, true);
+    break;
+  case R_ARM_PREL31:
+    relocR_ARM_PREL31(location, relocVAddress, targetVAddress, addend);
+    break;
+  case R_ARM_THM_MOVW_ABS_NC:
+    relocR_ARM_THM_MOVW_ABS_NC(location, relocVAddress, targetVAddress, addend);
+    break;
+  case R_ARM_THM_MOVT_ABS:
+    relocR_ARM_THM_MOVT_ABS(location, relocVAddress, targetVAddress, addend);
+    break;
+  case R_ARM_THM_JUMP11:
+    relocR_ARM_THM_JUMP11(location, relocVAddress, targetVAddress, addend);
+    break;
+  case R_ARM_TLS_IE32:
+    relocR_ARM_TLS_IE32(location, relocVAddress, targetVAddress, addend);
+    break;
+  case R_ARM_TLS_LE32:
+    relocR_ARM_TLS_LE32(location, relocVAddress, targetVAddress, addend);
+    break;
+  case R_ARM_TLS_TPOFF32:
+    relocR_ARM_TLS_TPOFF32(location, relocVAddress, targetVAddress, addend);
+    break;
+  default: {
+    std::string str;
+    llvm::raw_string_ostream s(str);
+    s << "Unhandled relocation: " << atom._atom->file().path() << ":"
+      << atom._atom->name() << "@" << ref.offsetInAtom() << " "
+      << "#" << ref.kindValue();
+    s.flush();
+    llvm_unreachable(str.c_str());
+  }
+  }
+
+  return std::error_code();
+}

lib/ReaderWriter/ELF/ARM/ARMRelocationPass.h

+//===--------- lib/ReaderWriter/ELF/ARM/ARMRelocationPass.h ---------------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// \brief Declares the relocation processing pass for ARM. This includes
+///   GOT and PLT entries, TLS, COPY, and ifunc.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef LLD_READER_WRITER_ELF_ARM_ARM_RELOCATION_PASS_H
+#define LLD_READER_WRITER_ELF_ARM_ARM_RELOCATION_PASS_H
+
+#include <memory>
+
+namespace lld {
+class Pass;
+namespace elf {
+class ARMLinkingContext;
+
+/// \brief Create ARM relocation pass for the given linking context.
+std::unique_ptr<Pass> createARMRelocationPass(const ARMLinkingContext &);
+}
+}
+
+#endif

lib/ReaderWriter/ELF/ARM/ARMRelocationPass.cpp

+//===--------- lib/ReaderWriter/ELF/ARM/ARMRelocationPass.cpp -------------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// \brief Defines the relocation processing pass for ARM. This includes
+///   GOT and PLT entries, TLS, COPY, and ifunc.
+///
+/// This also includes additional behavior that gnu-ld and gold implement but
+/// which is not specified anywhere.
+///
+//===----------------------------------------------------------------------===//
+
+#include "ARMRelocationPass.h"
+
+#include "lld/Core/Simple.h"
+
+#include "llvm/ADT/DenseMap.h"
+
+#include "Atoms.h"
+#include "ARMLinkingContext.h"
+#include "llvm/Support/Debug.h"
+
+using namespace lld;
+using namespace lld::elf;
+using namespace llvm::ELF;
+
+namespace {
+// .got values
+const uint8_t ARMGotAtomContent[4] = {0};
+
+/// \brief Atoms that are used by ARM dynamic linking
+class ARMGOTAtom : public GOTAtom {
+public:
+  ARMGOTAtom(const File &f, StringRef secName) : GOTAtom(f, secName) {}
+
+  ArrayRef<uint8_t> rawContent() const override {
+    return llvm::makeArrayRef(ARMGotAtomContent);
+  }
+
+  Alignment alignment() const override { return Alignment(2); }
+};
+
+class ELFPassFile : public SimpleFile {
+public:
+  ELFPassFile(const ELFLinkingContext &eti) : SimpleFile("ELFPassFile") {
+    setOrdinal(eti.getNextOrdinalAndIncrement());
+  }
+
+  llvm::BumpPtrAllocator _alloc;
+};
+
+/// \brief CRTP base for handling relocations.
+template <class Derived> class ARMRelocationPass : public Pass {
+  /// \brief Handle a specific reference.
+  void handleReference(const DefinedAtom &atom, const Reference &ref) {
+    DEBUG_WITH_TYPE(
+        "ARM", llvm::dbgs()
+                   << "\t" << LLVM_FUNCTION_NAME << "()"
+                   << ":   Name of Defined Atom: " << atom.name().str();
+        llvm::dbgs() << "   kindValue: " << ref.kindValue() << "\n");
+    if (ref.kindNamespace() != Reference::KindNamespace::ELF)
+      return;
+    assert(ref.kindArch() == Reference::KindArch::ARM);
+    switch (ref.kindValue()) {
+    case R_ARM_GOT_BREL:
+      static_cast<Derived *>(this)->handleGOT(ref);
+      break;
+    case R_ARM_TLS_IE32:
+      const_cast<Reference &>(ref).setTarget(getTLSIEGOTEntry(ref.target()));
+      break;
+    }
+  }
+
+protected:
+  /// \brief Create a GOT entry containing 0.
+  const GOTAtom *getNullGOT() {
+    if (!_null) {
+      _null = new (_file._alloc) ARMGOTAtom(_file, ".got.plt");
+#ifndef NDEBUG
+      _null->_name = "__got_null";
+#endif
+    }
+    return _null;
+  }
+
+  const GOTAtom *getGOT(const DefinedAtom *da) {
+    auto got = _gotMap.find(da);
+    if (got == _gotMap.end()) {
+      auto g = new (_file._alloc) ARMGOTAtom(_file, ".got");
+      g->addReferenceELF_ARM(R_ARM_ABS32, 0, da, 0);
+#ifndef NDEBUG
+      g->_name = "__got_";
+      g->_name += da->name();
+#endif
+      _gotMap[da] = g;
+      _gotVector.push_back(g);
+      return g;
+    }
+    return got->second;
+  }
+
+  const GOTAtom *getTLSIEGOTEntry(const Atom *a) {
+    auto got = _gotMap.find(a);
+    if (got == _gotMap.end()) {
+      auto g = new (_file._alloc) ARMGOTAtom(_file, ".got");
+      g->addReferenceELF_ARM(R_ARM_TLS_TPOFF32, 0, a, 0);
+#ifndef NDEBUG
+      g->_name = "__got_tls_";
+      g->_name += a->name();
+#endif
+      _gotMap[a] = g;
+      _gotVector.push_back(g);
+      return g;
+    }
+    return got->second;
+  }
+
+public:
+  ARMRelocationPass(const ELFLinkingContext &ctx)
+      : _file(ctx), _ctx(ctx), _null(nullptr) {}
+
+  /// \brief Do the pass.
+  ///
+  /// The goal here is to first process each reference individually. Each call
+  /// to handleReference may modify the reference itself and/or create new
+  /// atoms which must be stored in one of the maps below.
+  ///
+  /// After all references are handled, the atoms created during that are all
+  /// added to mf.
+  void perform(std::unique_ptr<MutableFile> &mf) override {
+    ScopedTask task(getDefaultDomain(), "ARM GOT/PLT Pass");
+    DEBUG_WITH_TYPE(
+        "ARM", llvm::dbgs() << "Undefined Atoms" << "\n";
+        for (const auto &atom
+             : mf->undefined()) {
+          llvm::dbgs() << " Name of Atom: " << atom->name().str() << "\n";
+        }
+
+        llvm::dbgs() << "Shared Library Atoms" << "\n";
+        for (const auto &atom
+             : mf->sharedLibrary()) {
+          llvm::dbgs() << " Name of Atom: " << atom->name().str() << "\n";
+        }
+
+        llvm::dbgs() << "Absolute Atoms" << "\n";
+        for (const auto &atom
+             : mf->absolute()) {
+          llvm::dbgs() << " Name of Atom: " << atom->name().str() << "\n";
+        }
+
+        llvm::dbgs() << "Defined Atoms" << "\n";
+        for (const auto &atom
+             : mf->defined()) {
+          llvm::dbgs() << " Name of Atom: " << atom->name().str() << "\n";
+        });
+
+    // Process all references.
+    for (const auto &atom : mf->defined()) {
+      for (const auto &ref : *atom) {
+        handleReference(*atom, *ref);
+      }
+    }
+
+    // Add all created atoms to the link.
+    uint64_t ordinal = 0;
+    for (auto &plt : _pltVector) {
+      plt->setOrdinal(ordinal++);
+      mf->addAtom(*plt);
+    }
+    if (_null) {
+      _null->setOrdinal(ordinal++);
+      mf->addAtom(*_null);
+    }
+    for (auto &got : _gotVector) {
+      got->setOrdinal(ordinal++);
+      mf->addAtom(*got);
+    }
+    for (auto obj : _objectVector) {
+      obj->setOrdinal(ordinal++);
+      mf->addAtom(*obj);
+    }
+  }
+
+protected:
+  /// \brief Owner of all the Atoms created by this pass.
+  ELFPassFile _file;
+  const ELFLinkingContext &_ctx;
+
+  /// \brief Map Atoms to their GOT entries.
+  llvm::DenseMap<const Atom *, GOTAtom *> _gotMap;
+
+  /// \brief Map Atoms to their PLT entries.
+  llvm::DenseMap<const Atom *, PLTAtom *> _pltMap;
+
+  /// \brief Map Atoms to their Object entries.
+  llvm::DenseMap<const Atom *, ObjectAtom *> _objectMap;
+
+  /// \brief the list of GOT/PLT atoms
+  std::vector<GOTAtom *> _gotVector;
+  std::vector<PLTAtom *> _pltVector;
+  std::vector<ObjectAtom *> _objectVector;
+
+  /// \brief GOT entry that is always 0. Used for undefined weaks.
+  GOTAtom *_null;
+};
+
+/// This implements the static relocation model. Meaning GOT and PLT entries are
+/// not created for references that can be directly resolved. These are
+/// converted to a direct relocation. For entries that do require a GOT or PLT
+/// entry, that entry is statically bound.
+///
+/// TLS always assumes module 1 and attempts to remove indirection.
+class ARMStaticRelocationPass final
+    : public ARMRelocationPass<ARMStaticRelocationPass> {
+public:
+  ARMStaticRelocationPass(const elf::ARMLinkingContext &ctx)
+      : ARMRelocationPass(ctx) {}
+
+  std::error_code handleGOT(const Reference &ref) {
+    if (isa<UndefinedAtom>(ref.target()))
+      const_cast<Reference &>(ref).setTarget(getNullGOT());
+    else if (const DefinedAtom *da = dyn_cast<const DefinedAtom>(ref.target()))
+      const_cast<Reference &>(ref).setTarget(getGOT(da));
+    return std::error_code();
+  }
+};
+
+} // end anon namespace
+
+std::unique_ptr<Pass>
+lld::elf::createARMRelocationPass(const ARMLinkingContext &ctx) {
+  switch (ctx.getOutputELFType()) {
+  case llvm::ELF::ET_EXEC:
+    if (ctx.isDynamic())
+      llvm_unreachable("Unhandled output file type");
+    else
+      return std::unique_ptr<Pass>(new ARMStaticRelocationPass(ctx));
+  default:
+    llvm_unreachable("Unhandled output file type");
+  }
+}

lib/ReaderWriter/ELF/ARM/ARMTarget.h

+//===--------- lib/ReaderWriter/ELF/ARM/ARMTarget.h -----------------------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "ARMLinkingContext.h"

lib/ReaderWriter/ELF/ARM/ARMTargetHandler.h

+//===--------- lib/ReaderWriter/ELF/ARM/ARMTargetHandler.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_ARM_ARM_TARGET_HANDLER_H
+#define LLD_READER_WRITER_ELF_ARM_ARM_TARGET_HANDLER_H
+
+#include "ARMELFFile.h"
+#include "ARMELFReader.h"
+#include "ARMRelocationHandler.h"
+#include "DefaultTargetHandler.h"
+#include "TargetLayout.h"
+
+#include "lld/Core/Simple.h"
+#include "llvm/ADT/Optional.h"
+#include <map>
+
+namespace lld {
+namespace elf {
+typedef llvm::object::ELFType<llvm::support::little, 2, false> ARMELFType;
+class ARMLinkingContext;
+
+template <class ELFT> class ARMTargetLayout : public TargetLayout<ELFT> {
+public:
+  ARMTargetLayout(ARMLinkingContext &context)
+      : TargetLayout<ELFT>(context) {}
+
+  uint64_t getGOTSymAddr() {
+    if (!_gotSymAddr.hasValue()) {
+      uint64_t addr = 0;
+      this->findAtomAddrByName("_GLOBAL_OFFSET_TABLE_", addr);
+      _gotSymAddr = addr;
+    }
+    return *_gotSymAddr;
+  }
+
+  Segment<ELFT> *findSegmentByAtom(const Atom *atom) {
+    const auto atomName = atom->name();
+
+    // Try to find a cached value
+    typename AtomToSegmentMapT::iterator it = _atomToSegmentMap.find(atomName);
+    if (_atomToSegmentMap.end() != it) {
+      return it->second;
+    }
+
+    for (auto segment : this->segments()) {
+      // Skip non loadable segments
+      if (segment->segmentType() != llvm::ELF::PT_LOAD)
+        continue;
+
+      for (auto slice : segment->slices()) {
+        for (auto sec : slice->sections()) {
+          uint64_t atomAddr = 0;
+
+          if (auto section = dyn_cast<Section<ELFT>>(sec))
+            if (section->findAtomAddrByName(atomName, atomAddr)) {
+              _atomToSegmentMap[atomName] = segment;
+              return segment;
+            }
+        }
+      }
+    }
+    return nullptr;
+  }
+
+private:
+  llvm::Optional<uint64_t> _gotSymAddr;
+
+  typedef std::map<StringRef, Segment<ELFT> *> AtomToSegmentMapT;
+  AtomToSegmentMapT _atomToSegmentMap;
+};
+
+class ARMTargetHandler final : public DefaultTargetHandler<ARMELFType> {
+public:
+  ARMTargetHandler(ARMLinkingContext &context);
+
+  ARMTargetLayout<ARMELFType> &getTargetLayout() override {
+    return *(_ARMTargetLayout.get());
+  }
+
+  void registerRelocationNames(Registry &registry) override;
+
+  const ARMTargetRelocationHandler &getRelocationHandler() const override {
+    return *(_ARMRelocationHandler.get());
+  }
+
+  std::unique_ptr<Reader> getObjReader(bool atomizeStrings) override {
+    return std::unique_ptr<Reader>(new ARMELFObjectReader(atomizeStrings));
+  }
+
+  std::unique_ptr<Reader> getDSOReader(bool useShlibUndefines) override {
+    return std::unique_ptr<Reader>(new ARMELFDSOReader(useShlibUndefines));
+  }
+
+  std::unique_ptr<Writer> getWriter() override;
+
+private:
+  static const Registry::KindStrings kindStrings[];
+  ARMLinkingContext &_context;
+  std::unique_ptr<ARMTargetLayout<ARMELFType>> _ARMTargetLayout;
+  std::unique_ptr<ARMTargetRelocationHandler> _ARMRelocationHandler;
+};
+
+} // end namespace elf
+} // end namespace lld
+
+#endif

lib/ReaderWriter/ELF/ARM/ARMTargetHandler.cpp

+//===--------- lib/ReaderWriter/ELF/ARM/ARMTargetHandler.cpp --------------===//
+//
+//                             The LLVM Linker
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "Atoms.h"
+#include "ARMExecutableWriter.h"
+#include "ARMTargetHandler.h"
+#include "ARMLinkingContext.h"
+
+using namespace lld;
+using namespace elf;
+
+ARMTargetHandler::ARMTargetHandler(ARMLinkingContext &context)
+    : DefaultTargetHandler(context), _context(context),
+      _ARMTargetLayout(new ARMTargetLayout<ARMELFType>(context)),
+      _ARMRelocationHandler(new ARMTargetRelocationHandler(*_ARMTargetLayout)) {
+}
+
+void ARMTargetHandler::registerRelocationNames(Registry &registry) {
+  registry.addKindTable(Reference::KindNamespace::ELF, Reference::KindArch::ARM,
+                        kindStrings);
+}
+
+std::unique_ptr<Writer> ARMTargetHandler::getWriter() {
+  switch (this->_context.getOutputELFType()) {
+  case llvm::ELF::ET_EXEC:
+    return std::unique_ptr<Writer>(
+        new ARMExecutableWriter<ARMELFType>(_context, *_ARMTargetLayout.get()));
+  default:
+    llvm_unreachable("unsupported output type");
+  }
+}
+
+const Registry::KindStrings ARMTargetHandler::kindStrings[] = {
+    LLD_KIND_STRING_ENTRY(R_ARM_NONE),
+    LLD_KIND_STRING_ENTRY(R_ARM_PC24),
+    LLD_KIND_STRING_ENTRY(R_ARM_ABS32),
+    LLD_KIND_STRING_ENTRY(R_ARM_REL32),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDR_PC_G0),
+    LLD_KIND_STRING_ENTRY(R_ARM_ABS16),
+    LLD_KIND_STRING_ENTRY(R_ARM_ABS12),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_ABS5),
+    LLD_KIND_STRING_ENTRY(R_ARM_ABS8),
+    LLD_KIND_STRING_ENTRY(R_ARM_SBREL32),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_CALL),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_PC8),
+    LLD_KIND_STRING_ENTRY(R_ARM_BREL_ADJ),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_DESC),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_SWI8),
+    LLD_KIND_STRING_ENTRY(R_ARM_XPC25),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_XPC22),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_DTPMOD32),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_DTPOFF32),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_TPOFF32),
+    LLD_KIND_STRING_ENTRY(R_ARM_COPY),
+    LLD_KIND_STRING_ENTRY(R_ARM_GLOB_DAT),
+    LLD_KIND_STRING_ENTRY(R_ARM_JUMP_SLOT),
+    LLD_KIND_STRING_ENTRY(R_ARM_RELATIVE),
+    LLD_KIND_STRING_ENTRY(R_ARM_GOTOFF32),
+    LLD_KIND_STRING_ENTRY(R_ARM_BASE_PREL),
+    LLD_KIND_STRING_ENTRY(R_ARM_GOT_BREL),
+    LLD_KIND_STRING_ENTRY(R_ARM_PLT32),
+    LLD_KIND_STRING_ENTRY(R_ARM_CALL),
+    LLD_KIND_STRING_ENTRY(R_ARM_JUMP24),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_JUMP24),
+    LLD_KIND_STRING_ENTRY(R_ARM_BASE_ABS),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_PCREL_7_0),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_PCREL_15_8),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_PCREL_23_15),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDR_SBREL_11_0_NC),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_SBREL_19_12_NC),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_SBREL_27_20_CK),
+    LLD_KIND_STRING_ENTRY(R_ARM_TARGET1),
+    LLD_KIND_STRING_ENTRY(R_ARM_SBREL31),
+    LLD_KIND_STRING_ENTRY(R_ARM_V4BX),
+    LLD_KIND_STRING_ENTRY(R_ARM_TARGET2),
+    LLD_KIND_STRING_ENTRY(R_ARM_PREL31),
+    LLD_KIND_STRING_ENTRY(R_ARM_MOVW_ABS_NC),
+    LLD_KIND_STRING_ENTRY(R_ARM_MOVT_ABS),
+    LLD_KIND_STRING_ENTRY(R_ARM_MOVW_PREL_NC),
+    LLD_KIND_STRING_ENTRY(R_ARM_MOVT_PREL),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_MOVW_ABS_NC),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_MOVT_ABS),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_MOVW_PREL_NC),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_MOVT_PREL),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_JUMP19),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_JUMP6),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_ALU_PREL_11_0),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_PC12),
+    LLD_KIND_STRING_ENTRY(R_ARM_ABS32_NOI),
+    LLD_KIND_STRING_ENTRY(R_ARM_REL32_NOI),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_PC_G0_NC),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_PC_G0),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_PC_G1_NC),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_PC_G1),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_PC_G2),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDR_PC_G1),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDR_PC_G2),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDRS_PC_G0),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDRS_PC_G1),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDRS_PC_G2),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDC_PC_G0),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDC_PC_G1),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDC_PC_G2),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_SB_G0_NC),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_SB_G0),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_SB_G1_NC),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_SB_G1),
+    LLD_KIND_STRING_ENTRY(R_ARM_ALU_SB_G2),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDR_SB_G0),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDR_SB_G1),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDR_SB_G2),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDRS_SB_G0),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDRS_SB_G1),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDRS_SB_G2),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDC_SB_G0),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDC_SB_G1),
+    LLD_KIND_STRING_ENTRY(R_ARM_LDC_SB_G2),
+    LLD_KIND_STRING_ENTRY(R_ARM_MOVW_BREL_NC),
+    LLD_KIND_STRING_ENTRY(R_ARM_MOVT_BREL),
+    LLD_KIND_STRING_ENTRY(R_ARM_MOVW_BREL),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_MOVW_BREL_NC),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_MOVT_BREL),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_MOVW_BREL),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_GOTDESC),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_CALL),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_DESCSEQ),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_TLS_CALL),
+    LLD_KIND_STRING_ENTRY(R_ARM_PLT32_ABS),
+    LLD_KIND_STRING_ENTRY(R_ARM_GOT_ABS),
+    LLD_KIND_STRING_ENTRY(R_ARM_GOT_PREL),
+    LLD_KIND_STRING_ENTRY(R_ARM_GOT_BREL12),
+    LLD_KIND_STRING_ENTRY(R_ARM_GOTOFF12),
+    LLD_KIND_STRING_ENTRY(R_ARM_GOTRELAX),
+    LLD_KIND_STRING_ENTRY(R_ARM_GNU_VTENTRY),
+    LLD_KIND_STRING_ENTRY(R_ARM_GNU_VTINHERIT),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_JUMP11),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_JUMP8),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_GD32),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_LDM32),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_LDO32),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_IE32),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_LE32),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_LDO12),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_LE12),
+    LLD_KIND_STRING_ENTRY(R_ARM_TLS_IE12GP),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_0),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_1),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_2),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_3),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_4),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_5),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_6),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_7),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_8),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_9),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_10),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_11),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_12),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_13),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_14),
+    LLD_KIND_STRING_ENTRY(R_ARM_PRIVATE_15),
+    LLD_KIND_STRING_ENTRY(R_ARM_ME_TOO),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_TLS_DESCSEQ16),
+    LLD_KIND_STRING_ENTRY(R_ARM_THM_TLS_DESCSEQ32),
+    LLD_KIND_STRING_ENTRY(R_ARM_IRELATIVE),
+    LLD_KIND_STRING_END};

lib/ReaderWriter/ELF/ARM/CMakeLists.txt

+add_lld_library(lldARMELFTarget
+  ARMLinkingContext.cpp
+  ARMTargetHandler.cpp
+  ARMRelocationHandler.cpp
+  ARMRelocationPass.cpp
+  )
+
+target_link_libraries(lldARMELFTarget ${cmake_2_8_12_INTERFACE}
+  lldCore
+  )

lib/ReaderWriter/ELF/ARM/Makefile

+##===------ lld/lib/ReaderWriter/ELF/ARM/Makefile ----------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LLD_LEVEL := ../../../..
+LIBRARYNAME := lldARMELFTarget
+USEDLIBS = lldCore.a
+CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLD_LEVEL)/lib/ReaderWriter/ELF/ARM -I$(PROJ_SRC_DIR)/$(LLD_LEVEL)/lib/ReaderWriter/ELF
+
+include $(LLD_LEVEL)/Makefile

lib/ReaderWriter/ELF/ARM/TODO.rst

+ELF ARM
+~~~~~~~~~~~
+
+Unimplemented Features
+######################
+
+* Static executable linking - in progress
+* Dynamic executable linking
+* DSO linking
+* PLT entries' generation for images larger than 2^28 bytes (see Sec. A.3 of the ELF reference)
+* ARM and Thumb interworking (see http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0203j/Bcghfebi.html)
+* .ARM.exidx section handling
+* -init/-fini options
+* Lots of relocations
+
+Unimplemented Relocations
+#########################
+
+All of these relocations are defined in:
+http://infocenter.arm.com/help/topic/com.arm.doc.ihi0044e/IHI0044E_aaelf.pdf

lib/ReaderWriter/ELF/Atoms.h

void addReferenceELF_Mips(uint16_t relocType, uint64_t off, const Atom *t,
                             Reference::Addend a) {
     this->addReferenceELF(Reference::KindArch::Mips, relocType, off, t, a);
   }
 
   void addReferenceELF_AArch64(uint16_t relocType, uint64_t off, const Atom *t,
                                Reference::Addend a) {
     this->addReferenceELF(Reference::KindArch::AArch64, relocType, off, t, a);
   }
+
+  void addReferenceELF_ARM(uint16_t relocType, uint64_t off, const Atom *t,
+                               Reference::Addend a) {
+    this->addReferenceELF(Reference::KindArch::ARM, relocType, off, t, a);
+  }
 };
 
 /// \brief Atom which represents an object for which a COPY relocation will be
 ///   generated.
 class ObjectAtom : public SimpleELFDefinedAtom {
 public:
   ObjectAtom(const File &f) : SimpleELFDefinedAtom(f) {}
 

lib/ReaderWriter/ELF/CMakeLists.txt

 add_lld_library(lldELF
   ArrayOrderPass.cpp
   ELFLinkingContext.cpp
   Reader.cpp
   Writer.cpp
   )
 
 target_link_libraries(lldELF ${cmake_2_8_12_INTERFACE}
   lldHexagonELFTarget
   lldMipsELFTarget
   lldPPCELFTarget
   lldPasses
   lldReaderWriter
   lldX86ELFTarget
   lldX86_64ELFTarget
   lldAArch64ELFTarget
+  lldARMELFTarget
   )
 
 include_directories(.)
 
 add_subdirectory(X86)
 add_subdirectory(X86_64)
 add_subdirectory(PPC)
 add_subdirectory(Mips)
 add_subdirectory(Hexagon)
 add_subdirectory(AArch64)
+add_subdirectory(ARM)

lib/ReaderWriter/ELF/ELFLinkingContext.cpp

uint16_t ELFLinkingContext::getOutputMachine() const {
   case llvm::Triple::hexagon:
     return llvm::ELF::EM_HEXAGON;
   case llvm::Triple::mipsel:
     return llvm::ELF::EM_MIPS;
   case llvm::Triple::ppc:
     return llvm::ELF::EM_PPC;
   case llvm::Triple::aarch64:
     return llvm::ELF::EM_AARCH64;
+  case llvm::Triple::arm:
+    return llvm::ELF::EM_ARM;
   default:
     llvm_unreachable("Unhandled arch");
   }
 }
 
 StringRef ELFLinkingContext::entrySymbolName() const {
   if (_outputELFType == elf::ET_EXEC && _entrySymbolName.empty())
     return "_start";
case llvm::Triple::mipsel:
     return std::unique_ptr<ELFLinkingContext>(
         new lld::elf::MipsLinkingContext(triple));
   case llvm::Triple::ppc:
     return std::unique_ptr<ELFLinkingContext>(
         new lld::elf::PPCLinkingContext(triple));
   case llvm::Triple::aarch64:
     return std::unique_ptr<ELFLinkingContext>(
         new lld::elf::AArch64LinkingContext(triple));
+  case llvm::Triple::arm:
+    return std::unique_ptr<ELFLinkingContext>(
+        new lld::elf::ARMLinkingContext(triple));
   default:
     return nullptr;
   }
 }
 
 static void buildSearchPath(SmallString<128> &path, StringRef dir,
                             StringRef sysRoot) {
   if (!dir.startswith("=/"))

lib/ReaderWriter/ELF/Targets.h

 //===- lib/ReaderWriter/ELF/Targets.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 "AArch64/AArch64Target.h"
+#include "ARM/ARMTarget.h"
 #include "Hexagon/HexagonTarget.h"
 #include "Mips/MipsTarget.h"
 #include "PPC/PPCTarget.h"
 #include "X86/X86Target.h"
 #include "X86_64/X86_64Target.h"
 
 #endif

test/elf/ARM/defsym.test

+# Check that defined symbols are present in the generated executable
+
+# RUN: yaml2obj -format=elf %s > %t-o.o
+# RUN: lld -flavor gnu -target arm-linux-gnu --defsym=main=fn -e=fn \
+# RUN: -static --noinhibit-exec %t-o.o -o %t
+# RUN: llvm-readobj -symbols %t | FileCheck %s
+
+# CHECK: Symbol {
+# CHECK:   Name: main (1)
+# CHECK:   Value: 0x400075
+# CHECK:   Size: 0
+# CHECK:   Binding: Global (0x1)
+# CHECK:   Type: Function (0x2)
+# CHECK:   Other: 0
+# CHECK:   Section: .text (0x1)
+# CHECK: }
+# CHECK: Symbol {
+# CHECK:   Name: fn (6)
+# CHECK:   Value: 0x400075
+# CHECK:   Size: 15
+# CHECK:   Binding: Global (0x1)
+# CHECK:   Type: Function (0x2)
+# CHECK:   Other: 0
+# CHECK:   Section: .text (0x1)
+# CHECK: }
+
+FileHeader:
+  Class:           ELFCLASS32
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_ARM
+  Flags:           [ EF_ARM_EABI_VER5 ]
+Sections:
+  - Name:            .text
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
+    AddressAlign:    0x0000000000000004
+    Content:         80B400AF00231846BD465DF8047B7047
+  - Name:            .data
+    Type:            SHT_PROGBITS
+    Flags:           [ SHF_WRITE, SHF_ALLOC ]
+    AddressAlign:    0x0000000000000001
+    Content:         ''
+  - Name:            .bss
+    Type:            SHT_NOBITS
+    Flags:           [ SHF_WRITE, SHF_ALLOC ]
+    AddressAlign:    0x0000000000000001
+    Content:         ''
+  - Name:            .note.GNU-stack
+    Type:            SHT_PROGBITS
+    AddressAlign:    0x0000000000000001
+    Content:         ''
+Symbols:
+  Local:
+    - Name:            .text
+      Type:            STT_SECTION
+      Section:         .text
+    - Name:            .data
+      Type:            STT_SECTION
+      Section:         .data
+    - Name:            .bss
+      Type:            STT_SECTION
+      Section:         .bss
+    - Name:            .note.GNU-stack
+      Type:            STT_SECTION
+      Section:         .note.GNU-stack
+  Global:
+    - Name:            fn
+      Type:            STT_FUNC
+      Section:         .text
+      Value:           0x0000000000000001
+      Size:            0x0000000000000010