boot2: update for new sf semantics

This commit is contained in:
Michael Scire 2021-01-18 17:35:05 -08:00 committed by SciresM
parent f5c6736431
commit 204539664b
4 changed files with 54 additions and 3 deletions

View file

@ -176,7 +176,6 @@ extern "C" {
/* Redefine C++ exception handlers. Requires wrap linker flag. */
#define WRAP_ABORT_FUNC(func) void NORETURN __wrap_##func(void) { abort(); __builtin_unreachable(); }
WRAP_ABORT_FUNC(__cxa_pure_virtual)
WRAP_ABORT_FUNC(__cxa_throw)
WRAP_ABORT_FUNC(__cxa_rethrow)
WRAP_ABORT_FUNC(__cxa_allocate_exception)

View file

@ -26,3 +26,12 @@ namespace ams {
}
}
extern "C" {
/* Redefine C++ exception handlers. Requires wrap linker flag. */
#define WRAP_ABORT_FUNC(func) void NORETURN __wrap_##func(void) { abort(); __builtin_unreachable(); }
WRAP_ABORT_FUNC(__cxa_pure_virtual)
#undef WRAP_ABORT_FUNC
}

View file

@ -127,7 +127,7 @@ namespace ams::i2c::driver::impl {
auto &device = GetDevice().SafeCastTo<I2cDeviceProperty>();
/* Repeatedly try to execute the transaction. */
int retry_count;
int retry_count = 0;
while (true) {
/* Execute the transaction. */
Result result;