am 5edef2e8: Merge "x86_64/x32: Avoid early fail on x32 or x86_64 build"

* commit '5edef2e84e3c0d7df5e16904111061016a02c95f':
  x86_64/x32: Avoid early fail on x32 or x86_64 build