Rebase of !6791 (closed) which is approved but has a conflict from me. I am keen on it landing ASAP :), but cannot push to the original.
I reordered the changes for bisecting, and removed some now unneeded copying and .gitignore-ing of MachDeps.h for GHC itself, but otherwise this is the same.