ARM: update defaults for flags

build/toolchain.gypi

 # Copyright 2013 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 84 matching lines @@
               'armcompiler': '<!($(echo ${CXX_host:-$(which g++)}) -v 2>&1 | grep -q "^Target: arm" && echo "yes" || echo "no")',
             },
             'conditions': [
               ['armcompiler=="yes"', {
                 'conditions': [
                   [ 'arm_version==7', {
                     'cflags': ['-march=armv7-a',],
                   }],
                   [ 'arm_version==7 or arm_version=="default"', {
                     'conditions': [
-                      [ 'arm_neon==1', {
-                        'cflags': ['-mfpu=neon',],
-                      },
-                      {
-                        'conditions': [
-                          [ 'arm_fpu!="default"', {
-                            'cflags': ['-mfpu=<(arm_fpu)',],
-                          }],
-                        ],
+                      [ 'arm_fpu!="default"', {
+                        'cflags': ['-mfpu=<(arm_fpu)',],
                       }],
                     ],
                   }],
                   [ 'arm_float_abi!="default"', {
                     'cflags': ['-mfloat-abi=<(arm_float_abi)',],
                   }],
                   [ 'arm_thumb==1', {
                     'cflags': ['-mthumb',],
                   }],
                   [ 'arm_thumb==0', {
@@ skipping 22 matching lines @@
                         'defines': [
                           'CAN_USE_VFP3_INSTRUCTIONS',
                         ],
                       }],
                       [ 'arm_fpu=="vfpv3"', {
                         'defines': [
                           'CAN_USE_VFP3_INSTRUCTIONS',
                           'CAN_USE_VFP32DREGS',
                         ],
                       }],
-                      [ 'arm_fpu=="neon" or arm_neon==1', {
+                      [ 'arm_fpu=="neon"', {
                         'defines': [
                           'CAN_USE_VFP3_INSTRUCTIONS',
                           'CAN_USE_VFP32DREGS',
+                          'CAN_USE_NEON',
                         ],
                       }],
                     ],
                   }],
                   [ 'arm_float_abi=="hard"', {
                     'defines': [
                       'USE_EABI_HARDFLOAT=1',
                     ],
                   }],
                   [ 'arm_float_abi=="softfp" or arm_float_abi=="default"', {
@@ skipping 13 matching lines @@
               'armcompiler': '<!($(echo ${CXX_target:-<(CXX)}) -v 2>&1 | grep -q "^Target: arm" && echo "yes" || echo "no")',
             },
             'conditions': [
               ['armcompiler=="yes"', {
                 'conditions': [
                   [ 'arm_version==7', {
                     'cflags': ['-march=armv7-a',],
                   }],
                   [ 'arm_version==7 or arm_version=="default"', {
                     'conditions': [
-                      [ 'arm_neon==1', {
-                        'cflags': ['-mfpu=neon',],
-                      },
-                      {
-                        'conditions': [
-                          [ 'arm_fpu!="default"', {
-                            'cflags': ['-mfpu=<(arm_fpu)',],
-                          }],
-                        ],
+                      [ 'arm_fpu!="default"', {
+                        'cflags': ['-mfpu=<(arm_fpu)',],
                       }],
                     ],
                   }],
                   [ 'arm_float_abi!="default"', {
                     'cflags': ['-mfloat-abi=<(arm_float_abi)',],
                   }],
                   [ 'arm_thumb==1', {
                     'cflags': ['-mthumb',],
                   }],
                   [ 'arm_thumb==0', {
                     'cflags': ['-marm',],
                   }],
                   [ 'arm_test=="on"', {
                     'defines': [
                       'ARM_TEST',
                     ],
+                    'conditions': [
+                      [ 'arm_fpu=="vfpv3-d16"', {
+                        'defines': [
+                          'CAN_USE_VFP3_INSTRUCTIONS',
+                        ],
+                      }],
+                      [ 'arm_fpu=="vfpv3"', {
+                        'defines': [
+                          'CAN_USE_VFP3_INSTRUCTIONS',
+                          'CAN_USE_VFP32DREGS',
+                        ],
+                      }],
+                      [ 'arm_fpu=="neon"', {
+                        'defines': [
+                          'CAN_USE_VFP3_INSTRUCTIONS',
+                          'CAN_USE_VFP32DREGS',
+                          'CAN_USE_NEON',
+                        ],
+                      }],
+                    ],
                   }],
                 ],
               }, {
                 # armcompiler=="no"
                 'conditions': [
                   [ 'arm_version==7 or arm_version=="default"', {
                     'defines': [
                       'CAN_USE_ARMV7_INSTRUCTIONS=1',
                     ],
                     'conditions': [
                       [ 'arm_fpu=="default"', {
                         'defines': [
                           'CAN_USE_VFP3_INSTRUCTIONS',
+                          'CAN_USE_VFP32DREGS',
+                          'CAN_USE_NEON',
                         ],
                       }],
                       [ 'arm_fpu=="vfpv3-d16"', {
                         'defines': [
                           'CAN_USE_VFP3_INSTRUCTIONS',
                         ],
                       }],
                       [ 'arm_fpu=="vfpv3"', {
                         'defines': [
                           'CAN_USE_VFP3_INSTRUCTIONS',
                           'CAN_USE_VFP32DREGS',
                         ],
                       }],
-                      [ 'arm_fpu=="neon" or arm_neon==1', {
+                      [ 'arm_fpu=="neon"', {
                         'defines': [
                           'CAN_USE_VFP3_INSTRUCTIONS',
                           'CAN_USE_VFP32DREGS',
+                          'CAN_USE_NEON',
                         ],
                       }],
                     ],
                   }],
                   [ 'arm_float_abi=="hard"', {
                     'defines': [
                       'USE_EABI_HARDFLOAT=1',
                     ],
                   }],
                   [ 'arm_float_abi=="softfp" or arm_float_abi=="default"', {
@@ skipping 533 matching lines @@
                 'OptimizeReferences': '2',
                 'EnableCOMDATFolding': '2',
               },
             },
           }],  # OS=="win"
         ],  # conditions
       },  # Release
     },  # configurations
   },  # target_defaults
 }