Two fixes

Allow either Apple's or LLVM's llvm-gcc
Rename and tidy up gcc and (Apple's) llvm-gcc patches