am 612333f6: Merge "Don\'t #define SYS_ constants unless they make sense for the current architecture."

* commit '612333f671a59d98fad6f594f5bf657dbd6c9c4d':
  Don't #define SYS_ constants unless they make sense for the current architecture.