diff options
| author | Greg Clayton <gclayton@apple.com> | 2016-07-01 18:55:55 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2016-07-01 18:55:55 +0000 |
| commit | 0ba05f1835e35245129abc4d14e238582432d05a (patch) | |
| tree | 12bf2a60b04a621e0b27b372e72e7ce1c9b56917 /lldb | |
| parent | 6e96a4c64a90e78602adae215989edfe9d0f63c7 (diff) | |
| download | bcm5719-llvm-0ba05f1835e35245129abc4d14e238582432d05a.tar.gz bcm5719-llvm-0ba05f1835e35245129abc4d14e238582432d05a.zip | |
Revert fix that didn't work. I will need to debug this on linux to figure things out.
llvm-svn: 274377
Diffstat (limited to 'lldb')
| -rw-r--r-- | lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp index 31ceb44deef..73f0ff612ce 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp @@ -602,15 +602,6 @@ lldb::addr_t DynamicLoaderPOSIXDYLD::GetThreadLocalData(const lldb::ModuleSP module_sp, const lldb::ThreadSP thread, lldb::addr_t tls_file_addr) { - lldb_private::Address tls_addr; - if (!module_sp->ResolveFileAddress(tls_file_addr, tls_addr)) - return LLDB_INVALID_ADDRESS; - - const lldb::addr_t tls_load_addr = tls_addr.GetLoadAddress(&m_process->GetTarget());; - - if (tls_load_addr == LLDB_INVALID_ADDRESS) - return LLDB_INVALID_ADDRESS; - auto it = m_loaded_modules.find (module_sp); if (it == m_loaded_modules.end()) return LLDB_INVALID_ADDRESS; @@ -650,7 +641,7 @@ DynamicLoaderPOSIXDYLD::GetThreadLocalData(const lldb::ModuleSP module_sp, const "module=%s, link_map=0x%" PRIx64 ", tp=0x%" PRIx64 ", modid=%" PRId64 ", tls_block=0x%" PRIx64 "\n", module_sp->GetObjectName().AsCString(""), link_map, tp, (int64_t)modid, tls_block); - return tls_block + tls_load_addr; + return tls_block + tls_file_addr; } void |
