Skip to content

Commit

Permalink
configure: disable vfpv3 on armv6
Browse files Browse the repository at this point in the history
VFPv3 is ARMv7-only, enabling it for ARMv6 is therefore always wrong.
Mea culpa, I do believe I'm the original author of that change.

Fixes: #283
PR-URL: #559
Reviewed-By: Fedor Indutny <[email protected]>
  • Loading branch information
bnoordhuis committed Jan 22, 2015
1 parent 297cadb commit 7d9d756
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -468,14 +468,14 @@ def configure_arm(o):
arm_float_abi = 'default'

if is_arch_armv7():
o['variables']['arm_fpu'] = 'vfpv3'
o['variables']['arm_neon'] = int(is_arm_neon())
o['variables']['arm_version'] = '7'
elif is_arch_armv6():
o['variables']['arm_version'] = '6'
else:
o['variables']['arm_version'] = 'default'
o['variables']['arm_fpu'] = 'vfpv2'
o['variables']['arm_neon'] = 0
o['variables']['arm_version'] = '6' if is_arch_armv6() else 'default'

o['variables']['arm_fpu'] = 'vfpv3' # V8 3.18 no longer supports VFP2.
o['variables']['arm_neon'] = int(is_arm_neon())
o['variables']['arm_thumb'] = 0 # -marm
o['variables']['arm_float_abi'] = arm_float_abi

Expand Down

0 comments on commit 7d9d756

Please sign in to comment.