From f7539ebc68e7c36cc0cfabc1bbec7a331ebfaf7b Mon Sep 17 00:00:00 2001
From: Dave Tucker <dave@dtucker.co.uk>
Date: Tue, 7 Jun 2022 18:36:10 +0100
Subject: [PATCH] bpf: Use armv7 instead of arm

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
---
 bpf/aya-bpf-bindings/src/lib.rs | 4 ++--
 bpf/aya-bpf-cty/src/lib.rs      | 2 +-
 bpf/aya-bpf/src/args.rs         | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bpf/aya-bpf-bindings/src/lib.rs b/bpf/aya-bpf-bindings/src/lib.rs
index 1528e4f8..8a8834c4 100644
--- a/bpf/aya-bpf-bindings/src/lib.rs
+++ b/bpf/aya-bpf-bindings/src/lib.rs
@@ -4,7 +4,7 @@
 #[cfg(bpf_target_arch = "x86_64")]
 mod x86_64;
 
-#[cfg(bpf_target_arch = "arm")]
+#[cfg(bpf_target_arch = "armv7")]
 mod armv7;
 
 #[cfg(bpf_target_arch = "aarch64")]
@@ -17,7 +17,7 @@ mod gen {
     #[cfg(bpf_target_arch = "x86_64")]
     pub use super::x86_64::*;
 
-    #[cfg(bpf_target_arch = "arm")]
+    #[cfg(bpf_target_arch = "armv7")]
     pub use super::armv7::*;
 
     #[cfg(bpf_target_arch = "aarch64")]
diff --git a/bpf/aya-bpf-cty/src/lib.rs b/bpf/aya-bpf-cty/src/lib.rs
index 2588d86a..f908b432 100644
--- a/bpf/aya-bpf-cty/src/lib.rs
+++ b/bpf/aya-bpf-cty/src/lib.rs
@@ -20,7 +20,7 @@ mod ad {
     pub type c_int = i32;
     pub type c_uint = u32;
 
-    #[cfg(bpf_target_arch = "arm")]
+    #[cfg(bpf_target_arch = "armv7")]
     pub type c_char = super::c_uchar;
 
     #[cfg(bpf_target_arch = "aarch64")]
diff --git a/bpf/aya-bpf/src/args.rs b/bpf/aya-bpf/src/args.rs
index 8929c7a3..31863db0 100644
--- a/bpf/aya-bpf/src/args.rs
+++ b/bpf/aya-bpf/src/args.rs
@@ -116,7 +116,7 @@ impl<T> FromPtRegs for *const T {
     }
 }
 
-#[cfg(bpf_target_arch = "arm")]
+#[cfg(bpf_target_arch = "armv7")]
 impl<T> FromPtRegs for *const T {
     fn from_argument(ctx: &pt_regs, n: usize) -> Option<Self> {
         if n <= 6 {
@@ -165,7 +165,7 @@ impl<T> FromPtRegs for *mut T {
     }
 }
 
-#[cfg(bpf_target_arch = "arm")]
+#[cfg(bpf_target_arch = "armv7")]
 impl<T> FromPtRegs for *mut T {
     fn from_argument(ctx: &pt_regs, n: usize) -> Option<Self> {
         if n <= 6 {
@@ -217,7 +217,7 @@ macro_rules! impl_from_pt_regs {
             }
         }
 
-        #[cfg(bpf_target_arch = "arm")]
+        #[cfg(bpf_target_arch = "armv7")]
         impl FromPtRegs for $type {
             fn from_argument(ctx: &pt_regs, n: usize) -> Option<Self> {
                 if n <= 6 {