This is an automated email from the ASF dual-hosted git repository.
jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 72f9bd142f openamp: Fix void pointer arithmetic in openamp to remove
compilation warnings
72f9bd142f is described below
commit 72f9bd142f2f50bbd68548700c30be3b161462ff
Author: Jukka Laitinen <juk...@ssrc.tii.ae>
AuthorDate: Mon Feb 12 13:30:30 2024 +0200
openamp: Fix void pointer arithmetic in openamp to remove compilation
warnings
Signed-off-by: Jukka Laitinen <juk...@ssrc.tii.ae>
---
...ttx-io.c-Fix-void-pointer-arithmetic-in-a.patch | 36 ++++++++++++++++++++++
openamp/libmetal.defs | 1 +
2 files changed, 37 insertions(+)
diff --git
a/openamp/0003-libmetal-nuttx-io.c-Fix-void-pointer-arithmetic-in-a.patch
b/openamp/0003-libmetal-nuttx-io.c-Fix-void-pointer-arithmetic-in-a.patch
new file mode 100644
index 0000000000..88ce403c93
--- /dev/null
+++ b/openamp/0003-libmetal-nuttx-io.c-Fix-void-pointer-arithmetic-in-a.patch
@@ -0,0 +1,36 @@
+From 59e2764f9d0598ad0135286d4a0ee1ac95893bba Mon Sep 17 00:00:00 2001
+From: Jukka Laitinen <juk...@ssrc.tii.ae>
+Date: Mon, 12 Feb 2024 13:27:13 +0200
+Subject: [PATCH] libmetal/nuttx/io.c: Fix void pointer arithmetic in access
+ alignment
+
+Signed-off-by: Jukka Laitinen <juk...@ssrc.tii.ae>
+---
+ libmetal/lib/system/nuttx/io.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/system/nuttx/io.c libmetal/lib/system/nuttx/io.c
+index 3ce9cbe..ab9bc6a 100644
+--- a/lib/system/nuttx/io.c
++++ libmetal/lib/system/nuttx/io.c
+@@ -45,7 +45,7 @@ static int metal_io_block_read_(struct metal_io_region *io,
+ *(uint32_t *)dst = *(uint32_t *)va;
+ else if (len == 8) {
+ *(uint32_t *)dst = *(uint32_t *)va;
+- *(uint32_t *)(dst + 4) = *(uint32_t *)(va + 4);
++ *((uint32_t *)dst + 1) = *((uint32_t *)va + 1);
+ } else
+ memcpy(dst, va, len);
+
+@@ -68,7 +68,7 @@ static int metal_io_block_write_(struct metal_io_region *io,
+ *(uint32_t *)va = *(uint32_t *)src;
+ else if (len == 8) {
+ *(uint32_t *)va = *(uint32_t *)src;
+- *(uint32_t *)(va + 4) = *(uint32_t *)(src + 4);
++ *((uint32_t *)va + 1) = *((uint32_t *)src + 1);
+ } else
+ memcpy(va, src, len);
+
+--
+2.34.1
+
diff --git a/openamp/libmetal.defs b/openamp/libmetal.defs
index b3369496ab..90e8a690be 100644
--- a/openamp/libmetal.defs
+++ b/openamp/libmetal.defs
@@ -79,6 +79,7 @@ libmetal.zip:
$(Q) mv libmetal-$(VERSION) libmetal
$(Q) patch -p0 <
0001-libmetal-add-metal_list_for_each_safe-support.patch
$(Q) patch -p0 <
0002-libmetal-nuttx-io.c-align-access-when-read-write-siz.patch
+ $(Q) patch -p0 <
0003-libmetal-nuttx-io.c-Fix-void-pointer-arithmetic-in-a.patch
.libmetal_headers: libmetal.zip
else
