Rework toolchain file and build libraries in MinSizeRel mode (#75)

SpaceTeam · Dec 11, 2024 · de278b8 · de278b8
2 parents 9a0f428 + 7c71d37
commit de278b8
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 18 deletions.
diff --git a/.github/workflows/ci-push.yml b/.github/workflows/ci-push.yml
@@ -11,20 +11,19 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v3
 
     - name: Copy scripts to linux-x86 build context
       run: cp install.sh ./linux-x86/. && cp libraries.txt ./linux-x86/.
 
-    - name: Copy scripts to full build contexts 
+    - name: Copy scripts to full build contexts
       run: cp install.sh ./full/. && cp libraries.txt ./full/.
 
     - name: Build the linux Docker image
       run: docker build ./linux-x86 -t tuwienspaceteam/sts1-cobc:latest-linux-x86
 
     - name: Build the full Docker image
       run: docker build ./full
-
diff --git a/.github/workflows/ci-tag.yml b/.github/workflows/ci-tag.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   docker-linux-x86:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout
@@ -45,13 +45,13 @@ jobs:
   docker-full:
     needs: docker-linux-x86
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Copy scripts to full build contexts 
+      - name: Copy scripts to full build contexts
         run: cp install.sh ./full/. && cp libraries.txt ./full/.
 
       - name: Docker meta

diff --git a/full/stm32f411.cmake b/full/stm32f411.cmake
@@ -59,10 +59,20 @@ message("HSE value used: ${HSE_VALUE}")
 add_compile_definitions(HSE_VALUE=${HSE_VALUE} HSE_STARTUP_TIMEOUT=10000000)
 add_compile_definitions(USE_STDPERIPH_DRIVER STM32F411xE)
 
+# The Ninja Multi-Config generator does not support the MinSizeRel configuration by default so we
+# add it here.
+set(CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;MinSizeRel")
+# I thought setting the default flags for the configurations is done with the *_INIT variables but
+# that appends to the existing default flags instead of replacing them.
+set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -gdwarf-2")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g3 -gdwarf-2 -DNDEBUG")
+set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG")
+
 set(compile_and_link_options -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=softfp)
 
 add_compile_options(${compile_and_link_options})
-add_compile_options(-gdwarf-2 -mthumb -g3)
+add_compile_options(-mthumb -ffunction-sections -fdata-sections)
 
 # Definitions for Experimental Outcome
 add_compile_definitions(SYSTEM_ERROR2_NOT_POSIX)

diff --git a/install.sh b/install.sh
@@ -38,11 +38,11 @@ cd rodos
 # We will need it later, so just copy it to the top-level directory
 find . -name linux-x86.cmake | xargs cp -t ../ -v
 if [[ $1 == "linux" ]]; then
-  cmake --toolchain cmake/port/linux-x86.cmake -S . -B build/linux-x86
+  cmake --toolchain cmake/port/linux-x86.cmake -DCMAKE_BUILD_TYPE=MinSizeRel -S . -B build/linux-x86
   cmake --build build/linux-x86
   sudo cmake --install build/linux-x86
 else
-  cmake --toolchain cmake/port/cobc.cmake -S . -B build/cobc
+  cmake --toolchain cmake/port/cobc.cmake -DCMAKE_BUILD_TYPE=MinSizeRel -S . -B build/cobc
   cmake --build build/cobc
   sudo cmake --install build/cobc --prefix "$2"
 fi
@@ -66,11 +66,11 @@ fi
 
 cd littlefs
 if [[ $1 == "linux" ]]; then
-  cmake --toolchain ../linux-x86.cmake -DLFS_THREADSAFE=ON -DLFS_NO_MALLOC=OFF -S . -B build/linux-x86
+  cmake --toolchain ../linux-x86.cmake -DLFS_THREADSAFE=ON -DLFS_NO_MALLOC=OFF -DCMAKE_BUILD_TYPE=MinSizeRel -S . -B build/linux-x86
   cmake --build build/linux-x86
   sudo cmake --install build/linux-x86
 else
-  cmake --toolchain ../stm32f411.cmake -DLFS_THREADSAFE=ON -DLFS_NO_MALLOC=OFF -S . -B build/cobc
+  cmake --toolchain ../stm32f411.cmake -DLFS_THREADSAFE=ON -DLFS_NO_MALLOC=OFF -DCMAKE_BUILD_TYPE=MinSizeRel -S . -B build/cobc
   cmake --build ./build/cobc
   sudo cmake --install build/cobc --prefix "$2"
 fi

diff --git a/libraries.txt b/libraries.txt
@@ -1,4 +1,4 @@
-rodos,d0fbbffafcd248b27f8c29fe773bebcab4bcd784,https://github.com/SpaceTeam/rodos.git
+rodos,a76e5ac33397273c08ac9e247a7ea2308e160801,https://github.com/SpaceTeam/rodos.git
 etl,cceb5038664a4fa363e79709bc08bd0bb356ae50,https://github.com/ETLCPP/etl.git
 Catch2,v3.1.0,https://github.com/catchorg/Catch2.git
 littlefs,8e53bfeda7716ed7056a2b519bba45f40dea7df0,https://github.com/SpaceTeam/littlefs.git

diff --git a/linux-x86/Dockerfile b/linux-x86/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:23.04
+FROM ubuntu:24.04
 
 ENV HOME="/"
 
@@ -30,11 +30,12 @@ RUN dpkg --add-architecture i386 && apt-get update -qq && apt-get install -y -qq
 && rm -rf /var/lib/apt/lists/*
 
 # Setup tools versions
-RUN update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-15 15
-RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-15 15
-RUN update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-15 15
-RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12
+RUN update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-15 99
+RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-15 99
+RUN update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-15 99
+RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 99
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 99
+RUN update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-12 99
 
 # Install CMake 3.22
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0-linux-x86_64.tar.gz -q