ARM: update defaults for flags

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 63 matching lines @@
 #ifdef CAN_USE_VFP3_INSTRUCTIONS
   if (FLAG_enable_vfp3) {
     answer |= 1u << VFP3 | 1u << ARMv7;
   }
 #endif  // CAN_USE_VFP3_INSTRUCTIONS
 #ifdef CAN_USE_VFP32DREGS
   if (FLAG_enable_32dregs) {
     answer |= 1u << VFP32DREGS;
   }
 #endif  // CAN_USE_VFP32DREGS
+#ifdef CAN_USE_NEON
+  if (FLAG_enable_neon) {
+    answer |= 1u << NEON;
+  }
+#endif  // CAN_USE_VFP32DREGS
   if ((answer & (1u << ARMv7)) && FLAG_enable_unaligned_accesses) {
     answer |= 1u << UNALIGNED_ACCESSES;
   }
 
   return answer;
 }
 
 
 const char* DwVfpRegister::AllocationIndexToString(int index) {
   ASSERT(index >= 0 && index < NumAllocatableRegisters());
@@ skipping 19 matching lines @@
   // minimal set of features which is also alowed for generated code in the
   // snapshot.
   supported_ |= standard_features;
 
   if (serializer_enabled) {
     // No probing for features if we might serialize (generate snapshot).
     return;
   }
 
 #ifndef __arm__
-  // For the simulator=arm build, use VFP when FLAG_enable_vfp3 is
-  // enabled. VFPv3 implies ARMv7, see ARM DDI 0406B, page A1-6.
-  if (FLAG_enable_vfp3) {
-    supported_ |=
-        static_cast<uint64_t>(1) << VFP3 |
-        static_cast<uint64_t>(1) << ARMv7;
-  }
-  if (FLAG_enable_neon) {
-    supported_ |= 1u << NEON;
-  }
   // For the simulator=arm build, use ARMv7 when FLAG_enable_armv7 is enabled
   if (FLAG_enable_armv7) {
     supported_ |= static_cast<uint64_t>(1) << ARMv7;
+    if (FLAG_enable_vfp3) {
+      supported_ |= static_cast<uint64_t>(1) << VFP3;
+    }
+    if (FLAG_enable_neon) {
+      supported_ |= 1u << NEON;
+      supported_ |= static_cast<uint64_t>(1) << VFP32DREGS;
+    }
+    if (FLAG_enable_sudiv) {
+      supported_ |= static_cast<uint64_t>(1) << SUDIV;
+    }
+    if (FLAG_enable_movw_movt) {
+      supported_ |= static_cast<uint64_t>(1) << MOVW_MOVT_IMMEDIATE_LOADS;
+    }
+    if (FLAG_enable_32dregs) {
+      supported_ |= static_cast<uint64_t>(1) << VFP32DREGS;
+    }
   }
-
-  if (FLAG_enable_sudiv) {
-    supported_ |= static_cast<uint64_t>(1) << SUDIV;
-  }
-
-  if (FLAG_enable_movw_movt) {
-    supported_ |= static_cast<uint64_t>(1) << MOVW_MOVT_IMMEDIATE_LOADS;
-  }
-
-  if (FLAG_enable_32dregs) {
-    supported_ |= static_cast<uint64_t>(1) << VFP32DREGS;
-  }
-
   if (FLAG_enable_unaligned_accesses) {
     supported_ |= static_cast<uint64_t>(1) << UNALIGNED_ACCESSES;
   }
 
 #else  // __arm__
   // Probe for additional features not already known to be available.
   CPU cpu;
   if (!IsSupported(VFP3) && FLAG_enable_vfp3 && cpu.has_vfp3()) {
     // This implementation also sets the VFP flags if runtime
     // detection of VFP returns true. VFPv3 implies ARMv7, see ARM DDI
@@ skipping 3563 matching lines @@
   ASSERT((index_64bit == count_of_64bit_) &&
          (index_code_ptr == (index_64bit + count_of_code_ptr_)) &&
          (index_heap_ptr == (index_code_ptr + count_of_heap_ptr_)) &&
          (index_32bit == (index_heap_ptr + count_of_32bit_)));
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM