Merge 6800:7180 from the bleeding edge branch to the experimental/gc branch.

src/v8.cc

 // Copyright 2006-2009 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 37 matching lines @@
 bool V8::has_been_disposed_ = false;
 bool V8::has_fatal_error_ = false;
 bool V8::use_crankshaft_ = true;
 
 
 bool V8::Initialize(Deserializer* des) {
   bool create_heap_objects = des == NULL;
   if (has_been_disposed_ || has_fatal_error_) return false;
   if (IsRunning()) return true;
 
+#if defined(V8_TARGET_ARCH_ARM) && !defined(USE_ARM_EABI)
+  use_crankshaft_ = false;
+#else
   use_crankshaft_ = FLAG_crankshaft;
+#endif
+
   // Peephole optimization might interfere with deoptimization.
   FLAG_peephole_optimization = !use_crankshaft_;
   is_running_ = true;
   has_been_setup_ = true;
   has_fatal_error_ = false;
   has_been_disposed_ = false;
 #ifdef DEBUG
   // The initialization process does not handle memory exhaustion.
   DisallowAllocationFailure disallow_allocation_failure;
 #endif
@@ skipping 80 matching lines @@
 
 void V8::SetFatalError() {
   is_running_ = false;
   has_fatal_error_ = true;
 }
 
 
 void V8::TearDown() {
   if (!has_been_setup_ || has_been_disposed_) return;
 
-  if (FLAG_time_hydrogen) HStatistics::Instance()->Print();
+  if (FLAG_hydrogen_stats) HStatistics::Instance()->Print();
 
   // We must stop the logger before we tear down other components.
   Logger::EnsureTickerStopped();
 
   Deoptimizer::TearDown();
 
   if (FLAG_preemption) {
     v8::Locker locker;
     v8::Locker::StopPreemption();
   }
@@ skipping 91 matching lines @@
   // ( 1.(20 0s)(32 random bits) x 2^20 ) - (1.0 x 2^20)).
   const double binary_million = 1048576.0;
   r->double_value = binary_million;
   r->uint64_t_value |=  random_bits;
   r->double_value -= binary_million;
 
   return heap_number;
 }
 
 } }  // namespace v8::internal