diff options
| author | Alexey Samsonov <samsonov@google.com> | 2012-09-21 07:08:08 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2012-09-21 07:08:08 +0000 |
| commit | 01fa41a106ed0ff86c3b9ffe0843679211bf487c (patch) | |
| tree | 5156f0942f736a79dfdf9e5cf642e2168b0d1278 /include | |
| parent | f17422181fed6c5c73a27622be012c44f93cde4e (diff) | |
| download | llvm-01fa41a106ed0ff86c3b9ffe0843679211bf487c.tar.gz llvm-01fa41a106ed0ff86c3b9ffe0843679211bf487c.tar.bz2 llvm-01fa41a106ed0ff86c3b9ffe0843679211bf487c.tar.xz | |
Fix SymbolRef::getAddress implementation for ELF. The 'value' field in symbol table entry should be treated differently for relocatable and relocated files. This patch fixes symbol addresses printed by llvm-nm for executables and shared objects.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@164365 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/Object/ELF.h | 13 | ||||
| -rw-r--r-- | include/llvm/Object/ObjectFile.h | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/include/llvm/Object/ELF.h b/include/llvm/Object/ELF.h index 03a1417bed..2e6a7d8c1f 100644 --- a/include/llvm/Object/ELF.h +++ b/include/llvm/Object/ELF.h @@ -951,7 +951,18 @@ error_code ELFObjectFile<target_endianness, is64Bits> case ELF::STT_FUNC: case ELF::STT_OBJECT: case ELF::STT_NOTYPE: - Result = symb->st_value + (Section ? Section->sh_addr : 0); + bool IsRelocatable; + switch(Header->e_type) { + case ELF::ET_EXEC: + case ELF::ET_DYN: + IsRelocatable = false; + break; + default: + IsRelocatable = true; + } + Result = symb->st_value; + if (IsRelocatable && Section != 0) + Result += Section->sh_addr; return object_error::success; default: Result = UnknownAddressOrSize; diff --git a/include/llvm/Object/ObjectFile.h b/include/llvm/Object/ObjectFile.h index da4cef2266..1709974ac5 100644 --- a/include/llvm/Object/ObjectFile.h +++ b/include/llvm/Object/ObjectFile.h @@ -212,6 +212,8 @@ public: error_code getNext(SymbolRef &Result) const; error_code getName(StringRef &Result) const; + /// Returns the symbol virtual address (i.e. address at which it will be + /// mapped). error_code getAddress(uint64_t &Result) const; error_code getFileOffset(uint64_t &Result) const; error_code getSize(uint64_t &Result) const; |