Merge from v8 at revision 3723
diff --git a/tools/utils.py b/tools/utils.py
index 196bb05..435c12d 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -57,6 +57,8 @@
     return 'freebsd'
   elif id == 'OpenBSD':
     return 'openbsd'
+  elif id == 'SunOS':
+    return 'solaris'
   else:
     return None
 
@@ -67,6 +69,8 @@
     return 'arm'
   elif (not id) or (not re.match('(x|i[3-6])86', id) is None):
     return 'ia32'
+  elif id == 'i86pc':
+    return 'ia32'
   else:
     return None