Upstream now has the LLVM 3.4 patch folded in.  Don't apply and remove