Integrate the in-tree config file generation with the cross-building toolchain. Regenerate the files. Keep version numbers all in one place.
Upstream sources can be fetched by running "make checkout" in src/external/bsd/llvm, they will be properly imported once the integration and missing features are sorted out.