From d9e2d5dbd4aa1f808c22cbb3ccd109216358a40b Mon Sep 17 00:00:00 2001 From: lorinlee Date: Sun, 22 Oct 2023 22:28:21 +0800 Subject: [PATCH] enable aligned new if supported --- CMakeLists.txt | 4 ++-- Makefile | 4 ++-- test/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a01a0bf6b4..2a0160b022 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,8 +148,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") # segmentation fault in libcontext set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-gcse") endif() - if(NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-aligned-new") + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -faligned-new") endif() endif() diff --git a/Makefile b/Makefile index 87ddc5a4ee..fc8c28b586 100644 --- a/Makefile +++ b/Makefile @@ -46,8 +46,8 @@ ifeq ($(shell test $(GCC_VERSION) -ge 40400; echo $$?),0) endif #not solved yet ifeq ($(CC),gcc) - ifeq ($(shell test $(GCC_VERSION) -ge 70000; echo $$?),0) - CXXFLAGS+=-Wno-aligned-new + ifeq ($(shell test $(GCC_VERSION) -gt 70000; echo $$?),0) + CXXFLAGS+=-faligned-new endif endif diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index aa441d27f6..730c9995ff 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -61,8 +61,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if((CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)") AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4 -msse4.2") endif() - if(NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-aligned-new") + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -faligned-new") endif() endif()