mika/Atmosphere-libs
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere-libs.git synced 2025-06-29 14:32:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

boot2: update for new sf semantics

Browse Source
This commit is contained in:
Michael Scire 2021-01-18 17:35:05 -08:00
parent ae4243e412
commit 85348a7664
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libstratosphere/source/ams/ams_environment.cpp
View File

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

9
libstratosphere/source/ams/ams_environment_weak.cpp
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
}

2
libstratosphere/source/i2c/driver/impl/i2c_i2c_session_impl.cpp
View File

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