Add missing return in __SOFTFP__ variant, pointed out by htodd.
Move bogusly merged files over to new location.