From 37d902537cef5d6474d7eb11221b6f647e203263 Mon Sep 17 00:00:00 2001
From: cmbjxxiao <48663789+cmbjxxiao@users.noreply.github.com>
Date: Wed, 6 Aug 2025 15:16:18 +0800
Subject: [PATCH] [arm_compiler_v4/v5] define rt_packed as __packed #10553

---
 components/drivers/block/partitions/efi.h | 5 +++--
 components/drivers/include/drivers/nvme.h | 4 ++--
 include/rtcompiler.h                      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/components/drivers/block/partitions/efi.h b/components/drivers/block/partitions/efi.h
index 6a10ec884f..10f0f584f3 100644
--- a/components/drivers/block/partitions/efi.h
+++ b/components/drivers/block/partitions/efi.h
@@ -30,10 +30,11 @@
 #ifndef __UUID_H__
 #define UUID_SIZE 16
 
-typedef struct
+rt_packed(struct _guid_t
 {
     rt_uint8_t b[UUID_SIZE];
-} guid_t;
+});
+typedef struct _guid_t guid_t;
 #endif /* __UUID_H__ */
 
 #ifndef __EFI_H__
diff --git a/components/drivers/include/drivers/nvme.h b/components/drivers/include/drivers/nvme.h
index 1eca5d9caa..4df2c420f9 100644
--- a/components/drivers/include/drivers/nvme.h
+++ b/components/drivers/include/drivers/nvme.h
@@ -717,12 +717,12 @@ enum
     RT_NVME_CTRL_CTRATT_UUID_LIST               = 1 << 9,
 };
 
-struct rt_nvme_lba_format
+rt_packed(struct rt_nvme_lba_format
 {
     rt_le16_t   ms;         /* Metadata size */
     rt_uint8_t  ds;         /* Data size */
     rt_uint8_t  rp;         /* Relative performance */
-};
+});
 
 rt_packed(struct rt_nvme_id_ns
 {
diff --git a/include/rtcompiler.h b/include/rtcompiler.h
index 012c85cb60..27adcaef37 100644
--- a/include/rtcompiler.h
+++ b/include/rtcompiler.h
@@ -19,7 +19,7 @@
 #if __ARMCC_VERSION >= 6010050
 #define rt_packed(declare)          declare __attribute__((packed))
 #else
-#define rt_packed(declare)          declare
+#define rt_packed(declare)          __packed declare
 #endif
 #define rt_weak                     __attribute__((weak))
 #define rt_typeof                   __typeof