Switch armv7 setting to arm_version=7 in v8 gyp files

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 74 matching lines @@
           'V8_TARGET_ARCH_ARM',
         ],
         'target_conditions': [
           ['_toolset=="host"', {
             'variables': {
               'armcompiler': '<!($(echo ${CXX_host:-$(which g++)}) -v 2>&1 | grep -q "^Target: arm" && echo "yes" || echo "no")',
             },
             'conditions': [
               ['armcompiler=="yes"', {
                 'conditions': [
-                  [ 'armv7==1', {
+                  [ 'arm_version==7', {
                     'cflags': ['-march=armv7-a',],
-                  }],
-                  [ 'armv7==1 or armv7=="default"', {
                     'conditions': [
                       [ 'arm_neon==1', {
                         'cflags': ['-mfpu=neon',],
                       },
                       {
                         'conditions': [
                           [ 'arm_fpu!="default"', {
                             'cflags': ['-mfpu=<(arm_fpu)',],
                           }],
                         ],
@@ skipping 11 matching lines @@
                   }],
                   [ 'arm_test=="on"', {
                     'defines': [
                       'ARM_TEST',
                     ],
                   }],
                 ],
               }, {
                 # armcompiler=="no"
                 'conditions': [
-                  [ 'armv7==1 or armv7=="default"', {
+                  [ 'arm_version==7', {
                     'defines': [
                       'CAN_USE_ARMV7_INSTRUCTIONS=1',
                     ],
                     'conditions': [
                       [ 'arm_fpu=="default"', {
                         'defines': [
                           'CAN_USE_VFP3_INSTRUCTIONS',
                         ],
                       }],
                       [ 'arm_fpu=="vfpv3-d16"', {
@@ skipping 32 matching lines @@
               }],
             ],
           }],  # _toolset=="host"
           ['_toolset=="target"', {
             'variables': {
               'armcompiler': '<!($(echo ${CXX_target:-<(CXX)}) -v 2>&1 | grep -q "^Target: arm" && echo "yes" || echo "no")',
             },
             'conditions': [
               ['armcompiler=="yes"', {
                 'conditions': [
-                  [ 'armv7==1', {
+                  [ 'arm_version==7', {
                     'cflags': ['-march=armv7-a',],
-                  }],
-                  [ 'armv7==1 or armv7=="default"', {
                     'conditions': [
                       [ 'arm_neon==1', {
                         'cflags': ['-mfpu=neon',],
                       },
                       {
                         'conditions': [
                           [ 'arm_fpu!="default"', {
                             'cflags': ['-mfpu=<(arm_fpu)',],
                           }],
                         ],
@@ skipping 11 matching lines @@
                   }],
                   [ 'arm_test=="on"', {
                     'defines': [
                       'ARM_TEST',
                     ],
                   }],
                 ],
               }, {
                 # armcompiler=="no"
                 'conditions': [
-                  [ 'armv7==1 or armv7=="default"', {
+                  [ 'arm_version==7', {
                     'defines': [
                       'CAN_USE_ARMV7_INSTRUCTIONS=1',
                     ],
                     'conditions': [
                       [ 'arm_fpu=="default"', {
                         'defines': [
                           'CAN_USE_VFP3_INSTRUCTIONS',
                         ],
                       }],
                       [ 'arm_fpu=="vfpv3-d16"', {
@@ skipping 453 matching lines @@
                 'OptimizeReferences': '2',
                 'EnableCOMDATFolding': '2',
               },
             },
           }],  # OS=="win"
         ],  # conditions
       },  # Release
     },  # configurations
   },  # target_defaults
 }