cctools + ld64: more Win64 fixes and re-order patches