Update x32 generator
Rebased with f990d451d4a5b13778433967cc07f007716aa068