Update NDK to 26.1.10909125

Starting from version 26+, the NDK is based on LLVM 17 and comes with Clang 17 featuring full language and library C++20 support. This means we can get rid of the massive LLVM submodule in the repo, which will be done in a following commit.
PabloG02 · Jan 4, 2024 · 45aa394 · 45aa394
1 parent c3f14ba
commit 45aa394
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -16,28 +16,6 @@ set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -flto=full -fno-stack-protector -DNDEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG "-Ofast")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Ofast")
 
-# libcxxabi
-set(ANDROID_STL "none")
-set(LIBCXXABI_INCLUDE_TESTS OFF)
-set(LIBCXXABI_ENABLE_SHARED OFF)
-set(LIBCXXABI_ENABLE_ASSERTIONS OFF)
-set(LIBCXXABI_LIBCXX_INCLUDES "${LIBCXX_TARGET_INCLUDE_DIRECTORY}" CACHE STRING "" FORCE)
-add_subdirectory("libraries/llvm/libcxxabi")
-
-# libcxx
-set(LIBCXX_INCLUDE_TESTS OFF)
-set(LIBCXX_INCLUDE_BENCHMARKS OFF)
-set(LIBCXX_INCLUDE_DOCS OFF)
-set(LIBCXX_ENABLE_SHARED OFF)
-set(LIBCXX_ENABLE_ASSERTIONS OFF)
-set(LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON)
-add_subdirectory("libraries/llvm/libcxx")
-link_libraries(cxx_static)
-get_target_property(LIBCXX_INCLUDE_COMPILE_OPTION cxx-headers INTERFACE_INCLUDE_DIRECTORIES)
-string(REGEX REPLACE "-I" "" LIBCXX_INCLUDE_DIRECTORY_LIST "${LIBCXX_INCLUDE_COMPILE_OPTION}")
-list(GET LIBCXX_INCLUDE_DIRECTORY_LIST 1 LIBCXX_TARGET_INCLUDE_DIRECTORY) # We just want the target include directory
-set_target_properties(cxx-headers PROPERTIES INTERFACE_COMPILE_OPTIONS -isystem${LIBCXX_TARGET_INCLUDE_DIRECTORY})
-
 # Skyline's Boost fork
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)

diff --git a/app/build.gradle b/app/build.gradle
@@ -125,7 +125,7 @@ android {
     }
 
     /* NDK and CMake */
-    ndkVersion '25.0.8775105'
+    ndkVersion '26.1.10909125'
     externalNativeBuild {
         cmake {
             version '3.22.1+'

diff --git a/app/src/main/cpp/skyline/kernel/memory.cpp b/app/src/main/cpp/skyline/kernel/memory.cpp
@@ -540,7 +540,7 @@ namespace skyline::kernel {
         auto dstChunk = chunks.lower_bound(destination.data());
         if (destination.data() < dstChunk->first)
             --dstChunk;
-        while (dstChunk->second.state.value == memory::states::Unmapped)
+        while (dstChunk->second.state == memory::states::Unmapped)
             ++dstChunk;
 
         if ((destination.data() + destination.size()) > dstChunk->first) [[likely]] {