Merge "x86_64/x32: Add targets"