@@ -4,7 +4,6 @@ fn find_assembly(
44 os : & str ,
55 env : & str ,
66 masm : bool ,
7- pad_wasm : bool ,
87) -> Option < ( & ' static str , bool ) > {
98 match ( arch, endian, os, env) {
109 // The implementations for stack switching exist, but, officially, doing so without Fibers
@@ -52,23 +51,14 @@ fn find_assembly(
5251 ( "sparc" , _, _, _) => Some ( ( "src/arch/sparc_sysv.s" , true ) ) ,
5352 ( "riscv32" , _, _, _) => Some ( ( "src/arch/riscv.s" , true ) ) ,
5453 ( "riscv64" , _, _, _) => Some ( ( "src/arch/riscv64.s" , true ) ) ,
55- ( "wasm32" , _, _, _) => {
56- if pad_wasm {
57- // For wasm32 we ship a precompiled object file.
58- // Under some conditions we pad the byte count to be divisible by 8
59- Some ( ( "src/arch/wasm32_pad.o" , true ) )
60- } else {
61- Some ( ( "src/arch/wasm32.o" , true ) )
62- }
63- } ,
54+ ( "wasm32" , _, _, _) => Some ( ( "src/arch/wasm32.o" , true ) ) ,
6455 ( "loongarch64" , _, _, _) => Some ( ( "src/arch/loongarch64.s" , true ) ) ,
6556 _ => None ,
6657 }
6758}
6859
6960fn main ( ) {
7061 use std:: env:: var;
71- use std:: process:: Command ;
7262
7363 println ! ( "cargo:rustc-check-cfg=cfg(switchable_stack,asm,link_asm)" ) ;
7464
@@ -94,9 +84,7 @@ fn main() {
9484 // supports compiling MASM, but that is not stable yet
9585 let masm = msvc && var ( "HOST" ) . expect ( "HOST env not set" ) . contains ( "windows" ) ;
9686
97- let pad_wasm = Command :: new ( "clang" ) . arg ( "--version" ) . output ( ) . is_ok ( ) && Command :: new ( "llvm-ar" ) . arg ( "--version" ) . output ( ) . is_err ( ) ;
98-
99- let asm = if let Some ( ( asm, canswitch) ) = find_assembly ( & arch, & endian, & os, & env, masm, pad_wasm) {
87+ let asm = if let Some ( ( asm, canswitch) ) = find_assembly ( & arch, & endian, & os, & env, masm) {
10088 println ! ( "cargo:rustc-cfg=asm" ) ;
10189 println ! ( "cargo:rustc-cfg=link_asm" ) ;
10290 if canswitch {
0 commit comments