Update for llvm-gcc4 build.