StackRduino
diff --git a/‎py/mpconfig.h‎
Lines changed: 5 additions & 0 deletions b/‎py/mpconfig.h‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎stmhal/main.c‎
Lines changed: 2 additions & 3 deletions b/‎stmhal/main.c‎
Lines changed: 2 additions & 3 deletions
@@ -404,3 +404,8 @@ typedef double mp_float_t;
 #ifndef NORETURN
 #define NORETURN __attribute__((noreturn))
 #endif
+
+// Modifier for weak functions
+#ifndef MP_WEAK
+#define MP_WEAK __attribute__((weak))
+#endif
@@ -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("");
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ void flash_error(int n) {`
`86`	`86`	`led_state(PYB_LED_R2, 0);`
`87`	`87`	`}`
`88`	`88`
`89`		`-void __fatal_error(const char *msg) {`
	`89`	`+void NORETURN __fatal_error(const char *msg) {`
`90`	`90`	`for (volatile uint delay = 0; delay < 10000000; delay++) {`
`91`	`91`	`}`
`92`	`92`	`led_state(1, 1);`
`@@ -112,8 +112,7 @@ void nlr_jump_fail(void *val) {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`#ifndef NDEBUG`
`115`		`-void __attribute__((weak))`
`116`		`- __assert_func(const char file, int line, const char func, const char *expr) {`
	`115`	`+void MP_WEAK __assert_func(const char file, int line, const char func, const char *expr) {`
`117`	`116`	`(void)func;`
`118`	`117`	`printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);`
`119`	`118`	`__fatal_error("");`