Fix build on GCC/Linux.  A few things were broken in mainline LLVM and got pulled in with last merge.