projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update PPC readme. Remove things that are done or aren't ppc specific
[oota-llvm.git]
/
lib
/
Support
/
PluginLoader.cpp
diff --git
a/lib/Support/PluginLoader.cpp
b/lib/Support/PluginLoader.cpp
index cbec6fa7d4d611544d15996c2f4effe6eeec9223..39e3c0afa538216fa139ac0525497823f437cc87 100644
(file)
--- a/
lib/Support/PluginLoader.cpp
+++ b/
lib/Support/PluginLoader.cpp
@@
-12,14
+12,24
@@
//===----------------------------------------------------------------------===//
#define DONT_GET_PLUGIN_LOADER_OPTION
//===----------------------------------------------------------------------===//
#define DONT_GET_PLUGIN_LOADER_OPTION
-#include "Support/PluginLoader.h"
-#include "
Support/DynamicLinker
.h"
+#include "
llvm/
Support/PluginLoader.h"
+#include "
llvm/System/DynamicLibrary
.h"
#include <iostream>
#include <iostream>
+
using namespace llvm;
void PluginLoader::operator=(const std::string &Filename) {
std::string ErrorMessage;
using namespace llvm;
void PluginLoader::operator=(const std::string &Filename) {
std::string ErrorMessage;
- if (LinkDynamicObject(Filename.c_str(), &ErrorMessage))
+ try {
+ sys::DynamicLibrary::LoadLibraryPermanently(Filename.c_str());
+ } catch (const std::string& errmsg) {
+ if (errmsg.empty()) {
+ ErrorMessage = "Unknown";
+ } else {
+ ErrorMessage = errmsg;
+ }
+ }
+ if (!ErrorMessage.empty())
std::cerr << "Error opening '" << Filename << "': " << ErrorMessage
<< "\n -load request ignored.\n";
}
std::cerr << "Error opening '" << Filename << "': " << ErrorMessage
<< "\n -load request ignored.\n";
}