aboutsummaryrefslogtreecommitdiffstats
path: root/os/ports/GCC/ARMCMx
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-12-21 10:30:39 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-12-21 10:30:39 +0000
commitf2386f6a22c55842203278c5b1f9691c5ac5f8fd (patch)
treeb7f318640fa8ff688925eab4fe544d41f3dd019a /os/ports/GCC/ARMCMx
parent25d2722b09c5ed808fbb5b09bafc94f253da2479 (diff)
downloadChibiOS-f2386f6a22c55842203278c5b1f9691c5ac5f8fd.tar.gz
ChibiOS-f2386f6a22c55842203278c5b1f9691c5ac5f8fd.tar.bz2
ChibiOS-f2386f6a22c55842203278c5b1f9691c5ac5f8fd.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2515 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ports/GCC/ARMCMx')
-rw-r--r--os/ports/GCC/ARMCMx/crt0_v6m.s10
-rw-r--r--os/ports/GCC/ARMCMx/crt0_v7m.s10
2 files changed, 8 insertions, 12 deletions
diff --git a/os/ports/GCC/ARMCMx/crt0_v6m.s b/os/ports/GCC/ARMCMx/crt0_v6m.s
index 82dc066fb..baaf6f32d 100644
--- a/os/ports/GCC/ARMCMx/crt0_v6m.s
+++ b/os/ports/GCC/ARMCMx/crt0_v6m.s
@@ -102,19 +102,17 @@ endbloop:
/*
* Main program invocation.
*/
- movs r0, #0
- mov r1, r0
bl main
- b MainExitHandler
+ b _main_exit_handler
/*
* Default main exit code, just a loop.
* It is a weak symbol, the application code can redefine the behavior.
*/
.thumb_func
- .global MainExitHandler
- .weak MainExitHandler
-MainExitHandler:
+ .global _main_exit_handler
+ .weak _main_exit_handler
+_main_exit_handler:
.loop: b .loop
/*
diff --git a/os/ports/GCC/ARMCMx/crt0_v7m.s b/os/ports/GCC/ARMCMx/crt0_v7m.s
index 1c76975c6..4e4a40631 100644
--- a/os/ports/GCC/ARMCMx/crt0_v7m.s
+++ b/os/ports/GCC/ARMCMx/crt0_v7m.s
@@ -97,19 +97,17 @@ bloop:
/*
* Main program invocation.
*/
- movs r0, #0
- mov r1, r0
bl main
- b MainExitHandler
+ b _main_exit_handler
/*
* Default main exit code, just a loop.
* It is a weak symbol, the application code can redefine the behavior.
*/
.thumb_func
- .global MainExitHandler
- .weak MainExitHandler
-MainExitHandler:
+ .global _main_exit_handler
+ .weak _main_exit_handler
+_main_exit_handler:
.loop: b .loop
/*