Merge change 7524

* changes:
  add HAVE_VFP flag