Fixed for gcc and hardfp compile