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