replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try to fix Ubuntu buildbots after I broke thread local variables with 274366. 

llvm-svn: 274374
This commit is contained in:
Greg Clayton 2016-07-01 18:22:01 +00:00
parent c92e9469c4
commit a89746907f
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
View File

@ -599,10 +599,19 @@ DynamicLoaderPOSIXDYLD::GetEntryPoint()
} }
lldb::addr_t lldb::addr_t
DynamicLoaderPOSIXDYLD::GetThreadLocalData(const lldb::ModuleSP module, const lldb::ThreadSP thread, DynamicLoaderPOSIXDYLD::GetThreadLocalData(const lldb::ModuleSP module_sp, const lldb::ThreadSP thread,
lldb::addr_t tls_file_addr) lldb::addr_t tls_file_addr)
{ {
auto it = m_loaded_modules.find (module); 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()) if (it == m_loaded_modules.end())
return LLDB_INVALID_ADDRESS; return LLDB_INVALID_ADDRESS;
@ -635,14 +644,13 @@ DynamicLoaderPOSIXDYLD::GetThreadLocalData(const lldb::ModuleSP module, const ll
addr_t dtv_slot = dtv + metadata.dtv_slot_size*modid; addr_t dtv_slot = dtv + metadata.dtv_slot_size*modid;
addr_t tls_block = ReadPointer (dtv_slot + metadata.tls_offset); addr_t tls_block = ReadPointer (dtv_slot + metadata.tls_offset);
Module *mod = module.get();
Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_DYNAMIC_LOADER)); Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_DYNAMIC_LOADER));
if (log) if (log)
log->Printf("DynamicLoaderPOSIXDYLD::Performed TLS lookup: " log->Printf("DynamicLoaderPOSIXDYLD::Performed TLS lookup: "
"module=%s, link_map=0x%" PRIx64 ", tp=0x%" PRIx64 ", modid=%" PRId64 ", tls_block=0x%" PRIx64 "\n", "module=%s, link_map=0x%" PRIx64 ", tp=0x%" PRIx64 ", modid=%" PRId64 ", tls_block=0x%" PRIx64 "\n",
mod->GetObjectName().AsCString(""), link_map, tp, (int64_t)modid, tls_block); module_sp->GetObjectName().AsCString(""), link_map, tp, (int64_t)modid, tls_block);
return tls_block + tls_file_addr; return tls_block + tls_load_addr;
} }
void void