Merge branch 'main' into virtual_attestations

.github/workflows/release.yml

@@ -92,13 +92,6 @@ jobs:
           ninja -v | tee build.log
         shell: bash
 
-      - name: "Check Mitigation Flags"
-        run: |
-          cd build
-          python3 ../scripts/build-check.py < build.log SNPCC
-        shell: bash
-        if: ${{ matrix.platform.name == 'snp' }}
-
       - name: "Install Extended Testing Tools"
         run: |
           set -ex
@@ -118,7 +111,10 @@ jobs:
           export ASAN_SYMBOLIZER_PATH=$(realpath /usr/bin/llvm-symbolizer-15)
           # Unit tests
           ./tests.sh --output-on-failure -L unit -j$(nproc --all)
-          ./tests.sh --timeout 360 --output-on-failure -LE "benchmark|unit"
+          # Suite tests
+          ./tests.sh --timeout 600 --output-on-failure -L "suite"
+          # Most tests
+          ./tests.sh --timeout 360 --output-on-failure -LE "benchmark|unit|suite"
         shell: bash
         if: "${{ matrix.platform.name != 'snp' }}"
 

CHANGELOG.md

@@ -13,6 +13,10 @@ and this project adheres Fto [Semantic Versioning](http://semver.org/spec/v2.0.0
 
 - Joining nodes can now request a snapshot from their peers at startup, rather than relying on file access. The joinee's snapshot will be fetched and used if it is more recent than the joiner has access to. This behaviour is enabled by default, but can be disabled via the `command.join.fetch_recent_snapshot` config option (#6758).
 
+### Changed
+
+- CCF now defaults to using libstdc++ rather than libc++, and no longer builds with LTO, to improve compatibility with other C++ libraries.
+
 ## [6.0.0-dev12]
 
 [6.0.0-dev12]: https://github.com/microsoft/CCF/releases/tag/6.0.0-dev12

cmake/preproject.cmake

@@ -75,20 +75,4 @@ function(add_warning_checks name)
   )
 endfunction()
 
-set(SPECTRE_MITIGATION_FLAGS -mllvm -x86-speculative-load-hardening)
-if("${COMPILE_TARGET}" STREQUAL "snp")
-  if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-    add_compile_options(${SPECTRE_MITIGATION_FLAGS})
-  endif()
-endif()
-
-if("${COMPILE_TARGET}" STREQUAL "snp" OR "${COMPILE_TARGET}" STREQUAL "virtual")
-  if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" AND NOT TSAN)
-    add_compile_options(-flto)
-  endif()
-  # Unconditionally make linker aware of possible LTO happening. Otherwise
-  # targets built in Debug and linked against this will fail linkage.
-  add_link_options(-flto)
-endif()
-
 set(CMAKE_CXX_STANDARD 20)