fix patches with clang trunk