I think it may be better to put this in a separate branch, and not use it when building the cross compiler.