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 | 9fa52155a94c4137b813464cf421af37afc9bebe (patch) | |
| tree | 17832e44123004fe9036756498827a74e776ca25 | |
| parent | 1ffee2af6e042c53651b86f9eb02500480b08668 (diff) | |
| download | bcm5719-llvm-9fa52155a94c4137b813464cf421af37afc9bebe.tar.gz bcm5719-llvm-9fa52155a94c4137b813464cf421af37afc9bebe.zip | |
Fix TLS handling in ELF's getAddress and llvm-nm to print 'D' for it.
llvm-svn: 200433
| -rw-r--r-- | llvm/include/llvm/Object/ELFObjectFile.h | 1 | ||||
| -rw-r--r-- | llvm/test/Object/nm-shared-object.test | 4 | ||||
| -rw-r--r-- | llvm/tools/llvm-nm/llvm-nm.cpp | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/llvm/include/llvm/Object/ELFObjectFile.h b/llvm/include/llvm/Object/ELFObjectFile.h index db99a8beaf6..58f2973cc1c 100644 --- a/llvm/include/llvm/Object/ELFObjectFile.h +++ b/llvm/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/llvm/test/Object/nm-shared-object.test b/llvm/test/Object/nm-shared-object.test index a57b9401ad4..5c5f1bc8ab2 100644 --- a/llvm/test/Object/nm-shared-object.test +++ b/llvm/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/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp index 2dc147c4758..495a71b0e90 100644 --- a/llvm/tools/llvm-nm/llvm-nm.cpp +++ b/llvm/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; |
