From cfe466d30c401b9c05e68da0858144397a19fb39 Mon Sep 17 00:00:00 2001 From: Matthias Krack Date: Thu, 6 Jun 2024 18:50:28 +0200 Subject: [PATCH] Update front tester to GCC 14.1.0 --- arch/Linux-gnu-x86_64.psmp | 4 ++-- tools/toolchain/scripts/stage0/install_gcc.sh | 6 +++--- tools/toolchain/scripts/stage6/install_quip.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/Linux-gnu-x86_64.psmp b/arch/Linux-gnu-x86_64.psmp index 307c18ef54..0b9d9acf6b 100644 --- a/arch/Linux-gnu-x86_64.psmp +++ b/arch/Linux-gnu-x86_64.psmp @@ -2,7 +2,7 @@ # # CP2K (GNU x86_64) arch file for Linux clusters # -# Tested with: GNU 13.2.0, MPICH 4.0.3 and OpenMPI 4.1.5, +# Tested with: GNU 14.1.0, MPICH 4.0.3 and OpenMPI 4.1.6, # ScaLAPACK 2.2.1, OpenBLAS 0.3.27, # FFTW 3.3.10, ELPA 2023.05.001, HDF5 1.14.2, # LIBINT 2.6.0, LIBXC 6.2.2, PLUMED 2.9.0, @@ -16,7 +16,7 @@ # Optionally, GNU compiler and MPI implementation can be specified as arguments. # Replace or adapt the "module add" commands below if needed. # -# Last update: 09.05.2024 +# Last update: 06.06.2024 # # \ if [[ "${0}" == "${BASH_SOURCE}" ]]; then \ diff --git a/tools/toolchain/scripts/stage0/install_gcc.sh b/tools/toolchain/scripts/stage0/install_gcc.sh index e4c4b3798c..a015524a0e 100755 --- a/tools/toolchain/scripts/stage0/install_gcc.sh +++ b/tools/toolchain/scripts/stage0/install_gcc.sh @@ -6,8 +6,8 @@ [ "${BASH_SOURCE[0]}" ] && SCRIPT_NAME="${BASH_SOURCE[0]}" || SCRIPT_NAME=$0 SCRIPT_DIR="$(cd "$(dirname "$SCRIPT_NAME")/.." && pwd -P)" -gcc_ver="13.2.0" -gcc_sha256="8cb4be3796651976f94b9356fa08d833524f62420d6292c5033a9a26af315078" +gcc_ver="14.1.0" +gcc_sha256="a0be066c02775002a0fa65ad3c65fb56a8bfd923d072a26ed148c0439ecdb68f" source "${SCRIPT_DIR}"/common_vars.sh source "${SCRIPT_DIR}"/tool_kit.sh @@ -58,7 +58,7 @@ case "${with_gcc}" in # TODO: Unfortunately, we can not simply use --disable-shared, because # it would break OpenBLAS build and probably others too. COMMON_FLAGS="-O2 -fPIC -fno-omit-frame-pointer -fopenmp -g" - CFLAGS="${COMMON_FLAGS} -std=gnu99" + CFLAGS="${COMMON_FLAGS}" CXXFLAGS="${CFLAGS}" FCFLAGS="${COMMON_FLAGS} -fbacktrace" ${GCCROOT}/configure --prefix="${pkg_install_dir}" \ diff --git a/tools/toolchain/scripts/stage6/install_quip.sh b/tools/toolchain/scripts/stage6/install_quip.sh index f675d4d8db..2444c00123 100755 --- a/tools/toolchain/scripts/stage6/install_quip.sh +++ b/tools/toolchain/scripts/stage6/install_quip.sh @@ -116,8 +116,8 @@ case "${with_quip}" in # enable debug symbols echo "F95FLAGS += -g ${compat_flag}" >> arch/Makefile.linux_${quip_arch}_gfortran echo "F77FLAGS += -g ${compat_flag}" >> arch/Makefile.linux_${quip_arch}_gfortran - echo "CFLAGS += -g" >> arch/Makefile.linux_${quip_arch}_gfortran - echo "CPLUSPLUSFLAGS += -g" >> arch/Makefile.linux_${quip_arch}_gfortran + echo "CFLAGS += -g -fpermissive" >> arch/Makefile.linux_${quip_arch}_gfortran + echo "CPLUSPLUSFLAGS += -g -fpermissive" >> arch/Makefile.linux_${quip_arch}_gfortran # Makefile.linux_${quip_arch}_gfortran_openmp includes Makefile.linux_${quip_arch}_gfortran export QUIP_ARCH=linux_${quip_arch}_gfortran_openmp # hit enter a few times to accept defaults