[lld] r257595 - Revert r257588 as it broke buildbot

[George Rimar via llvm-commits]

Author: grimar
Date: Wed Jan 13 06:58:51 2016
New Revision: 257595

URL: http://llvm.org/viewvc/llvm-project?rev=257595&view=rev
Log:
Revert r257588 as it broke buildbot
http://lab.llvm.org:8011/builders/lld-x86_64-darwin13/builds/18715/steps/test_lld/logs/stdio

Removed:
    lld/trunk/test/ELF/aarch64-tls-ie.s
Modified:
    lld/trunk/ELF/Target.cpp

Modified: lld/trunk/ELF/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=257595&r1=257594&r2=257595&view=diff
==============================================================================
--- lld/trunk/ELF/Target.cpp (original)
+++ lld/trunk/ELF/Target.cpp Wed Jan 13 06:58:51 2016
@@ -198,8 +198,6 @@ public:
   void writePltEntry(uint8_t *Buf, uint64_t GotAddr, uint64_t GotEntryAddr,
                      uint64_t PltEntryAddr, int32_t Index,
                      unsigned RelOff) const override;
-  unsigned getTlsGotReloc(unsigned Type = -1) const override;
-  bool isTlsDynReloc(unsigned Type, const SymbolBody &S) const override;
   bool needsCopyRel(uint32_t Type, const SymbolBody &S) const override;
   bool relocNeedsGot(uint32_t Type, const SymbolBody &S) const override;
   bool relocNeedsPlt(uint32_t Type, const SymbolBody &S) const override;
@@ -1181,7 +1179,6 @@ AArch64TargetInfo::AArch64TargetInfo() {
   IRelativeReloc = R_AARCH64_IRELATIVE;
   GotReloc = R_AARCH64_GLOB_DAT;
   PltReloc = R_AARCH64_JUMP_SLOT;
-  TlsGotReloc = R_AARCH64_TLS_TPREL64;
   LazyRelocations = true;
   PltEntrySize = 16;
   PltZeroEntrySize = 32;
@@ -1241,19 +1238,6 @@ void AArch64TargetInfo::writePltEntry(ui
               GotEntryAddr);
 }
 
-unsigned AArch64TargetInfo::getTlsGotReloc(unsigned Type) const {
-  if (Type == R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 ||
-      Type == R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC)
-    return Type;
-  return TlsGotReloc;
-}
-
-bool AArch64TargetInfo::isTlsDynReloc(unsigned Type,
-                                      const SymbolBody &S) const {
-  return Type == R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 ||
-         Type == R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC;
-}
-
 bool AArch64TargetInfo::needsCopyRel(uint32_t Type, const SymbolBody &S) const {
   if (Config->Shared)
     return false;
@@ -1277,15 +1261,8 @@ bool AArch64TargetInfo::needsCopyRel(uin
 
 bool AArch64TargetInfo::relocNeedsGot(uint32_t Type,
                                       const SymbolBody &S) const {
-  switch (Type) {
-  case R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
-  case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21:
-  case R_AARCH64_ADR_GOT_PAGE:
-  case R_AARCH64_LD64_GOT_LO12_NC:
-    return true;
-  default:
-    return relocNeedsPlt(Type, S);
-  }
+  return Type == R_AARCH64_ADR_GOT_PAGE || Type == R_AARCH64_LD64_GOT_LO12_NC ||
+         relocNeedsPlt(Type, S);
 }
 
 bool AArch64TargetInfo::relocNeedsPlt(uint32_t Type,
@@ -1351,8 +1328,7 @@ void AArch64TargetInfo::relocateOne(uint
     updateAArch64Adr(Loc, X & 0x1FFFFF);
     break;
   }
-  case R_AARCH64_ADR_PREL_PG_HI21:
-  case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21: {
+  case R_AARCH64_ADR_PREL_PG_HI21: {
     uint64_t X = getAArch64Page(SA) - getAArch64Page(P);
     checkInt<33>(X, Type);
     updateAArch64Adr(Loc, (X >> 12) & 0x1FFFFF); // X[32:12]
@@ -1372,7 +1348,6 @@ void AArch64TargetInfo::relocateOne(uint
     break;
   }
   case R_AARCH64_LD64_GOT_LO12_NC:
-  case R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
     checkAlignment<8>(SA, Type);
     or32le(Loc, (SA & 0xFF8) << 7);
     break;

Removed: lld/trunk/test/ELF/aarch64-tls-ie.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/aarch64-tls-ie.s?rev=257594&view=auto
==============================================================================
--- lld/trunk/test/ELF/aarch64-tls-ie.s (original)
+++ lld/trunk/test/ELF/aarch64-tls-ie.s (removed)
@@ -1,49 +0,0 @@
-# RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %p/Inputs/aarch64-tls-ie.s -o %tdso.o
-# RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-freebsd %s -o %tmain.o
-# RUN: ld.lld -shared %tdso.o -o %tdso.so
-# RUN: ld.lld %tmain.o %tdso.so -o %tout
-# RUN: llvm-objdump -d %tout | FileCheck %s
-# RUN: llvm-readobj -s -r %tout | FileCheck -check-prefix=RELOC %s
-# REQUIRES: aarch64
-
-#RELOC:      Section {
-#RELOC:        Index:
-#RELOC:        Name: .got
-#RELOC-NEXT:   Type: SHT_PROGBITS
-#RELOC-NEXT:   Flags [
-#RELOC-NEXT:     SHF_ALLOC
-#RELOC-NEXT:     SHF_WRITE
-#RELOC-NEXT:   ]
-#RELOC-NEXT:   Address: 0x120B0
-#RELOC-NEXT:   Offset: 0x20B0
-#RELOC-NEXT:   Size: 16
-#RELOC-NEXT:   Link: 0
-#RELOC-NEXT:   Info: 0
-#RELOC-NEXT:   AddressAlignment: 8
-#RELOC-NEXT:   EntrySize: 0
-#RELOC-NEXT: }
-#RELOC:      Relocations [
-#RELOC-NEXT:  Section ({{.*}}) .rela.dyn {
-#RELOC-NEXT:    0x120B0 R_AARCH64_TLS_TPREL64 foo 0x0
-#RELOC-NEXT:    0x120B8 R_AARCH64_TLS_TPREL64 bar 0x0
-#RELOC-NEXT:  }
-#RELOC-NEXT:]
-
-# Page(0x120B0) - Page(0x11000) = 0x1000 = 4096
-# 0x120B0 & 0xff8 = 0xB0 = 176
-# Page(0x120B8) - Page(0x11000) = 0x1000 = 4096
-# 0x120B8 & 0xff8 = 0xB8 = 184
-#CHECK: Disassembly of section .text:
-#CHECK: _start:
-#CHECK:  11000: 00 00 00 b0 adrp x0, #4096
-#CHECK:  11004: 00 58 40 f9 ldr  x0, [x0, #176]
-#CHECK:  11008: 00 00 00 b0 adrp x0, #4096
-#CHECK:  1100c: 00 5c 40 f9 ldr  x0, [x0, #184]
-
-.globl _start
-_start:
- adrp x0, :gottprel:foo
- ldr x0, [x0, #:gottprel_lo12:foo]
-
- adrp x0, :gottprel:bar
- ldr x0, [x0, #:gottprel_lo12:bar]