[Lldb-commits] [lldb] r125084 - /lldb/trunk/source/Host/common/Host.cpp

[Greg Clayton]

Author: gclayton
Date: Mon Feb  7 23:24:57 2011
New Revision: 125084

URL: http://llvm.org/viewvc/llvm-project?rev=125084&view=rev
Log:
A patch from Stephen Wilson that fixes some issues with my previous dynamic
loader changes.


Modified:
    lldb/trunk/source/Host/common/Host.cpp

Modified: lldb/trunk/source/Host/common/Host.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Host.cpp?rev=125084&r1=125083&r2=125084&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/Host.cpp (original)
+++ lldb/trunk/source/Host/common/Host.cpp Mon Feb  7 23:24:57 2011
@@ -673,6 +673,9 @@
         
         if (options & eDynamicLibraryOpenOptionLazy)
             mode |= RTLD_LAZY;
+        else
+            mode |= RTLD_NOW;
+
     
         if (options & eDynamicLibraryOpenOptionLocal)
             mode |= RTLD_LOCAL;
@@ -744,7 +747,7 @@
             // 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)