diff options
| -rw-r--r-- | lld/ELF/Driver.cpp | 2 | ||||
| -rw-r--r-- | lld/ELF/Target.cpp | 17 | ||||
| -rw-r--r-- | lld/ELF/Target.h | 12 | ||||
| -rw-r--r-- | lld/test/elf2/incompatible.s | 4 |
4 files changed, 2 insertions, 33 deletions
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index 28a3e6d28d4..4ca1485dc1d 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -60,8 +60,6 @@ static TargetInfo *createTarget() { return new X86TargetInfo(); case EM_AARCH64: return new AArch64TargetInfo(); - case EM_ARM: - return new ARMTargetInfo(); case EM_MIPS: return new MipsTargetInfo(); case EM_PPC: diff --git a/lld/ELF/Target.cpp b/lld/ELF/Target.cpp index 838ba790b34..1a1e0bed767 100644 --- a/lld/ELF/Target.cpp +++ b/lld/ELF/Target.cpp @@ -454,23 +454,6 @@ void PPCTargetInfo::relocateOne(uint8_t *Buf, uint8_t *BufEnd, const void *RelP, uint32_t Type, uint64_t BaseAddr, uint64_t SymVA) const {} -ARMTargetInfo::ARMTargetInfo() { - // PCRelReloc = FIXME - // GotReloc = FIXME - VAStart = 0x8000; -} -void ARMTargetInfo::writePltEntry(uint8_t *Buf, uint64_t GotEntryAddr, - uint64_t PltEntryAddr) const {} -bool ARMTargetInfo::relocNeedsGot(uint32_t Type, const SymbolBody &S) const { - return false; -} -bool ARMTargetInfo::relocNeedsPlt(uint32_t Type, const SymbolBody &S) const { - return false; -} -void ARMTargetInfo::relocateOne(uint8_t *Buf, uint8_t *BufEnd, - const void *RelP, uint32_t Type, - uint64_t BaseAddr, uint64_t SymVA) const {} - AArch64TargetInfo::AArch64TargetInfo() { // PCRelReloc = FIXME // GotReloc = FIXME diff --git a/lld/ELF/Target.h b/lld/ELF/Target.h index 94a343030ac..77352e6ed4c 100644 --- a/lld/ELF/Target.h +++ b/lld/ELF/Target.h @@ -100,18 +100,6 @@ public: uint64_t SymVA) const override; }; -class ARMTargetInfo final : public TargetInfo { -public: - ARMTargetInfo(); - void writePltEntry(uint8_t *Buf, uint64_t GotEntryAddr, - uint64_t PltEntryAddr) const override; - bool relocNeedsGot(uint32_t Type, const SymbolBody &S) const override; - bool relocNeedsPlt(uint32_t Type, const SymbolBody &S) const override; - void relocateOne(uint8_t *Buf, uint8_t *BufEnd, const void *RelP, - uint32_t Type, uint64_t BaseAddr, - uint64_t SymVA) const override; -}; - class AArch64TargetInfo final : public TargetInfo { public: AArch64TargetInfo(); diff --git a/lld/test/elf2/incompatible.s b/lld/test/elf2/incompatible.s index 8cbe47408f6..9ef866bff98 100644 --- a/lld/test/elf2/incompatible.s +++ b/lld/test/elf2/incompatible.s @@ -1,7 +1,7 @@ // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %ta.o // RUN: llvm-mc -filetype=obj -triple=i686-unknown-linux %s -o %tb.o // RUN: ld.lld2 -shared %tb.o -o %ti686.so -// RUN: llvm-mc -filetype=obj -triple=arm-unknown-linux %s -o %tc.o +// RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %tc.o // RUN: not ld.lld2 %ta.o %tb.o -o %t 2>&1 | \ // RUN: FileCheck --check-prefix=A-AND-B %s @@ -55,4 +55,4 @@ _start: .long foo -// REQUIRES: x86,arm +// REQUIRES: x86,aarch64 |
