diff --git a/include/Support/TypeInfo.h b/include/Support/TypeInfo.h
new file mode 100644
index 00000000000..29f4e22a991
--- /dev/null
+++ b/include/Support/TypeInfo.h
@@ -0,0 +1,65 @@
+//===- Support/TypeInfo.h - Support class for type_info objects --*- C++ -*--=//
+//
+// This class makes std::type_info objects behave like first class objects that
+// can be put in maps and hashtables.  This code is based off of code in the
+// Loki C++ library from the Modern C++ Design book.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_SUPPORT_TYPEINFO_H
+#define LLVM_SUPPORT_TYPEINFO_H
+
+#include <typeinfo>
+
+struct TypeInfo {
+  TypeInfo() {                     // needed for containers
+    struct Nil {};  // Anonymous class distinct from all others...
+    Info = &typeid(Nil);
+  }
+
+  TypeInfo(const std::type_info &ti) : Info(&ti) { // non-explicit
+  }
+
+  // Access for the wrapped std::type_info
+  const std::type_info &get() const {
+    return *Info;
+  }
+
+  // Compatibility functions
+  bool before(const TypeInfo &rhs) const {
+    return Info->before(*rhs.Info);
+  }
+  const char *getClassName() const {
+    return Info->name();
+  }
+
+private:
+  const std::type_info *Info;
+};
+    
+// Comparison operators
+inline bool operator==(const TypeInfo &lhs, const TypeInfo &rhs) {
+  return lhs.get() == rhs.get();
+}
+
+inline bool operator<(const TypeInfo &lhs, const TypeInfo &rhs) {
+  return lhs.before(rhs);
+}
+
+inline bool operator!=(const TypeInfo &lhs, const TypeInfo &rhs) {
+  return !(lhs == rhs);
+}
+
+inline bool operator>(const TypeInfo &lhs, const TypeInfo &rhs) {
+  return rhs < lhs;
+}
+    
+inline bool operator<=(const TypeInfo &lhs, const TypeInfo &rhs) {
+  return !(lhs > rhs);
+}
+     
+inline bool operator>=(const TypeInfo &lhs, const TypeInfo &rhs) {
+  return !(lhs < rhs);
+}
+
+#endif
diff --git a/include/llvm/Support/TypeInfo.h b/include/llvm/Support/TypeInfo.h
new file mode 100644
index 00000000000..29f4e22a991
--- /dev/null
+++ b/include/llvm/Support/TypeInfo.h
@@ -0,0 +1,65 @@
+//===- Support/TypeInfo.h - Support class for type_info objects --*- C++ -*--=//
+//
+// This class makes std::type_info objects behave like first class objects that
+// can be put in maps and hashtables.  This code is based off of code in the
+// Loki C++ library from the Modern C++ Design book.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_SUPPORT_TYPEINFO_H
+#define LLVM_SUPPORT_TYPEINFO_H
+
+#include <typeinfo>
+
+struct TypeInfo {
+  TypeInfo() {                     // needed for containers
+    struct Nil {};  // Anonymous class distinct from all others...
+    Info = &typeid(Nil);
+  }
+
+  TypeInfo(const std::type_info &ti) : Info(&ti) { // non-explicit
+  }
+
+  // Access for the wrapped std::type_info
+  const std::type_info &get() const {
+    return *Info;
+  }
+
+  // Compatibility functions
+  bool before(const TypeInfo &rhs) const {
+    return Info->before(*rhs.Info);
+  }
+  const char *getClassName() const {
+    return Info->name();
+  }
+
+private:
+  const std::type_info *Info;
+};
+    
+// Comparison operators
+inline bool operator==(const TypeInfo &lhs, const TypeInfo &rhs) {
+  return lhs.get() == rhs.get();
+}
+
+inline bool operator<(const TypeInfo &lhs, const TypeInfo &rhs) {
+  return lhs.before(rhs);
+}
+
+inline bool operator!=(const TypeInfo &lhs, const TypeInfo &rhs) {
+  return !(lhs == rhs);
+}
+
+inline bool operator>(const TypeInfo &lhs, const TypeInfo &rhs) {
+  return rhs < lhs;
+}
+    
+inline bool operator<=(const TypeInfo &lhs, const TypeInfo &rhs) {
+  return !(lhs > rhs);
+}
+     
+inline bool operator>=(const TypeInfo &lhs, const TypeInfo &rhs) {
+  return !(lhs < rhs);
+}
+
+#endif
diff --git a/lib/Support/PluginLoader.cpp b/lib/Support/PluginLoader.cpp
new file mode 100644
index 00000000000..c2e4e89813a
--- /dev/null
+++ b/lib/Support/PluginLoader.cpp
@@ -0,0 +1,30 @@
+//===-- PluginLoader.cpp - Implement -load command line option ------------===//
+//
+// 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.
+//
+//===----------------------------------------------------------------------===//
+
+#include "Support/CommandLine.h"
+#include <dlfcn.h>
+#include <link.h>
+
+namespace {
+  struct PluginLoader {
+    void operator=(const std::string &Filename) {
+      if (dlopen(Filename.c_str(), RTLD_NOW) == 0)
+        std::cerr << "Error opening '" << Filename << "': " << dlerror()
+                  << "\n  -load request ignored.\n";
+    }
+  };
+}
+
+// This causes operator= above to be invoked for every -load option.
+static cl::opt<PluginLoader, false, cl::parser<string> >
+LoadOpt("load", cl::ZeroOrMore, cl::value_desc("plugin.so"),
+        cl::desc("Load the specified plugin"));
diff --git a/support/lib/Support/PluginLoader.cpp b/support/lib/Support/PluginLoader.cpp
new file mode 100644
index 00000000000..c2e4e89813a
--- /dev/null
+++ b/support/lib/Support/PluginLoader.cpp
@@ -0,0 +1,30 @@
+//===-- PluginLoader.cpp - Implement -load command line option ------------===//
+//
+// 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.
+//
+//===----------------------------------------------------------------------===//
+
+#include "Support/CommandLine.h"
+#include <dlfcn.h>
+#include <link.h>
+
+namespace {
+  struct PluginLoader {
+    void operator=(const std::string &Filename) {
+      if (dlopen(Filename.c_str(), RTLD_NOW) == 0)
+        std::cerr << "Error opening '" << Filename << "': " << dlerror()
+                  << "\n  -load request ignored.\n";
+    }
+  };
+}
+
+// This causes operator= above to be invoked for every -load option.
+static cl::opt<PluginLoader, false, cl::parser<string> >
+LoadOpt("load", cl::ZeroOrMore, cl::value_desc("plugin.so"),
+        cl::desc("Load the specified plugin"));