From 2ab46242f0545dbacd5dc34df30609a7eb39bfc3 Mon Sep 17 00:00:00 2001
From: James Barford-Evans <james.barford-evans@arm.com>
Date: Tue, 11 Feb 2025 17:28:30 +0000
Subject: [PATCH] remove print statment and correct target name

---
 library/stdarch/crates/intrinsic-test/src/main.rs   |  3 +--
 .../stdarch/crates/stdarch-gen-arm/src/intrinsic.rs | 13 ++++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/library/stdarch/crates/intrinsic-test/src/main.rs b/library/stdarch/crates/intrinsic-test/src/main.rs
index d1881e3a947c..ce7b169c5afd 100644
--- a/library/stdarch/crates/intrinsic-test/src/main.rs
+++ b/library/stdarch/crates/intrinsic-test/src/main.rs
@@ -417,7 +417,6 @@ path = "{intrinsic}/main.rs""#,
     }
 
     command.env("RUSTFLAGS", rust_flags);
-    println!("{:?}", command);
     let output = command.output();
 
     if let Ok(output) = output {
@@ -583,7 +582,7 @@ fn compare_outputs(
                 ))
                 .output();
 
-            let rust = if target != "aarch64_be-none-linux-gnu" {
+            let rust = if target != "aarch64_be-unknown-linux-gnu" {
                 Command::new("sh")
                     .current_dir("rust_programs")
                     .arg("-c")
diff --git a/library/stdarch/crates/stdarch-gen-arm/src/intrinsic.rs b/library/stdarch/crates/stdarch-gen-arm/src/intrinsic.rs
index 0101423f1a1c..5d17a7aed655 100644
--- a/library/stdarch/crates/stdarch-gen-arm/src/intrinsic.rs
+++ b/library/stdarch/crates/stdarch-gen-arm/src/intrinsic.rs
@@ -1721,6 +1721,12 @@ fn create_tokens(intrinsic: &Intrinsic, endianness: Endianness, tokens: &mut Tok
         Endianness::NA => {}
     };
 
+    let expressions = match endianness {
+        Endianness::Little | Endianness::NA => &intrinsic.compose,
+        Endianness::Big => &intrinsic.big_endian_compose,
+    };
+
+
     /* If we have manually defined attributes on the block of yaml with
      * 'attr:' we want to add them */
     if let Some(attr) = &intrinsic.attr {
@@ -1767,13 +1773,6 @@ fn create_tokens(intrinsic: &Intrinsic, endianness: Endianness, tokens: &mut Tok
     }
     tokens.append_all(quote! { #signature });
 
-    let expressions = match endianness {
-        Endianness::Little | Endianness::NA => &intrinsic.compose,
-        Endianness::Big => &intrinsic.big_endian_compose,
-    };
-
-    tokens.append_all(quote! { #signature });
-
     // If the intrinsic function is explicitly unsafe, we populate `body_default_safety` with
     // the implementation. No explicit unsafe blocks are required.
     //