summaryrefslogtreecommitdiff
path: root/libcpu
diff options
context:
space:
mode:
authorlatercomer <[email protected]>2025-03-16 09:20:31 +0800
committerRbb666 <[email protected]>2025-03-17 16:45:59 +0800
commit9e13f67018d6bd2af6c005974c69571289ad6503 (patch)
tree98cc13737fd44c9291d8e28820213569d09c37da /libcpu
parent76c2f2d77f06327b5a6d679d59d06443d65299ca (diff)
删除libcpu/sim/simulator中msvc编译器多余代码,为后续支持mingw64做准备
Signed-off-by: latercomer <[email protected]>
Diffstat (limited to 'libcpu')
-rw-r--r--libcpu/sim/win32/cpu_port.c11
-rw-r--r--libcpu/sim/win32/startup_msvc.c (renamed from libcpu/sim/win32/startup.c)39
2 files changed, 8 insertions, 42 deletions
diff --git a/libcpu/sim/win32/cpu_port.c b/libcpu/sim/win32/cpu_port.c
index 4f8b32271b..6b7da50bf4 100644
--- a/libcpu/sim/win32/cpu_port.c
+++ b/libcpu/sim/win32/cpu_port.c
@@ -699,14 +699,3 @@ rt_uint32_t YieldInterruptHandle(void)
return 0;
} /*** YieldInterruptHandle ***/
-
-/* system entry */
-extern int rtthread_startup(void);
-int wmain(int argc, char* argv[])
-{
- /* disable interrupt first */
- rt_hw_interrupt_disable();
- /* startup RT-Thread RTOS */
- rtthread_startup();
-}
-#pragma comment(linker, "/subsystem:console /entry:wmainCRTStartup")
diff --git a/libcpu/sim/win32/startup.c b/libcpu/sim/win32/startup_msvc.c
index f0f2784a7a..6bf7a575bc 100644
--- a/libcpu/sim/win32/startup.c
+++ b/libcpu/sim/win32/startup_msvc.c
@@ -221,33 +221,16 @@ void rt_application_init(void);
void rt_hw_board_init(void);
int rtthread_startup(void);
-#if defined(__ARMCC_VERSION)
-extern int $Super$$main(void);
-/* re-define main function */
-int $Sub$$main(void)
-{
- rtthread_startup();
- return 0;
-}
-#elif defined(__ICCARM__)
-extern int main(void);
-/* __low_level_init will auto called by IAR cstartup */
-extern void __iar_data_init3(void);
-int __low_level_init(void)
-{
- // call IAR table copy function.
- __iar_data_init3();
- rtthread_startup();
- return 0;
-}
-#elif defined(__GNUC__)
-/* Add -eentry to arm-none-eabi-gcc argument */
-int entry(void)
+/* system entry */
+extern int rtthread_startup(void);
+int wmain(int argc, char* argv[])
{
+ /* disable interrupt first */
+ rt_hw_interrupt_disable();
+ /* startup RT-Thread RTOS */
rtthread_startup();
- return 0;
}
-#endif
+#pragma comment(linker, "/subsystem:console /entry:wmainCRTStartup")
#ifndef RT_USING_HEAP
/* if there is not enable heap, we should use static thread and stack. */
@@ -269,15 +252,9 @@ void main_thread_entry(void *parameter)
#ifdef RT_USING_SMP
rt_hw_secondary_cpu_up();
#endif
+
/* invoke system main function */
-#if defined(__ARMCC_VERSION)
- {
- extern int $Super$$main(void);
- $Super$$main(); /* for ARMCC. */
- }
-#elif defined(__ICCARM__) || defined(__GNUC__) || defined(__TASKING__) || defined(_MSC_VER)
main();
-#endif
}
void rt_application_init(void)