Simplified CPU/CpuFeatures a bit.

src/mksnapshot.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 283 matching lines @@
 }
 
 
 int main(int argc, char** argv) {
   V8::InitializeICU();
   i::Isolate::SetCrashIfDefaultIsolateInitialized();
 
   // By default, log code create information in the snapshot.
   i::FLAG_log_code = true;
 
-#if V8_TARGET_ARCH_ARM
-  // Printing flags on ARM requires knowing if we intend to enable
-  // the serializer or not.
-  v8::internal::CpuFeatures::SetHintCreatingSnapshot();
-#endif
-
   // Print the usage if an error occurs when parsing the command line
   // flags or if the help flag is set.
-  int result = i::FlagList::SetFlagsFromCommandLine(&argc, argv, true);
+  int result = i::FlagList::SetFlagsFromCommandLine(&argc, argv, true, true);
   if (result > 0 || argc != 2 || i::FLAG_help) {
     ::printf("Usage: %s [flag] ... outfile\n", argv[0]);
     i::FlagList::PrintHelp();
     return !i::FLAG_help;
   }
 #ifdef COMPRESS_STARTUP_DATA_BZ2
   BZip2Decompressor natives_decompressor;
   int bz2_result = natives_decompressor.Decompress();
   if (bz2_result != BZ_OK) {
     fprintf(stderr, "bzip error code: %d\n", bz2_result);
@@ skipping 95 matching lines @@
     writer.SetCompressor(&bzip2);
 #endif
     writer.WriteSnapshot(snapshot_data, ser, context_data, context_ser);
   }
 
   isolate->Exit();
   isolate->Dispose();
   V8::Dispose();
   return 0;
 }