From 0208fc5546a76ea4494e26000a10b7614af79793 Mon Sep 17 00:00:00 2001 From: liruncong Date: Tue, 9 Feb 2021 23:25:46 +0800 Subject: [PATCH] =?UTF-8?q?[components]SECTION=3D>RT=5FSECTION(=E4=B8=8Eca?= =?UTF-8?q?tch2=E4=B8=ADSECTION=E5=86=B2=E7=AA=81)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/finsh/finsh_api.h | 16 ++++++++-------- components/net/at/include/at.h | 2 +- components/utilities/utest/utest.h | 2 +- components/vmm/vmm.c | 6 +++--- components/vmm/vmm_context.c | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/components/finsh/finsh_api.h b/components/finsh/finsh_api.h index c601415d82..db2c175cb5 100644 --- a/components/finsh/finsh_api.h +++ b/components/finsh/finsh_api.h @@ -90,9 +90,9 @@ struct finsh_syscall* finsh_syscall_lookup(const char* name); #else #define FINSH_FUNCTION_EXPORT_CMD(name, cmd, desc) \ - const char __fsym_##cmd##_name[] SECTION(".rodata.name") = #cmd; \ - const char __fsym_##cmd##_desc[] SECTION(".rodata.name") = #desc; \ - RT_USED const struct finsh_syscall __fsym_##cmd SECTION("FSymTab")= \ + const char __fsym_##cmd##_name[] RT_SECTION(".rodata.name") = #cmd; \ + const char __fsym_##cmd##_desc[] RT_SECTION(".rodata.name") = #desc; \ + RT_USED const struct finsh_syscall __fsym_##cmd RT_SECTION("FSymTab")= \ { \ __fsym_##cmd##_name, \ __fsym_##cmd##_desc, \ @@ -100,9 +100,9 @@ struct finsh_syscall* finsh_syscall_lookup(const char* name); }; #define FINSH_VAR_EXPORT(name, type, desc) \ - const char __vsym_##name##_name[] SECTION(".rodata.name") = #name; \ - const char __vsym_##name##_desc[] SECTION(".rodata.name") = #desc; \ - RT_USED const struct finsh_sysvar __vsym_##name SECTION("VSymTab")= \ + const char __vsym_##name##_name[] RT_SECTION(".rodata.name") = #name; \ + const char __vsym_##name##_desc[] RT_SECTION(".rodata.name") = #desc; \ + RT_USED const struct finsh_sysvar __vsym_##name RT_SECTION("VSymTab")= \ { \ __vsym_##name##_name, \ __vsym_##name##_desc, \ @@ -155,7 +155,7 @@ struct finsh_syscall* finsh_syscall_lookup(const char* name); #else #define FINSH_FUNCTION_EXPORT_CMD(name, cmd, desc) \ const char __fsym_##cmd##_name[] = #cmd; \ - RT_USED const struct finsh_syscall __fsym_##cmd SECTION("FSymTab")= \ + RT_USED const struct finsh_syscall __fsym_##cmd RT_SECTION("FSymTab")= \ { \ __fsym_##cmd##_name, \ (syscall_func)&name \ @@ -163,7 +163,7 @@ struct finsh_syscall* finsh_syscall_lookup(const char* name); #define FINSH_VAR_EXPORT(name, type, desc) \ const char __vsym_##name##_name[] = #name; \ - RT_USED const struct finsh_sysvar __vsym_##name SECTION("VSymTab")= \ + RT_USED const struct finsh_sysvar __vsym_##name RT_SECTION("VSymTab")= \ { \ __vsym_##name##_name, \ type, \ diff --git a/components/net/at/include/at.h b/components/net/at/include/at.h index 2d0e270f6a..7be821c21d 100644 --- a/components/net/at/include/at.h +++ b/components/net/at/include/at.h @@ -50,7 +50,7 @@ extern "C" { #endif #define AT_CMD_EXPORT(_name_, _args_expr_, _test_, _query_, _setup_, _exec_) \ - RT_USED static const struct at_cmd __at_cmd_##_test_##_query_##_setup_##_exec_ SECTION("RtAtCmdTab") = \ + RT_USED static const struct at_cmd __at_cmd_##_test_##_query_##_setup_##_exec_ RT_SECTION("RtAtCmdTab") = \ { \ _name_, \ _args_expr_, \ diff --git a/components/utilities/utest/utest.h b/components/utilities/utest/utest.h index 8d83fa3184..e2d72a931d 100644 --- a/components/utilities/utest/utest.h +++ b/components/utilities/utest/utest.h @@ -138,7 +138,7 @@ utest_t utest_handle_get(void); */ #define UTEST_TC_EXPORT(testcase, name, init, cleanup, timeout) \ RT_USED static const struct utest_tc_export _utest_testcase \ - SECTION("UtestTcTab") = \ + RT_SECTION("UtestTcTab") = \ { \ name, \ timeout, \ diff --git a/components/vmm/vmm.c b/components/vmm/vmm.c index 7d6f9875db..2bca67376c 100644 --- a/components/vmm/vmm.c +++ b/components/vmm/vmm.c @@ -22,9 +22,9 @@ extern void rt_hw_interrupt_init(void); extern void rt_application_init(void); -void vmm_entry(struct vmm_entry_param* param) SECTION(".vmm_init"); +void vmm_entry(struct vmm_entry_param* param) RT_SECTION(".vmm_init"); -struct rt_thread vmm_thread SECTION(".bss.share.vmm"); +struct rt_thread vmm_thread RT_SECTION(".bss.share.vmm"); extern rt_uint8_t vmm_stack_start; extern rt_uint8_t vmm_stack_end; @@ -75,7 +75,7 @@ static void vmm_entry_glue(rt_uint32_t level, unsigned int kernel_domain) /* inline would make the section setting meaningless */ __attribute__((noinline)) - SECTION(".vmm_glue"); + RT_SECTION(".vmm_glue"); static void vmm_entry_glue(rt_uint32_t level, unsigned int vmm_domain, unsigned int kernel_domain) diff --git a/components/vmm/vmm_context.c b/components/vmm/vmm_context.c index 91641a483a..2e3b95f825 100644 --- a/components/vmm/vmm_context.c +++ b/components/vmm/vmm_context.c @@ -18,7 +18,7 @@ #include "vmm_context.h" -struct rt_vmm_share_layout rt_vmm_share SECTION(".vmm.share"); +struct rt_vmm_share_layout rt_vmm_share RT_SECTION(".vmm.share"); volatile struct vmm_context *_vmm_context = RT_NULL; @@ -31,13 +31,13 @@ void vmm_context_init(void *context_addr) } #ifdef RT_VMM_USING_DOMAIN -unsigned long guest_domain_val SECTION(".bss.share"); -unsigned long vmm_domain_val SECTION(".bss.share"); +unsigned long guest_domain_val RT_SECTION(".bss.share"); +unsigned long vmm_domain_val RT_SECTION(".bss.share"); /* some RT-Thread code need to be called in the guest * context(rt_thread_idle_excute for example). To simplify the code, we need a * "super" domain mode to have access of both side. The code executed in super * domain mode is restricted and should be harmless. */ -unsigned long super_domain_val SECTION(".bss.share"); +unsigned long super_domain_val RT_SECTION(".bss.share"); void vmm_context_init_domain(struct vmm_domain *domain) { asm volatile ("mrc p15, 0, %0, c3, c0\n" : "=r" (guest_domain_val));