I've just committed a possible fix for this, please let me know if it works.
It succeeds on aarch64, earmv7hf and sparc64 now. Thank you! John Klos