-std=c++20

rtiangha · Sep 11, 2024 · 3e6008a · 3e6008a
1 parent 293c20f
commit 3e6008a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/.github/workflows/aarch64.yml b/.github/workflows/aarch64.yml
@@ -20,10 +20,10 @@ jobs:
         run: >
           sudo apt-get update &&
           sudo apt-get install
-          gcc-11
-          g++-11
-          gcc-11-aarch64-linux-gnu
-          g++-11-aarch64-linux-gnu
+          gcc-13
+          g++-13
+          gcc-13-aarch64-linux-gnu
+          g++-13-aarch64-linux-gnu
           ninja-build
           qemu-user
 
@@ -39,14 +39,16 @@ jobs:
       - name: Configure CMake for AArch64 (Linux)
         if: matrix.platform == 'linux'
         env:
-          CC: aarch64-linux-gnu-gcc-11
-          CXX: aarch64-linux-gnu-g++-11
+          CC: aarch64-linux-gnu-gcc-13
+          CXX: aarch64-linux-gnu-g++-13
         run: >
           cmake
           -B ${{github.workspace}}/build-arm64
           -DBOOST_INCLUDEDIR=${{github.workspace}}/externals/ext-boost
           -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
           -DDYNARMIC_TESTS_USE_UNICORN=0
+          -DCMAKE_CXX_FLAGS="-std=c++20" 
+          -DCMAKE_C_FLAGS="-std=c++20" 
           -DDYNARMIC_USE_LLVM=0
           -G Ninja
           
@@ -55,6 +57,8 @@ jobs:
         run: >
           cmake
           -B ${{github.workspace}}/build-arm64
+          -DCMAKE_CXX_FLAGS="-std=c++20"
+          -DCMAKE_C_FLAGS="-std=c++20"
           -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake
           -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
           -DANDROID_ABI=arm64-v8a
@@ -76,6 +80,8 @@ jobs:
         run: >
           cmake
           -B ${{github.workspace}}/build-x64
+          -DCMAKE_CXX_FLAGS="-std=c++20"
+          -DCMAKE_C_FLAGS="-std=c++20"
           -DBOOST_INCLUDEDIR=${{github.workspace}}/externals/ext-boost
           -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
           -DCMAKE_C_COMPILER_LAUNCHER=ccache
@@ -140,6 +146,8 @@ jobs:
         run: >
           cmake
           -B ${{github.workspace}}/build-arm64
+          -DCMAKE_CXX_FLAGS="/std:c++20"
+          -DCMAKE_C_FLAGS="/std:c++20"
           -DBOOST_INCLUDEDIR=${{github.workspace}}/externals/ext-boost
           -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
           -DDYNARMIC_WARNINGS_AS_ERRORS=0

diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml
@@ -34,6 +34,8 @@ jobs:
           cmake
           -B ${{github.workspace}}/build
           -DBOOST_INCLUDEDIR=${{github.workspace}}/externals/ext-boost
+          -DCMAKE_CXX_FLAGS="-std=c++20"
+          -DCMAKE_C_FLAGS="-std=c++20"
           -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
           -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
           -G Ninja

diff --git a/.github/workflows/riscv64.yml b/.github/workflows/riscv64.yml
@@ -42,6 +42,8 @@ jobs:
         run: >
           cmake
           -B ${{github.workspace}}/build-riscv64
+          -DCMAKE_CXX_FLAGS="-std=c++20"
+          -DCMAKE_C_FLAGS="-std=c++20"
           -DBOOST_INCLUDEDIR=${{github.workspace}}/externals/ext-boost
           -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
           -DDYNARMIC_TESTS_USE_UNICORN=0

diff --git a/.github/workflows/x86-64.yml b/.github/workflows/x86-64.yml
@@ -19,7 +19,7 @@ jobs:
 
       - name: Install build dependencies
         if: ${{matrix.os == 'ubuntu-24.04'}}
-        run: sudo apt-get install llvm ninja-build gcc-11 g++-11
+        run: sudo apt-get install llvm ninja-build gcc-13 g++-13
 
       - name: Install build dependencies
         if: ${{matrix.os == 'macos-13'}}
@@ -46,12 +46,14 @@ jobs:
       - name: Configure CMake
         if: ${{matrix.os == 'ubuntu-24.04'}}
         env:
-          CC: gcc-11
-          CXX: g++-11
+          CC: gcc-13
+          CXX: g++-13
           CXXFLAGS: -Wp,-D_GLIBCXX_ASSERTIONS
         run: >
           cmake
           -B ${{github.workspace}}/build
+          -DCMAKE_CXX_FLAGS="-std=c++20"
+          -DCMAKE_C_FLAGS="-std=c++20"
           -DBOOST_INCLUDEDIR=${{github.workspace}}/externals/ext-boost
           -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
           -DDYNARMIC_ENABLE_CPU_FEATURE_DETECTION=${{matrix.cpu_detection}}
@@ -66,6 +68,8 @@ jobs:
         run: >
           cmake
           -B ${{github.workspace}}/build
+          -DCMAKE_CXX_FLAGS="-std=c++20"
+          -DCMAKE_C_FLAGS="-std=c++20"
           -DBOOST_INCLUDEDIR=${{github.workspace}}/externals/ext-boost
           -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
           -DDYNARMIC_ENABLE_CPU_FEATURE_DETECTION=${{matrix.cpu_detection}}
@@ -80,6 +84,8 @@ jobs:
         run: >
           cmake
           -B ${{github.workspace}}/build
+          -DCMAKE_CXX_FLAGS="/std:c++20"
+          -DCMAKE_C_FLAGS="/std:c++20"
           -DBOOST_INCLUDEDIR=${{github.workspace}}/externals/ext-boost
           -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
           -DDYNARMIC_ENABLE_CPU_FEATURE_DETECTION=${{matrix.cpu_detection}}