Skip to content

Commit 82e208c

Browse files
authored
Rollup merge of #117338 - workingjubilee:asmjs-meets-thanatos, r=b-naber
Remove asmjs Fulfills [MCP 668](rust-lang/compiler-team#668). `asmjs-unknown-emscripten` does not work as-specified, and lacks essential upstream support for generating asm.js, so it should not exist at all.
2 parents 6797c1f + 0515270 commit 82e208c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/shims/foreign_items.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ trait EvalContextExtPriv<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
345345
// List taken from `library/std/src/sys/common/alloc.rs`.
346346
// This list should be kept in sync with the one from libstd.
347347
let min_align = match this.tcx.sess.target.arch.as_ref() {
348-
"x86" | "arm" | "mips" | "mips32r6" | "powerpc" | "powerpc64" | "asmjs" | "wasm32" => 8,
348+
"x86" | "arm" | "mips" | "mips32r6" | "powerpc" | "powerpc64" | "wasm32" => 8,
349349
"x86_64" | "aarch64" | "mips64" | "mips64r6" | "s390x" | "sparc64" | "loongarch64" =>
350350
16,
351351
arch => bug!("unsupported target architecture for malloc: `{}`", arch),

0 commit comments

Comments
 (0)