Changed OptionCategory variables to be static.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@200876 91177308-0d34-0410-b5e6-96231b3b80d8
Clean up some particularly ugly casting.

No functionality change.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@200877 91177308-0d34-0410-b5e6-96231b3b80d8
Try to fix ppc bot failure.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@200880 91177308-0d34-0410-b5e6-96231b3b80d8