Merge pull request #1449 from comex/memtools-merge Reorganize faulting stuff. Differentiate between arch- and OS-specific defines.
