Fix ARM specific GYP variables

Review URL: https://codereview.chromium.org/14208011

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14291 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/Makefile b/Makefile
index bedf087..f885bf1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -179,8 +179,6 @@ endif
 # When using the simulator, this flag is implied.
 ifeq ($(armtest), on)
   GYPFLAGS += -Darm_test=on
-else
-  GYPFLAGS += -Darm_test=off
 endif
 
 # ----------------- available targets: --------------------

diff --git a/build/common.gypi b/build/common.gypi
index 37cfe16..6dc9a7b 100644 (file)
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -44,30 +44,17 @@
     # access is allowed for all CPUs.
     'v8_can_use_unaligned_accesses%': 'default',
 
-    # Setting 'v8_can_use_vfp2_instructions' to 'true' will enable use of ARM VFP
-    # instructions in the V8 generated code. VFP instructions will be enabled
-    # both for the snapshot and for the ARM target. Leaving the default value
-    # of 'false' will avoid VFP instructions in the snapshot and use CPU feature
-    # probing when running on the target.
-    'v8_can_use_vfp2_instructions%': 'false',
-    'v8_can_use_vfp3_instructions%': 'false',
-
     # Setting 'v8_can_use_vfp32dregs' to 'true' will cause V8 to use the VFP
     # registers d16-d31 in the generated code, both in the snapshot and for the
     # ARM target. Leaving the default value of 'false' will avoid the use of
     # these registers in the snapshot and use CPU feature probing when running
     # on the target.
     'v8_can_use_vfp32dregs%': 'false',
+    'arm_test%': 'off',
 
     # Similar to vfp but on MIPS.
     'v8_can_use_fpu_instructions%': 'true',
 
-    # Setting v8_use_arm_eabi_hardfloat to true will turn on V8 support for ARM
-    # EABI calling convention where double arguments are passed in VFP
-    # registers. Note that the GCC flag '-mfloat-abi=hard' should be used as
-    # well when compiling for the ARM target.
-    'v8_use_arm_eabi_hardfloat%': 'false',
-
     # Similar to the ARM hard float ABI but on MIPS.
     'v8_use_mips_abi_hardfloat%': 'true',
 

diff --git a/src/arm/constants-arm.h b/src/arm/constants-arm.h
index ffedfd1..747dc56 100644 (file)
--- a/src/arm/constants-arm.h
+++ b/src/arm/constants-arm.h
@@ -44,8 +44,10 @@
     defined(__ARM_ARCH_7R__) || \
     defined(__ARM_ARCH_7__)
 # define CAN_USE_ARMV7_INSTRUCTIONS 1
+#ifndef CAN_USE_VFP3_INSTRUCTIONS
 # define CAN_USE_VFP3_INSTRUCTIONS
 #endif
+#endif
 
 #if defined(__ARM_ARCH_6__)   ||   \
     defined(__ARM_ARCH_6J__)  ||  \