From 737459df795e9a83835d1c69bd6e2ec4389b1534 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Mon, 29 Nov 2004 14:07:46 +0000 Subject: [PATCH] Use System/DynamicLibrary instead of Support/DynamicLinker to implement. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18356 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/PluginLoader.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/Support/PluginLoader.cpp b/lib/Support/PluginLoader.cpp index 2c13d578129..39e3c0afa53 100644 --- a/lib/Support/PluginLoader.cpp +++ b/lib/Support/PluginLoader.cpp @@ -13,13 +13,23 @@ #define DONT_GET_PLUGIN_LOADER_OPTION #include "llvm/Support/PluginLoader.h" -#include "llvm/Support/DynamicLinker.h" +#include "llvm/System/DynamicLibrary.h" #include + 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"; }