X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSupport%2FPluginLoader.cpp;h=39e3c0afa538216fa139ac0525497823f437cc87;hb=ef9531efedd2233269f670227fb0e6aae7480d53;hp=20bdce494962d21cf1cd57e1733aaa4694d0c57a;hpb=1c457b89bbe46e371e856bd559e0271c0fd7e175;p=oota-llvm.git

diff --git a/lib/Support/PluginLoader.cpp b/lib/Support/PluginLoader.cpp
index 20bdce49496..39e3c0afa53 100644
--- a/lib/Support/PluginLoader.cpp
+++ b/lib/Support/PluginLoader.cpp
@@ -7,34 +7,29 @@
 // 
 //===----------------------------------------------------------------------===//
 //
-// This file implements the -load <plugin> command line option processor.  When
-// linked into a program, this new command line option is available that allows
-// users to load shared objects into the running program.
-//
-// Note that there are no symbols exported by the .o file generated for this
-// .cpp file.  Because of this, a program must link against support.o instead of
-// support.a: otherwise this translation unit will not be included.
+// This file implements the -load <plugin> command line option handler.
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/DynamicLinker.h"
-#include "Support/CommandLine.h"
-#include "Config/config.h"
+#define DONT_GET_PLUGIN_LOADER_OPTION
+#include "llvm/Support/PluginLoader.h"
+#include "llvm/System/DynamicLibrary.h"
 #include <iostream>
+
 using namespace llvm;
 
-namespace {
-  struct PluginLoader {
-    void operator=(const std::string &Filename) {
-      std::string ErrorMessage;
-      if (LinkDynamicObject (Filename.c_str (), &ErrorMessage))
-        std::cerr << "Error opening '" << Filename << "': " << ErrorMessage
-                  << "\n  -load request ignored.\n";	
+void PluginLoader::operator=(const std::string &Filename) {
+  std::string 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";	
 }
-
-// This causes operator= above to be invoked for every -load option.
-static cl::opt<PluginLoader, false, cl::parser<std::string> >
-LoadOpt("load", cl::ZeroOrMore, cl::value_desc("plugin" SHLIBEXT),
-        cl::desc("Load the specified plugin"));