diff --git a/tools/mknmlist b/tools/mknmlist
index ab2d1cd7a..3bd5615c5 100644
--- a/tools/mknmlist
+++ b/tools/mknmlist
@@ -1,7 +1,7 @@
 function sort(V, N, 	                        tmp, i, j) {
   V[-1] = ""; # Used as a sentinel before V[0].
-  for (i = 1; i < N; i++) 
-    for (j = i; V[j - 1] > V[j]; j--) { 
+  for (i = 1; i < N; i++)
+    for (j = i; V[j - 1] > V[j]; j--) {
       tmp = V[j];
       V[j] = V[j - 1];
       V[j - 1] = tmp;
@@ -14,14 +14,16 @@ BEGIN {
  builtin["printf"] =	"int printf(const char *, ...)";
  builtin["sprintf"] =	"int sprintf(char *, const char *, ...)";
  builtin["malloc"] =	"void *malloc()";
+ builtin["calloc"] =	"void *calloc()";
  builtin["memcpy"] =	"void *memcpy()";
  builtin["memset"] =	"void *memset()";
  builtin["memmove"] =	"void *memmove()";
  builtin["strcpy"] =	"char *strcpy()";
+ builtin["strchr"] =	"char *strchr()";
  builtin[""] = 	"";
 }
 
-/^[0123456789abcdef]+ [ABCDGINRSTUVW] / { 
+/^[0123456789abcdef]+ [ABCDGRSTUVW] / {
   if ($3 != "symbols" && $3 != "symbols_nelts") {
     name[nname] = $3;
     nname++;