aboutsummaryrefslogtreecommitdiff
path: root/stmhal/main.c
diff options
context:
space:
mode:
authorDamien George2014-06-30 09:09:24 +0100
committerDamien George2014-06-30 09:09:24 +0100
commit4039a266793f8bb3af24482b3d08b2dcef51e268 (patch)
tree5f5f3c9b59d7cfc7ef42e812f060de4c00bb6fe8 /stmhal/main.c
parentb601d9574ad03a18d3eb476d631f547c7ea28243 (diff)
parent89b38d96c9e1dc45d6648268db28aec6e4d1fd8e (diff)
Merge pull request #710 from iabdalkader/assert
Fix assert_func warning/error
Diffstat (limited to 'stmhal/main.c')
-rw-r--r--stmhal/main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/stmhal/main.c b/stmhal/main.c
index d6c12602e..0cad768ad 100644
--- a/stmhal/main.c
+++ b/stmhal/main.c
@@ -86,7 +86,7 @@ void flash_error(int n) {
led_state(PYB_LED_R2, 0);
}
-void __fatal_error(const char *msg) {
+void NORETURN __fatal_error(const char *msg) {
for (volatile uint delay = 0; delay < 10000000; delay++) {
}
led_state(1, 1);
@@ -112,8 +112,7 @@ void nlr_jump_fail(void *val) {
}
#ifndef NDEBUG
-void __attribute__((weak))
- __assert_func(const char *file, int line, const char *func, const char *expr) {
+void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
(void)func;
printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
__fatal_error("");