Revision 300dd349

View differences:

configure
342 342
          '__ARM_ARCH_7M__' in cc_macros_cache)
343 343

  
344 344

  
345
def is_arch_armv6():
346
  """Check for ARMv6 instructions"""
347
  cc_macros_cache = cc_macros()
348
  return ('__ARM_ARCH_6__' in cc_macros_cache or
349
          '__ARM_ARCH_6M__' in cc_macros_cache)
350

  
351

  
345 352
def is_arm_neon():
346 353
  """Check for ARM NEON support"""
347 354
  return '__ARM_NEON__' in cc_macros()
......
438 445
    arm_float_abi = 'hard'
439 446
  else:
440 447
    arm_float_abi = 'default'
441
  o['variables']['armv7'] = int(is_arch_armv7())
448

  
449
  if is_arch_armv7():
450
    o['variables']['arm_version'] = '7'
451
  elif is_arch_armv6():
452
    o['variables']['arm_version'] = '6'
453
  else:
454
    o['variables']['arm_version'] = 'default'
455

  
442 456
  o['variables']['arm_fpu'] = 'vfpv3'  # V8 3.18 no longer supports VFP2.
443 457
  o['variables']['arm_neon'] = int(is_arm_neon())
444 458
  o['variables']['arm_thumb'] = 0      # -marm

Also available in: Unified diff