Fix X86 MACROs

It is necessary to not consider
64bit architecture as always X86.