am ffcdd9f1: Merge "x86_64: Unify 64-bit check in x86 compiler"

* commit 'ffcdd9f13daba70a64bb85688726ae23aa7a6eda':
  x86_64: Unify 64-bit check in x86 compiler