x32 port (diff against vanilla x86_64)