A patch from Stephen Wilson that fixes some issues with my previous dynamic

loader changes.

llvm-svn: 125084
This commit is contained in:
Greg Clayton 2011-02-08 05:24:57 +00:00
parent 0f16e73a76
commit f9399453c3
1 changed files with 4 additions and 1 deletions

View File

@ -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)