From 0931f35482a57a45a2faf1bf0108e2f419c25717 Mon Sep 17 00:00:00 2001 From: Moody Liu Date: Fri, 28 Jun 2024 23:56:07 +0100 Subject: [PATCH] kernel/cpp: use abi:: instead of __cxxabiv1:: namespace --- kernel/misc/cpp_support.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/misc/cpp_support.cpp b/kernel/misc/cpp_support.cpp index 0f48fed7..b054f563 100644 --- a/kernel/misc/cpp_support.cpp +++ b/kernel/misc/cpp_support.cpp @@ -49,7 +49,7 @@ extern "C" int __cxa_atexit(void (*destructor)(void *), void *arg, void *dso) // static scoped variable constructor support -extern "C" int __cxxabiv1::__cxa_guard_acquire(abi::__guard *g) +extern "C" int abi::__cxa_guard_acquire(abi::__guard *g) { // TODO: stub functions, implement 64-bit mutexes/futex-word __atomic_thread_fence(__ATOMIC_ACQUIRE); @@ -59,7 +59,7 @@ extern "C" int __cxxabiv1::__cxa_guard_acquire(abi::__guard *g) } // this function is called when a constructor finishes -extern "C" void __cxxabiv1::__cxa_guard_release(abi::__guard *g) +extern "C" void abi::__cxa_guard_release(abi::__guard *g) { long zero = 0; __atomic_store(g, &zero, __ATOMIC_RELEASE); @@ -67,6 +67,6 @@ extern "C" void __cxxabiv1::__cxa_guard_release(abi::__guard *g) } // this function is called when a constructor throws an exception -extern "C" void __cxxabiv1::__cxa_guard_abort(abi::__guard *) +extern "C" void abi::__cxa_guard_abort(abi::__guard *) { }