Merge pull request adafruit#10275 from dhalbert/dont-no-return-weak-functions

tannewt · web-flow · commit 68e8136516b4 · 2025-04-21T11:12:56.000-07:00
Don't NORETURN MP_WEAK functions
diff --git a/shared-bindings/alarm/time/TimeAlarm.c b/shared-bindings/alarm/time/TimeAlarm.c
@@ -14,7 +14,7 @@
 #include "shared-bindings/time/__init__.h"
 
 #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
-NORETURN mp_obj_t MP_WEAK rtc_get_time_source_time(void) {
+mp_obj_t MP_WEAK rtc_get_time_source_time(void) {
     mp_raise_RuntimeError(MP_ERROR_TEXT("RTC is not supported on this board"));
 }
 #endif
diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
@@ -172,7 +172,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_not_implemented_obj, time_not_implemented);
 #endif
 
 #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
-NORETURN mp_obj_t MP_WEAK rtc_get_time_source_time(void) {
+mp_obj_t MP_WEAK rtc_get_time_source_time(void) {
     mp_raise_RuntimeError(MP_ERROR_TEXT("RTC is not supported on this board"));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`#include "shared-bindings/time/__init__.h"`
`15`	`15`
`16`	`16`	`#if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE`
`17`		`-NORETURN mp_obj_t MP_WEAK rtc_get_time_source_time(void) {`
	`17`	`+mp_obj_t MP_WEAK rtc_get_time_source_time(void) {`
`18`	`18`	`mp_raise_RuntimeError(MP_ERROR_TEXT("RTC is not supported on this board"));`
`19`	`19`	`}`
`20`	`20`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_not_implemented_obj, time_not_implemented);`
`172`	`172`	`#endif`
`173`	`173`
`174`	`174`	`#if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE`
`175`		`-NORETURN mp_obj_t MP_WEAK rtc_get_time_source_time(void) {`
	`175`	`+mp_obj_t MP_WEAK rtc_get_time_source_time(void) {`
`176`	`176`	`mp_raise_RuntimeError(MP_ERROR_TEXT("RTC is not supported on this board"));`
`177`	`177`	`}`
`178`	`178`