ARM: Fix build flags for snapshot generation.

build/common.gypi

 # Copyright 2012 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 111 matching lines @@
       ['v8_enable_verify_heap==1', {
         'defines': ['VERIFY_HEAP',],
       }],
       ['v8_interpreted_regexp==1', {
         'defines': ['V8_INTERPRETED_REGEXP',],
       }],
       ['v8_target_arch=="arm"', {
         'defines': [
           'V8_TARGET_ARCH_ARM',
         ],
-        'variables': {
-          'armsimulator': '<!($(echo <(CXX)) -v 2>&1 | grep -q "^Target: arm" && echo "no" || echo "yes")',
-        },
-        'conditions': [
-          [ 'v8_can_use_unaligned_accesses=="true"', {
-            'defines': [
-              'CAN_USE_UNALIGNED_ACCESSES=1',
-            ],
-          }, {
-            'defines': [
-              'CAN_USE_UNALIGNED_ACCESSES=0',
-            ],
-          }],
-          ['armsimulator=="no"', {
-            'target_conditions': [
-              ['_toolset=="target"', {
+        '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', {
                     'cflags': ['-march=armv7-a',],
                   }],
                   [ 'armv7==1 or armv7=="default"', {
                     'conditions': [
                       [ 'arm_neon==1', {
                         'cflags': ['-mfpu=neon',],
                       },
                       {
                         'conditions': [
                           [ '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_test=="on"', {
+              }, {
+                # armcompiler=="no"
+                'conditions': [
+                  [ 'armv7==1 or armv7=="default"', {
+                    'defines': [
+                      'CAN_USE_ARMV7_INSTRUCTIONS=1',
+                    ],
+                    'conditions': [
+                      [ 'arm_fpu=="default"', {
+                        'defines': [
+                          'CAN_USE_VFP3_INSTRUCTIONS',
+                        ],
+                      }],
+                      [ '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', {
+                        'defines': [
+                          'CAN_USE_VFP3_INSTRUCTIONS',
+                          'CAN_USE_VFP32DREGS',
+                        ],
+                      }],
+                    ],
+                  }],
+                  [ 'arm_float_abi=="hard"', {
+                    'defines': [
+                      'USE_EABI_HARDFLOAT=1',
+                    ],
+                  }],
+                  [ 'arm_float_abi=="softfp" or arm_float_abi=="default"', {
+                    'defines': [
+                      'USE_EABI_HARDFLOAT=0',
+                    ],
+                  }],
+                ],
                 'defines': [
                   'ARM_TEST',
                 ],
               }],
             ],
-          }],
-          ['armsimulator=="yes"', {
-            'defines': [
-              'ARM_TEST',
-            ],
+          }],  # _toolset=="host"
+          ['_toolset=="target"', {
+            'variables': {
+              'armcompiler': '<!($(echo ${CXX_target:-<(CXX)}) -v 2>&1 | grep -q "^Target: arm" && echo "yes" || echo "no")',
+            },
             'conditions': [
-              [ 'armv7==1 or armv7=="default"', {
-                'defines': [
-                  'CAN_USE_ARMV7_INSTRUCTIONS=1',
-                ],
+              ['armcompiler=="yes"', {
                 'conditions': [
-                  [ 'arm_fpu=="default"', {
-                    'defines': [
-                      'CAN_USE_VFP3_INSTRUCTIONS',
+                  [ 'armv7==1', {
+                    'cflags': ['-march=armv7-a',],
+                  }],
+                  [ 'armv7==1 or armv7=="default"', {
+                    'conditions': [
+                      [ 'arm_neon==1', {
+                        'cflags': ['-mfpu=neon',],
+                      },
+                      {
+                        'conditions': [
+                          [ 'arm_fpu!="default"', {
+                            'cflags': ['-mfpu=<(arm_fpu)',],
+                          }],
+                        ],
+                      }],
                     ],
                   }],
-                  [ 'arm_fpu=="vfpv3-d16"', {
+                  [ 'arm_float_abi!="default"', {
+                    'cflags': ['-mfloat-abi=<(arm_float_abi)',],
+                  }],
+                  [ 'arm_thumb==1', {
+                    'cflags': ['-mthumb',],
+                  }],
+                  [ 'arm_thumb==0', {
+                    'cflags': ['-marm',],
+                  }],
+                  [ 'arm_test=="on"', {
                     'defines': [
-                      'CAN_USE_VFP3_INSTRUCTIONS',
-                    ],
-                  }],
-                  [ 'arm_fpu=="vfpv3"', {
-                    'defines': [
-                      'CAN_USE_VFP3_INSTRUCTIONS',
-                      'CAN_USE_VFP32DREGS',
-                    ],
-                  }],
-                  [ 'arm_fpu=="neon" or arm_neon==1', {
-                    'defines': [
-                      'CAN_USE_VFP3_INSTRUCTIONS',
-                      'CAN_USE_VFP32DREGS',
+                      'ARM_TEST',
                     ],
                   }],
                 ],
-              }],
-              [ 'arm_float_abi=="hard"', {
+              }, {
+                # armcompiler=="no"
+                'conditions': [
+                  [ 'armv7==1 or armv7=="default"', {
+                    'defines': [
+                      'CAN_USE_ARMV7_INSTRUCTIONS=1',
+                    ],
+                    'conditions': [
+                      [ 'arm_fpu=="default"', {
+                        'defines': [
+                          'CAN_USE_VFP3_INSTRUCTIONS',
+                        ],
+                      }],
+                      [ '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', {
+                        'defines': [
+                          'CAN_USE_VFP3_INSTRUCTIONS',
+                          'CAN_USE_VFP32DREGS',
+                        ],
+                      }],
+                    ],
+                  }],
+                  [ 'arm_float_abi=="hard"', {
+                    'defines': [
+                      'USE_EABI_HARDFLOAT=1',
+                    ],
+                  }],
+                  [ 'arm_float_abi=="softfp" or arm_float_abi=="default"', {
+                    'defines': [
+                      'USE_EABI_HARDFLOAT=0',
+                    ],
+                  }],
+                ],
                 'defines': [
-                  'USE_EABI_HARDFLOAT=1',
+                  'ARM_TEST',
                 ],
               }],
-              [ 'arm_float_abi=="softfp" or arm_float_abi=="default"', {
-                'defines': [
-                  'USE_EABI_HARDFLOAT=0',
-                ],
-              }],
-            ]
-          }],
+            ],
+          }],  # _toolset=="target"
         ],
       }],  # v8_target_arch=="arm"
       ['v8_target_arch=="ia32"', {
         'defines': [
           'V8_TARGET_ARCH_IA32',
         ],
       }],  # v8_target_arch=="ia32"
       ['v8_target_arch=="mipsel"', {
         'defines': [
           'V8_TARGET_ARCH_MIPS',
@@ skipping 265 matching lines @@
                 'OptimizeReferences': '2',
                 'EnableCOMDATFolding': '2',
               },
             },
           }],  # OS=="win"
         ],  # conditions
       },  # Release
     },  # configurations
   },  # target_defaults
 }