diff --git a/include/llvm/Target/TargetLibraryInfo.h b/include/llvm/Target/TargetLibraryInfo.h
index c4c262730ec..e8ace0c96fc 100644
--- a/include/llvm/Target/TargetLibraryInfo.h
+++ b/include/llvm/Target/TargetLibraryInfo.h
@@ -18,43 +18,43 @@ namespace llvm {
 
   namespace LibFunc {
     enum Func {
+      /// int fiprintf(FILE *stream, const char *format, ...);
+      fiprintf,
+
+      /// int fputs(const char *s, FILE *stream);
+      fputs,
+
+      /// size_t fwrite(const void *ptr, size_t size, size_t nitems,
+      /// FILE *stream);
+      fwrite,
+
+      /// int iprintf(const char *format, ...);
+      iprintf,
+
+      /// void *memcpy(void *s1, const void *s2, size_t n);
+      memcpy,
+      
+      /// void *memmove(void *s1, const void *s2, size_t n);
+      memmove,
+      
       /// void *memset(void *b, int c, size_t len);
       memset,
       
-      // void *memcpy(void *s1, const void *s2, size_t n);
-      memcpy,
-      
-      // void *memmove(void *s1, const void *s2, size_t n);
-      memmove,
-      
       /// void memset_pattern16(void *b, const void *pattern16, size_t len);
       memset_pattern16,
       
-      /// int iprintf(const char *format, ...);
-      iprintf,
-      
       /// int siprintf(char *str, const char *format, ...);
       siprintf,
 
       /// double sqrt(double x);
       sqrt,
 
-      /// long double sqrtl(long double x);
-      sqrtl,
-
       /// float sqrtf(float x);
       sqrtf,
+
+      /// long double sqrtl(long double x);
+      sqrtl,
       
-      /// int fiprintf(FILE *stream, const char *format, ...);
-      fiprintf,
-
-      // size_t fwrite(const void *ptr, size_t size, size_t nitems,
-      //               FILE *stream);
-      fwrite,
-
-      // int fputs(const char *s, FILE *stream);
-      fputs,
-
       NumLibFuncs
     };
   }
diff --git a/lib/Target/TargetLibraryInfo.cpp b/lib/Target/TargetLibraryInfo.cpp
index d6dbde5b3ac..ba318e181fc 100644
--- a/lib/Target/TargetLibraryInfo.cpp
+++ b/lib/Target/TargetLibraryInfo.cpp
@@ -22,18 +22,18 @@ char TargetLibraryInfo::ID = 0;
 
 const char* TargetLibraryInfo::StandardNames[LibFunc::NumLibFuncs] =
   {
-    "memset",
+    "fiprintf",
+    "fputs",
+    "fwrite",
+    "iprintf",
     "memcpy",
     "memmove",
+    "memset",
     "memset_pattern16",
-    "iprintf",
     "siprintf",
     "sqrt",
-    "sqrtl",
     "sqrtf",
-    "fiprintf",
-    "fwrite",
-    "fputs"
+    "sqrtl"
   };
 
 /// initialize - Initialize the set of available library functions based on the