Switching more toolchain files back to dynamic linkage