[arm_compiler_v4/v5] define rt_packed as __packed

cmbjxxiao · cmbjxxiao · commit 725c0e48f9ca · 2025-07-25T17:32:04.000+08:00
diff --git a/components/drivers/block/partitions/efi.h b/components/drivers/block/partitions/efi.h
@@ -30,7 +30,7 @@
 #ifndef __UUID_H__
 #define UUID_SIZE 16
 
-typedef struct
+typedef struct rt_packed
 {
     rt_uint8_t b[UUID_SIZE];
 } guid_t;
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -717,12 +717,12 @@ enum`
`717`	`717`	`RT_NVME_CTRL_CTRATT_UUID_LIST = 1 << 9,`
`718`	`718`	`};`
`719`	`719`
`720`		`-struct rt_nvme_lba_format`
	`720`	`+rt_packed(struct rt_nvme_lba_format`
`721`	`721`	`{`
`722`	`722`	`rt_le16_t ms; /* Metadata size */`
`723`	`723`	`rt_uint8_t ds; /* Data size */`
`724`	`724`	`rt_uint8_t rp; /* Relative performance */`
`725`		`-};`
	`725`	`+});`
`726`	`726`
`727`	`727`	`rt_packed(struct rt_nvme_id_ns`
`728`	`728`	`{`