Simplified CPU/CpuFeatures a bit.

src/flags.h

Index: src/flags.h
diff --git a/src/flags.h b/src/flags.h
index fe182e5221cec755e4c629ffabda040e738e701a..70376b0d31011c2f8283ed0938a07974f2eb2627 100644
--- a/src/flags.h
+++ b/src/flags.h
@@ -63,7 +63,10 @@ class FlagList {
   //   --flag=value  (non-bool flags only, no spaces around '=')
   //   --flag value  (non-bool flags only)
   //   --            (equivalent to --js_arguments, captures all remaining args)
-  static int SetFlagsFromCommandLine(int* argc, char** argv, bool remove_flags);
+  static int SetFlagsFromCommandLine(int* argc,
+                                     char** argv,
+                                     bool remove_flags,
+                                     bool serializer_enabled = false);
 
   // Set the flag values by parsing the string str. Splits string into argc
   // substrings argv[], each of which consisting of non-white-space chars,
@@ -78,6 +81,10 @@ class FlagList {
 
   // Set flags as consequence of being implied by another flag.
   static void EnforceFlagImplications();
+
+ private:
+  // TODO(svenpanne) Remove this when Serializer/startup has been refactored.
+  static bool serializer_enabled_;
 };
 
 } }  // namespace v8::internal