diff --git a/lib/Support/Annotation.cpp b/lib/Support/Annotation.cpp
index 38b06070867..0e208e08ba0 100644
--- a/lib/Support/Annotation.cpp
+++ b/lib/Support/Annotation.cpp
@@ -27,7 +27,16 @@ Annotable::~Annotable() {   // Virtual because it's designed to be subclassed...
   }
 }
 
-typedef std::map<const char*, unsigned> IDMapType;
+namespace {
+  class StrCmp {
+  public:
+    bool operator()(const char *a, const char *b) {
+      return strcmp(a, b) < 0;
+    }
+  };
+}
+
+typedef std::map<const char*, unsigned, StrCmp> IDMapType;
 static unsigned IDCounter = 0;  // Unique ID counter
 
 // Static member to ensure initialiation on demand.