Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2013 the V8 project authors. All rights reserved. | 1 # Copyright 2013 the V8 project authors. All rights reserved. |
| 2 # Redistribution and use in source and binary forms, with or without | 2 # Redistribution and use in source and binary forms, with or without |
| 3 # modification, are permitted provided that the following conditions are | 3 # modification, are permitted provided that the following conditions are |
| 4 # met: | 4 # met: |
| 5 # | 5 # |
| 6 # * Redistributions of source code must retain the above copyright | 6 # * Redistributions of source code must retain the above copyright |
| 7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
| 8 # * Redistributions in binary form must reproduce the above | 8 # * Redistributions in binary form must reproduce the above |
| 9 # copyright notice, this list of conditions and the following | 9 # copyright notice, this list of conditions and the following |
| 10 # disclaimer in the documentation and/or other materials provided | 10 # disclaimer in the documentation and/or other materials provided |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 146 'defines': [ | 146 'defines': [ |
| 147 'CAN_USE_VFP3_INSTRUCTIONS', | 147 'CAN_USE_VFP3_INSTRUCTIONS', |
| 148 ], | 148 ], |
| 149 }], | 149 }], |
| 150 [ 'arm_fpu=="vfpv3"', { | 150 [ 'arm_fpu=="vfpv3"', { |
| 151 'defines': [ | 151 'defines': [ |
| 152 'CAN_USE_VFP3_INSTRUCTIONS', | 152 'CAN_USE_VFP3_INSTRUCTIONS', |
| 153 'CAN_USE_VFP32DREGS', | 153 'CAN_USE_VFP32DREGS', |
| 154 ], | 154 ], |
| 155 }], | 155 }], |
| 156 [ 'arm_fpu=="neon" or arm_neon==1', { | 156 [ 'arm_fpu=="neon" or arm_neon==1', { |
|
Benedikt Meurer
2014/05/02 06:51:52
...and also remove it from the gypi file.
vincent.belliard
2014/05/06 13:01:49
Done.
| |
| 157 'defines': [ | 157 'defines': [ |
| 158 'CAN_USE_VFP3_INSTRUCTIONS', | 158 'CAN_USE_VFP3_INSTRUCTIONS', |
| 159 'CAN_USE_VFP32DREGS', | 159 'CAN_USE_VFP32DREGS', |
| 160 'CAN_USE_NEON', | |
| 160 ], | 161 ], |
| 161 }], | 162 }], |
| 162 ], | 163 ], |
| 163 }], | 164 }], |
| 164 [ 'arm_float_abi=="hard"', { | 165 [ 'arm_float_abi=="hard"', { |
| 165 'defines': [ | 166 'defines': [ |
| 166 'USE_EABI_HARDFLOAT=1', | 167 'USE_EABI_HARDFLOAT=1', |
| 167 ], | 168 ], |
| 168 }], | 169 }], |
| 169 [ 'arm_float_abi=="softfp" or arm_float_abi=="default"', { | 170 [ 'arm_float_abi=="softfp" or arm_float_abi=="default"', { |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 208 [ 'arm_thumb==1', { | 209 [ 'arm_thumb==1', { |
| 209 'cflags': ['-mthumb',], | 210 'cflags': ['-mthumb',], |
| 210 }], | 211 }], |
| 211 [ 'arm_thumb==0', { | 212 [ 'arm_thumb==0', { |
| 212 'cflags': ['-marm',], | 213 'cflags': ['-marm',], |
| 213 }], | 214 }], |
| 214 [ 'arm_test=="on"', { | 215 [ 'arm_test=="on"', { |
| 215 'defines': [ | 216 'defines': [ |
| 216 'ARM_TEST', | 217 'ARM_TEST', |
| 217 ], | 218 ], |
| 219 'conditions': [ | |
| 220 [ 'arm_fpu=="vfpv3-d16"', { | |
| 221 'defines': [ | |
| 222 'CAN_USE_VFP3_INSTRUCTIONS', | |
| 223 ], | |
| 224 }], | |
| 225 [ 'arm_fpu=="vfpv3"', { | |
| 226 'defines': [ | |
| 227 'CAN_USE_VFP3_INSTRUCTIONS', | |
| 228 'CAN_USE_VFP32DREGS', | |
| 229 ], | |
| 230 }], | |
| 231 [ 'arm_fpu=="neon"', { | |
| 232 'defines': [ | |
| 233 'CAN_USE_VFP3_INSTRUCTIONS', | |
| 234 'CAN_USE_VFP32DREGS', | |
| 235 'CAN_USE_NEON', | |
| 236 ], | |
| 237 }], | |
| 238 ], | |
| 218 }], | 239 }], |
| 219 ], | 240 ], |
| 220 }, { | 241 }, { |
| 221 # armcompiler=="no" | 242 # armcompiler=="no" |
| 222 'conditions': [ | 243 'conditions': [ |
| 223 [ 'arm_version==7 or arm_version=="default"', { | 244 [ 'arm_version==7 or arm_version=="default"', { |
| 224 'defines': [ | 245 'defines': [ |
| 225 'CAN_USE_ARMV7_INSTRUCTIONS=1', | 246 'CAN_USE_ARMV7_INSTRUCTIONS=1', |
| 226 ], | 247 ], |
| 227 'conditions': [ | 248 'conditions': [ |
| 228 [ 'arm_fpu=="default"', { | 249 [ 'arm_fpu=="default"', { |
| 229 'defines': [ | 250 'defines': [ |
| 230 'CAN_USE_VFP3_INSTRUCTIONS', | 251 'CAN_USE_VFP3_INSTRUCTIONS', |
| 252 'CAN_USE_VFP32DREGS', | |
| 253 'CAN_USE_NEON', | |
| 231 ], | 254 ], |
| 232 }], | 255 }], |
| 233 [ 'arm_fpu=="vfpv3-d16"', { | 256 [ 'arm_fpu=="vfpv3-d16"', { |
| 234 'defines': [ | 257 'defines': [ |
| 235 'CAN_USE_VFP3_INSTRUCTIONS', | 258 'CAN_USE_VFP3_INSTRUCTIONS', |
| 236 ], | 259 ], |
| 237 }], | 260 }], |
| 238 [ 'arm_fpu=="vfpv3"', { | 261 [ 'arm_fpu=="vfpv3"', { |
| 239 'defines': [ | 262 'defines': [ |
| 240 'CAN_USE_VFP3_INSTRUCTIONS', | 263 'CAN_USE_VFP3_INSTRUCTIONS', |
| 241 'CAN_USE_VFP32DREGS', | 264 'CAN_USE_VFP32DREGS', |
| 242 ], | 265 ], |
| 243 }], | 266 }], |
| 244 [ 'arm_fpu=="neon" or arm_neon==1', { | 267 [ 'arm_fpu=="neon" or arm_neon==1', { |
| 245 'defines': [ | 268 'defines': [ |
| 246 'CAN_USE_VFP3_INSTRUCTIONS', | 269 'CAN_USE_VFP3_INSTRUCTIONS', |
| 247 'CAN_USE_VFP32DREGS', | 270 'CAN_USE_VFP32DREGS', |
| 271 'CAN_USE_NEON', | |
| 248 ], | 272 ], |
| 249 }], | 273 }], |
| 250 ], | 274 ], |
| 251 }], | 275 }], |
| 252 [ 'arm_float_abi=="hard"', { | 276 [ 'arm_float_abi=="hard"', { |
| 253 'defines': [ | 277 'defines': [ |
| 254 'USE_EABI_HARDFLOAT=1', | 278 'USE_EABI_HARDFLOAT=1', |
| 255 ], | 279 ], |
| 256 }], | 280 }], |
| 257 [ 'arm_float_abi=="softfp" or arm_float_abi=="default"', { | 281 [ 'arm_float_abi=="softfp" or arm_float_abi=="default"', { |
| (...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 791 'OptimizeReferences': '2', | 815 'OptimizeReferences': '2', |
| 792 'EnableCOMDATFolding': '2', | 816 'EnableCOMDATFolding': '2', |
| 793 }, | 817 }, |
| 794 }, | 818 }, |
| 795 }], # OS=="win" | 819 }], # OS=="win" |
| 796 ], # conditions | 820 ], # conditions |
| 797 }, # Release | 821 }, # Release |
| 798 }, # configurations | 822 }, # configurations |
| 799 }, # target_defaults | 823 }, # target_defaults |
| 800 } | 824 } |
| OLD | NEW |