Merge riastradh-drm2 to HEAD.
Don't use the fs* variants, just use the f* ones.
Add for softfloat compatibility