diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-01-30 00:42:30 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-01-30 00:42:30 +0000 |
| commit | b0dcfa5c1f78305b125f4b710f467c16c9948354 (patch) | |
| tree | 77de26fcb9641304454de72945759c3a3a623105 | |
| parent | 0bdaca505861a1a40645b68422ac6bc00297c6ca (diff) | |
| download | llvm-b0dcfa5c1f78305b125f4b710f467c16c9948354.tar.gz llvm-b0dcfa5c1f78305b125f4b710f467c16c9948354.tar.bz2 llvm-b0dcfa5c1f78305b125f4b710f467c16c9948354.tar.xz | |
Fix TLS handling in ELF's getAddress and llvm-nm to print 'D' for it.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200433 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/Object/ELFObjectFile.h | 1 | ||||
| -rw-r--r-- | test/Object/nm-shared-object.test | 4 | ||||
| -rw-r--r-- | tools/llvm-nm/llvm-nm.cpp | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/llvm/Object/ELFObjectFile.h b/include/llvm/Object/ELFObjectFile.h index db99a8beaf..58f2973cc1 100644 --- a/include/llvm/Object/ELFObjectFile.h +++ b/include/llvm/Object/ELFObjectFile.h @@ -295,6 +295,7 @@ error_code ELFObjectFile<ELFT>::getSymbolAddress(DataRefImpl Symb, case ELF::STT_FUNC: case ELF::STT_OBJECT: case ELF::STT_NOTYPE: + case ELF::STT_TLS: bool IsRelocatable; switch (EF.getHeader()->e_type) { case ELF::ET_EXEC: diff --git a/test/Object/nm-shared-object.test b/test/Object/nm-shared-object.test index a57b9401ad..5c5f1bc8ab 100644 --- a/test/Object/nm-shared-object.test +++ b/test/Object/nm-shared-object.test @@ -12,7 +12,7 @@ ELF-32: 0012cc A _end ELF-32: 0012c8 B common_sym ELF-32: 0012c4 D defined_sym ELF-32: 0001f0 T global_func -ELF-32: ? tls_sym +ELF-32: 000000 D tls_sym ELF-64: 200454 A __bss_start ELF-64: 200454 A _edata @@ -20,4 +20,4 @@ ELF-64: 200458 A _end ELF-64: 200454 B common_sym ELF-64: 200450 D defined_sym ELF-64: 0002f0 T global_func -ELF-64: ? tls_sym +ELF-64: 000000 D tls_sym diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp index 2dc147c475..495a71b0e9 100644 --- a/tools/llvm-nm/llvm-nm.cpp +++ b/tools/llvm-nm/llvm-nm.cpp @@ -331,6 +331,7 @@ static error_code getSymbolNMTypeChar(ELFObjectFile<ELFT> &Obj, case(ELF::SHF_ALLOC | ELF::SHF_EXECINSTR) : Ret = 't'; break; + case(ELF::SHF_TLS | ELF::SHF_ALLOC | ELF::SHF_WRITE) : case(ELF::SHF_ALLOC | ELF::SHF_WRITE) : Ret = 'd'; break; |