Couple of changes to make it easier to compile rustc for wasm#130899

bors merged 3 commits intorust-lang:masterrust-lang/rust:masterfrom

bjorn3:wasi_bootstrap_fixesbjorn3/rust:wasi_bootstrap_fixesCopy head branch name to clipboard