Fix some style issues in the ARM code....

src/arm/assembler-arm.cc

 // Copyright (c) 1994-2006 Sun Microsystems Inc.
 // 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.
 //
@@ skipping 25 matching lines @@
 
 #include "v8.h"
 
 #include "arm/assembler-arm-inl.h"
 #include "serialize.h"
 
 namespace v8 {
 namespace internal {
 
 // Safe default is no features.
-uint64_t CpuFeatures::supported_ = 0;
-uint64_t CpuFeatures::enabled_ = 0;
+unsigned CpuFeatures::supported_ = 0;
+unsigned CpuFeatures::enabled_ = 0;
 
 void CpuFeatures::Probe() {
-  // Perform runtime detection of VFP.
-  static const char* descriptive_file_linux = "/proc/cpuinfo";
-
+  // If the compiler is allowed to use vfp then we can use vfp too in our
+  // code generation.
   #if !defined(__arm__) || (defined(__VFP_FP__) && !defined(__SOFTFP__))
-    // The  supported & enabled flags for VFP are set to true for the following
+    // The  supported flags for VFP are set to true for the following
     // conditions, even without runtime detection of VFP:
     // (1) For the simulator=arm build, always use VFP since
     // the arm simulator has VFP support.
     // (2) If V8 is being compiled with GCC with the vfp option turned on,
     // always use VFP since the build system assumes that V8 will run on
     // a platform that has VFP hardware.
-    supported_ |= static_cast<uint64_t>(1) << VFP3;
-    enabled_ |= static_cast<uint64_t>(1) << VFP3;
+    supported_ |= 1u << VFP3;
+    enabled_ |= 1u << VFP3;
   #endif
 
-  if (OS::fgrep_vfp(descriptive_file_linux, "vfp")) {
+  if (Serializer::enabled()) return;  // No features if we might serialize.
+
+  if (OS::ArmCpuHasFeature(OS::VFP)) {
     // This implementation also sets the VFP flags if
     // runtime detection of VFP returns true.
-    supported_ |= static_cast<uint64_t>(1) << VFP3;
-    enabled_ |= static_cast<uint64_t>(1) << VFP3;
+    supported_ |= 1u << VFP3;
   }
 }
 
 // -----------------------------------------------------------------------------
 // Implementation of Register and CRegister
 
 Register no_reg = { -1 };
 
 Register r0  = {  0 };
 Register r1  = {  1 };
@@ skipping 1731 matching lines @@
     bind(&after_pool);
   }
 
   // Since a constant pool was just emitted, move the check offset forward by
   // the standard interval.
   next_buffer_check_ = pc_offset() + kCheckConstInterval;
 }
 
 
 } }  // namespace v8::internal