x86: Alignment v2

Last patch was too simplistic, it seems.
On linux we are not well set up to test this path,
at least without libffi support for vectors.