From b933df1835ffb47bcededacfd568f63bc191acb8 Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Tue, 12 Jul 2016 23:28:30 +0000 Subject: [PATCH] Simplify. NFC. Config->Pic is true if (Config->Pie || Config->Shared) is true, so this extra check was redundant. llvm-svn: 275234 --- lld/ELF/Thunks.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lld/ELF/Thunks.cpp b/lld/ELF/Thunks.cpp index 0e0035131207..1ebbb17f3032 100644 --- a/lld/ELF/Thunks.cpp +++ b/lld/ELF/Thunks.cpp @@ -186,22 +186,20 @@ template Thunk::~Thunk() {} template static Thunk *createThunkArm(uint32_t Reloc, SymbolBody &S, InputSection &IS) { - bool NeedsPI = Config->Pic || Config->Pie || Config->Shared; - BumpPtrAllocator &Alloc = IS.getFile()->Alloc; - // ARM relocations need ARM to Thumb interworking Thunks. // Thumb relocations need Thumb to ARM relocations. // Use position independent Thunks if we require position independent code. + BumpPtrAllocator &Alloc = IS.getFile()->Alloc; switch (Reloc) { case R_ARM_PC24: case R_ARM_PLT32: case R_ARM_JUMP24: - if (NeedsPI) + if (Config->Pic) return new (Alloc) ARMToThumbV7PILongThunk(S, IS); return new (Alloc) ARMToThumbV7ABSLongThunk(S, IS); case R_ARM_THM_JUMP19: case R_ARM_THM_JUMP24: - if (NeedsPI) + if (Config->Pic) return new (Alloc) ThumbToARMV7PILongThunk(S, IS); return new (Alloc) ThumbToARMV7ABSLongThunk(S, IS); }