multi-arch fix and cmake ci/cd improvement

Author: kernelwernel

.github/workflows/build-multi-arch.yml

@@ -68,8 +68,7 @@ jobs:
             ${{ matrix.image }} \
             bash -c "
               apt-get update -q &&
-              apt-get install -y --no-install-recommends g++ build-essential python3-pip git &&
-              pip3 install cmake --break-system-packages &&
+              apt-get install -y --no-install-recommends g++ build-essential cmake git &&
               cmake -B build -DCMAKE_BUILD_TYPE=Debug &&
               cmake --build build --config Debug --parallel
             "

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.29 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 
 project(llarm VERSION 0.1 LANGUAGES CXX)
 

cmake/flags.cmake

@@ -46,8 +46,11 @@ set(CLANG_CXX_FLAGS
     -Wdouble-promotion
     -Wformat=2
     -Wimplicit-fallthrough
-    -Wno-deprecated-literal-operator # specific to string-view-lite lib
-    -Wno-deprecated-builtins # same
+)
+
+set(STRING_VIEW_LITE_SUPPRESS_CXX_FLAGS
+    -Wno-deprecated-literal-operator
+    -Wno-deprecated-builtins
 )
 
 

cmake/target_flags.cmake

@@ -12,11 +12,15 @@ function(configure_target_flags TARGET)
     else()
         if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
             list(APPEND CXX_FLAGS ${CLANG_CXX_FLAGS})
+            list(APPEND CXX_FLAGS ${STRING_VIEW_LITE_SUPPRESS_CXX_FLAGS})
             if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
                 list(APPEND CXX_FLAGS ${CLANG_ONLY_CXX_FLAGS})
             endif()
         elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
             list(APPEND CXX_FLAGS ${GCC_CXX_FLAGS})
+            if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "13")
+                list(APPEND CXX_FLAGS ${STRING_VIEW_LITE_SUPPRESS_CXX_FLAGS})
+            endif()
         else()
             message(WARNING "Unknown compiler: ${CMAKE_CXX_COMPILER_ID}")
         endif()

llarm-asm/CMakeLists.txt

@@ -1,5 +1,5 @@
 # basic info
-cmake_minimum_required(VERSION 3.29 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 
 
 # includes

llarm-asm/tests/CMakeLists.txt

@@ -1,5 +1,5 @@
 # basic info
-cmake_minimum_required(VERSION 3.29 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 
 
 # includes

llarm-cpu/CMakeLists.txt

@@ -1,5 +1,5 @@
 # basic info
-cmake_minimum_required(VERSION 3.29 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 
 
 # includes

llarm-emu/CMakeLists.txt

@@ -1,5 +1,5 @@
 # basic info
-cmake_minimum_required(VERSION 3.29 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 
 
 # includes

llarm-emu/src/cpu/memory/cache.cpp

@@ -56,7 +56,7 @@ void CACHE::set_parameters() {
         - cp15.read(id::cp15::R0_CACHE_DSIZE_LEN)
     ));
     DATA_CACHE_SIZE = static_cast<u32>(DATA_MULTIPLIER << (cp15.read(id::cp15::R0_CACHE_DSIZE_SIZE) + 8));
-    data_lines.assign(static_cast<size_t>(DATA_NSETS) * DATA_ASSOCIATIVITY, cache_line{});
+    data_lines.assign(DATA_NSETS * static_cast<std::size_t>(DATA_ASSOCIATIVITY), cache_line{});
 
     DATA_W = 0;
     for (u16 a = DATA_ASSOCIATIVITY - 1; a > 0; a >>= 1) { 
@@ -76,7 +76,7 @@ void CACHE::set_parameters() {
         ));
         INST_CACHE_SIZE = static_cast<u32>(INST_MULTIPLIER << (cp15.read(id::cp15::R0_CACHE_ISIZE_SIZE) + 8));
 
-        inst_lines.assign(static_cast<size_t>(INST_NSETS) * INST_ASSOCIATIVITY, cache_line{});
+        inst_lines.assign(INST_NSETS * static_cast<std::size_t>(INST_ASSOCIATIVITY), cache_line{});
 
         INST_W = 0;
         for (u16 a = INST_ASSOCIATIVITY - 1; a > 0; a >>= 1) { 

llarm-rand/CMakeLists.txt

@@ -1,5 +1,5 @@
 # basic info
-cmake_minimum_required(VERSION 3.29 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 project(
     llarm-rand
     VERSION 0.1