RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-22 13:32:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix PR3424, a static constructor ordering issue. Patch by Robert Schuster!

Browse Source 
llvm-svn: 63269
This commit is contained in:
Chris Lattner 2009-01-29 04:43:42 +00:00
parent 1346d22223
commit d5591247d1
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/System/DynamicLibrary.cpp
View File

@ -18,11 +18,14 @@
#include <map>
// Collection of symbol name/value pairs to be searched prior to any libraries.
static std::map<std::string, void *> g_symbols;
std::map<std::string, void *> &g_symbols() {
static std::map<std::string, void *> symbols;
return symbols;
}
void llvm::sys::DynamicLibrary::AddSymbol(const char* symbolName,
void *symbolValue) {
g_symbols[symbolName] = symbolValue;
g_symbols()[symbolName] = symbolValue;
}
// It is not possible to use ltdl.c on VC++ builds as the terms of its LGPL
@ -76,8 +79,8 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
// check_ltdl_initialization();
// First check symbols added via AddSymbol().
std::map<std::string, void *>::iterator I = g_symbols.find(symbolName);
if (I != g_symbols.end())
std::map<std::string, void *>::iterator I = g_symbols().find(symbolName);
if (I != g_symbols().end())
return I->second;
// Now search the libraries.