[fixup] aarch64 UMP compiler error (#8677)

Signed-off-by: Shell <[email protected]>

7 files changed, 11 insertions, 10 deletions

diff --git a/components/drivers/ofw/base.c b/components/drivers/ofw/base.c
index 4578758a23..ffb513fbb7 100644
--- a/components/drivers/ofw/base.c
+++ b/components/drivers/ofw/base.c
@@ -1474,7 +1474,7 @@ static const char *ofw_get_prop_fuzzy_name(const struct rt_ofw_node *np, const c
     char *sf, split_field[64];
     rt_size_t len = 0, max_ak = 0;
     const char *str, *result = RT_NULL;
-    RT_BITMAP_DECLARE(ak, sizeof(split_field));
+    RT_BITMAP_DECLARE(ak, sizeof(split_field)) = {0};
     struct rt_ofw_prop *prop;
 
     /*
diff --git a/components/drivers/ofw/irq.c b/components/drivers/ofw/irq.c
index be843d6cb7..cf47f01ed2 100755
--- a/components/drivers/ofw/irq.c
+++ b/components/drivers/ofw/irq.c
@@ -624,7 +624,7 @@ int rt_ofw_get_irq(struct rt_ofw_node *np, int index)
 
                 if ((rt_int64_t)cpuid >= 0)
                 {
-                    RT_DECLARE_BITMAP(affinity, RT_CPUS_NR) = { 0 };
+                    RT_BITMAP_DECLARE(affinity, RT_CPUS_NR) = { 0 };
 
                     rt_bitmap_set_bit(affinity, cpuid);
 
diff --git a/components/drivers/pic/pic_rthw.c b/components/drivers/pic/pic_rthw.c
index b46c7bc26d..e83f12a1fa 100644
--- a/components/drivers/pic/pic_rthw.c
+++ b/components/drivers/pic/pic_rthw.c
@@ -66,7 +66,7 @@ void rt_hw_interrupt_uninstall(int vector, rt_isr_handler_t handler, void *param
 #if defined(RT_USING_SMP) || defined(RT_USING_AMP)
 void rt_hw_ipi_send(int ipi_vector, unsigned int cpu_mask)
 {
-    RT_DECLARE_BITMAP(cpu_masks, RT_CPUS_NR) = { cpu_mask };
+    RT_BITMAP_DECLARE(cpu_masks, RT_CPUS_NR) = { cpu_mask };
 
     rt_pic_irq_send_ipi(ipi_vector, cpu_masks);
 }
diff --git a/components/libc/compilers/common/ctime.c b/components/libc/compilers/common/ctime.c
index a1bb3c439d..c6602698ff 100644
--- a/components/libc/compilers/common/ctime.c
+++ b/components/libc/compilers/common/ctime.c
@@ -879,7 +879,8 @@ static void rtthread_timer_wrapper(void *timerobj)
     }
 #ifdef RT_USING_SMART
     /* this field is named as tid in musl */
-    int tid = *(int *)&timer->sigev_notify_function;
+    void *ptid = &timer->sigev_notify_function;
+    int tid = *(int *)ptid;
     struct lwp_timer_event_param *data = rt_container_of(timer->work, struct lwp_timer_event_param, work);
     data->signo = timer->sigev_signo;
 
diff --git a/components/lwp/lwp_internal.c b/components/lwp/lwp_internal.c
index e460a1ac3f..1fc68f2e73 100644
--- a/components/lwp/lwp_internal.c
+++ b/components/lwp/lwp_internal.c
@@ -89,7 +89,7 @@ static rt_err_t _mutex_take_safe(rt_mutex_t mtx, rt_int32_t timeout, int flags)
     }
     else
     {
-        rc = -RT_EINVAL;
+        rc = -RT_ERROR;
         LOG_W("%s: mtx should not be NULL", __func__);
         RT_ASSERT(0);
     }
diff --git a/components/lwp/lwp_syscall.c b/components/lwp/lwp_syscall.c
index 5d9cf05b63..585101b71f 100644
--- a/components/lwp/lwp_syscall.c
+++ b/components/lwp/lwp_syscall.c
@@ -2700,7 +2700,7 @@ sysret_t sys_execve(const char *path, char *const argv[], char *const envp[])
          */
         RT_ASSERT(rt_list_entry(lwp->t_grp.prev, struct rt_thread, sibling) == thread);
 
-        strncpy(thread->parent.name, run_name + last_backslash, RT_NAME_MAX);
+        strncpy(thread->parent.name, run_name + last_backslash, RT_NAME_MAX - 1);
         strncpy(lwp->cmd, new_lwp->cmd, RT_NAME_MAX);
         rt_free(lwp->exe_file);
         lwp->exe_file = strndup(new_lwp->exe_file, DFS_PATH_MAX);
diff --git a/components/mm/mm_page.c b/components/mm/mm_page.c
index fcae953a2d..ab3b898224 100644
--- a/components/mm/mm_page.c
+++ b/components/mm/mm_page.c
@@ -109,7 +109,7 @@ static void _collect()
     rt_page_t page = _trace_head;
     if (!page)
     {
-        LOG_RAW("ok! ALLOC CNT %ld\n", _alloc_cnt);
+        rt_kprintf("ok! ALLOC CNT %ld\n", _alloc_cnt);
     }
     else
     {
@@ -159,7 +159,7 @@ void _report(rt_page_t page, size_t size_bits, char *msg)
 {
     void *pg_va = rt_page_page2addr(page);
     LOG_W("%s: %p, allocator: %p, size bits: %lx", msg, pg_va, page->caller, page->trace_size);
-    LOG_RAW("backtrace\n");
+    rt_kprintf("backtrace\n");
     rt_backtrace();
 }
 
@@ -175,7 +175,7 @@ static void _trace_free(rt_page_t page, void *caller, size_t size_bits)
         }
         else if (page->trace_size != size_bits)
         {
-            LOG_RAW("free with size bits %lx\n", size_bits);
+            rt_kprintf("free with size bits %lx\n", size_bits);
             _report(page, size_bits, "incompatible size bits parameter");
             return ;
         }
@@ -636,7 +636,7 @@ void list_page(void)
             rt_kprintf("[0x%08p]", rt_page_page2addr(hp));
             hp = hp->next;
         }
-        LOG_RAW("\n");
+        rt_kprintf("\n");
     }
 
     rt_spin_unlock_irqrestore(&_spinlock, level);