diff --git a/include/llvm/Support/CommandLine.h b/include/llvm/Support/CommandLine.h
index 8517032fefe..b352686e6d9 100644
--- a/include/llvm/Support/CommandLine.h
+++ b/include/llvm/Support/CommandLine.h
@@ -150,6 +150,9 @@ class Option {
     return NormalFormatting;
   }
 
+  // Out of line virtual function to provide home for the class.
+  virtual void anchor();
+  
   int NumOccurrences;   // The number of times specified
   int Flags;            // Flags for the argument
   unsigned Position;    // Position of last occurrence of the option
diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp
index 164cb5286f3..08b6fcbd590 100644
--- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp
@@ -607,6 +607,10 @@ void cl::ParseCommandLineOptions(int &argc, char **argv,
 // Option Base class implementation
 //
 
+// Out of line virtual function to provide home for the class.
+void Option::anchor() {
+}
+
 bool Option::error(std::string Message, const char *ArgName) {
   if (ArgName == 0) ArgName = ArgStr;
   if (ArgName[0] == 0)