Drop gcc 11

artis-mcrt · Oct 28, 2024 · a62c13e · a62c13e
1 parent 476b6bf
commit a62c13e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml
@@ -79,7 +79,6 @@ jobs:
               uses: actions/setup-python@v5
               with:
                   cache: pip
-                  python-version: '3.12'
 
             - name: Generate compile_commands.json
               run: |
@@ -103,7 +102,6 @@ jobs:
             matrix:
                 compiler:
                     [
-                        {name: gcc, ver: 11},
                         {name: gcc, ver: 12},
                         {name: gcc, ver: 13},
                         {name: gcc, ver: 14},

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -174,8 +174,6 @@ jobs:
             - name: Set up Python
               if: always() && matrix.testmode == 'OFF'
               uses: actions/setup-python@v5
-              with:
-                  python-version: '3.12'
 
             - name: Install artistools
               if: always() && matrix.testmode == 'OFF'

diff --git a/.python-version b/.python-version
@@ -0,0 +1 @@
+3.13
diff --git a/Makefile b/Makefile
@@ -63,7 +63,6 @@ CXXFLAGS += -std=c++20 -fstrict-aliasing
 
 ifneq ($(COMPILER_NAME),NVHPC)
 	CXXFLAGS += -ftree-vectorize -Wunused-macros -Werror -Wno-error=unknown-pragmas -MD -MP
-	# add -ftrivial-auto-var-init=zero when we drop gcc 11 support
 endif
 
 # profile-guided optimisation
@@ -209,18 +208,20 @@ ifneq ($(MAX_NODE_SIZE),)
 endif
 
 ifeq ($(TESTMODE),ON)
-	CXXFLAGS += -DTESTMODE=true -D_LIBCPP_DEBUG=0
+	CXXFLAGS += -DTESTMODE=true
 
+	CXXFLAGS += -fno-omit-frame-pointer
+	CXXFLAGS += -ftrivial-auto-var-init=pattern
+	CXXFLAGS += -fsanitize=undefined,address
+
+	# libstdc++ (GNU)
 	CXXFLAGS += -D_GLIBCXX_ASSERTIONS
 	# CXXFLAGS += -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_BACKTRACE=1
 
-	CXXFLAGS +=  -fno-omit-frame-pointer
-
+	# libc++ (LLVM)
 	# CXXFLAGS += -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
 	CXXFLAGS += -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG
 
-	CXXFLAGS += -fsanitize=undefined,address
-
 	BUILD_DIR := $(BUILD_DIR)_testmode
 else
 	# skip GSL range checking for better performance
@@ -241,7 +242,7 @@ else
 			ifeq ($(COMPILER_NAME),NVHPC)
 				CXXFLAGS += -fast
 			else
-				CXXFLAGS += -ffast-math -funsafe-math-optimizations -fno-finite-math-only -fopenmp-simd
+				CXXFLAGS += -ffast-math -funsafe-math-optimizations -fno-finite-math-only -ffp-contract=fast -fopenmp-simd
 			endif
 		endif
 	# endif