diff options
| author | Greg Clayton <gclayton@apple.com> | 2011-02-08 05:24:57 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2011-02-08 05:24:57 +0000 |
| commit | f9399453c38f8c7ea5d2784847119937c440e40e (patch) | |
| tree | 548d46c9124f9e14500fabbca13fb932285bda77 | |
| parent | 0f16e73a76503fb252f36b90c2e1a7901ab6a9a4 (diff) | |
| download | bcm5719-llvm-f9399453c38f8c7ea5d2784847119937c440e40e.tar.gz bcm5719-llvm-f9399453c38f8c7ea5d2784847119937c440e40e.zip | |
A patch from Stephen Wilson that fixes some issues with my previous dynamic
loader changes.
llvm-svn: 125084
| -rw-r--r-- | lldb/source/Host/common/Host.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lldb/source/Host/common/Host.cpp b/lldb/source/Host/common/Host.cpp index 5458a918749..ae0537bd1be 100644 --- a/lldb/source/Host/common/Host.cpp +++ b/lldb/source/Host/common/Host.cpp @@ -673,6 +673,9 @@ Host::DynamicLibraryOpen (const FileSpec &file_spec, uint32_t options, Error &er if (options & eDynamicLibraryOpenOptionLazy) mode |= RTLD_LAZY; + else + mode |= RTLD_NOW; + if (options & eDynamicLibraryOpenOptionLocal) mode |= RTLD_LOCAL; @@ -744,7 +747,7 @@ Host::DynamicLibraryGetSymbol (void *opaque, const char *symbol_name, Error &err // This host doesn't support limiting searches to this shared library // so we need to verify that the match came from this shared library // if it was requested in the Host::DynamicLibraryOpen() function. - if (dylib_info->options & eDynamicLibraryOpenOptionLimitGetSymbol) + if (dylib_info->open_options & eDynamicLibraryOpenOptionLimitGetSymbol) { FileSpec match_dylib_spec (Host::GetModuleFileSpecForHostAddress (symbol_addr)); if (match_dylib_spec != dylib_info->file_spec) |
