Skip to contentSkip to conversation

rust-target-config: fix invalid +v5 LLVM feature for armv5

PATCH New [email protected] 1 participant 1 message Oct 6

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rust-target-config: fix invalid +v5 LLVM feature for armv5

From: Hemanth Kumar M D <[email protected]>

llvm_features_from_tune() emitted "+v5" for ARMv5 tunes. LLVM does not recognise "+v5" and silently ignores it:

'+v5' is not a recognized feature for this target (ignoring feature)

This caused the Rust 1.99 compiler-builtins build to fail:

error: invalid instruction, any one of the following would fix this:
note: instruction requires: armv4t
error: could not compile compiler_builtins

Emit the valid +v5te feature instead.

---
 meta/classes-recipe/rust-target-config.bbclass | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
meta/classes-recipe/rust-target-config.bbclass +1 -4
index 1cba275b85..fee19a1a64 100644
@@ -53,12 +53,9 @@ def llvm_features_from_tune(d):
 
     if ('armv6' in mach_overrides) or ('armv6' in feat):
         f.append("+v6")
-    if 'armv5te' in feat:
+    if 'armv5' in feat:
         f.append("+strict-align")
         f.append("+v5te")
-    elif 'armv5' in feat:
-        f.append("+strict-align")
-        f.append("+v5")
 
     if ('armv4' in mach_overrides) or ('armv4' in feat):
         f.append("+strict-align")
Signature · 1 line
2.49.0