From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Sat, 2 Oct 2021 00:08:00 +0000 (+0100)
Subject: d-0003-cc-psm-rebuild-wasm32
X-Git-Tag: archive/raspbian/1.84.0+dfsg1-2+rpi1^2~29
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f3ed9febc06afd3c6b0e0e0cabfc489eb66061d1;p=rustc.git

d-0003-cc-psm-rebuild-wasm32

Forwarded: not-needed

Gbp-Pq: Topic vendor
Gbp-Pq: Name d-0003-cc-psm-rebuild-wasm32.patch
---

diff --git a/vendor/cc-1.1.22/src/lib.rs b/vendor/cc-1.1.22/src/lib.rs
index 985569813a..d2382513cb 100644
--- a/vendor/cc-1.1.22/src/lib.rs
+++ b/vendor/cc-1.1.22/src/lib.rs
@@ -2954,7 +2954,7 @@ impl Build {
                     if self.cpp {
                         "clang++".to_string()
                     } else {
-                        "clang".to_string()
+                        "rust-clang".to_string()
                     }
                 } else if target.contains("vxworks") {
                     if self.cpp {
diff --git a/vendor/psm-0.1.23/build.rs b/vendor/psm-0.1.23/build.rs
index bc84149f83..a299ab5614 100644
--- a/vendor/psm-0.1.23/build.rs
+++ b/vendor/psm-0.1.23/build.rs
@@ -51,7 +51,7 @@ fn find_assembly(
         ("sparc", _, _, _) => Some(("src/arch/sparc_sysv.s", true)),
         ("riscv32", _, _, _) => Some(("src/arch/riscv.s", true)),
         ("riscv64", _, _, _) => Some(("src/arch/riscv64.s", true)),
-        ("wasm32", _, _, _) => Some(("src/arch/wasm32.o", true)),
+        ("wasm32", _, _, _) => Some(("src/arch/wasm32.s", true)),
         ("loongarch64", _, _, _) => Some(("src/arch/loongarch64.s", true)),
         _ => None,
     }
@@ -99,11 +99,8 @@ fn main() {
         cfg.define(&*format!("CFG_TARGET_ENV_{}", env), None);
     }
 
-    // For wasm targets we ship a precompiled `*.o` file so we just pass that
-    // directly to `ar` to assemble an archive. Otherwise we're actually
-    // compiling the source assembly file.
     if asm.ends_with(".o") {
-        cfg.object(asm);
+        panic!("Debian does not allow embedded object files in source code")
     } else {
         cfg.file(asm);
     }