Fix X86 MACROs

It is necessary to not consider
64bit architecture as always X86.
Merge pull request #3193 from gustavotemple/fix-atomic-macros

Fix X86 MACRO