Merge pull request rust-lang#504 from nicholasbishop/bishop-no-uefi-asm

Amanieu · web-flow · commit d16d949e1367 · 2022-11-16T19:05:16.000Z
diff --git a/compiler-builtins/build.rs b/compiler-builtins/build.rs
@@ -465,7 +465,8 @@ mod c {
         }
 
         // Remove the assembly implementations that won't compile for the target
-        if llvm_target[0] == "thumbv6m" || llvm_target[0] == "thumbv8m.base" {
+        if llvm_target[0] == "thumbv6m" || llvm_target[0] == "thumbv8m.base" || target_os == "uefi"
+        {
             let mut to_remove = Vec::new();
             for (k, v) in sources.map.iter() {
                 if v.ends_with(".S") {

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,8 @@ mod c {`
`465`	`465`	`}`
`466`	`466`
`467`	`467`	`// Remove the assembly implementations that won't compile for the target`
`468`		`- if llvm_target[0] == "thumbv6m" \|\| llvm_target[0] == "thumbv8m.base" {`
	`468`	`+ if llvm_target[0] == "thumbv6m" \|\| llvm_target[0] == "thumbv8m.base" \|\| target_os == "uefi"`
	`469`	`+ {`
`469`	`470`	`let mut to_remove = Vec::new();`
`470`	`471`	`for (k, v) in sources.map.iter() {`
`471`	`472`	`if v.ends_with(".S") {`