Add execstack flags to CMakeLists

Author: mxpph

rehlds/HLTV/Console/CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.1)
 project(hltv CXX)
 
+include(CheckCXXCompilerFlag)
+
 option(DEBUG "Build with debug information." OFF)
 
 set(CMAKE_CXX_STANDARD 14)
@@ -14,6 +16,18 @@ set(LINK_FLAGS "-m32 -no-pie -Wl,--no-export-dynamic")
 
 set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wall -fno-exceptions -fno-strict-aliasing -fno-strict-overflow")
 
+check_cxx_compiler_flag("-Wa,--execstack" HAS_EXECSTACK_ASM)
+check_cxx_compiler_flag("-Wl,-z,execstack" HAS_EXECSTACK_LINK)
+
+# Glibc >=2.41 fixes
+if(HAS_EXECSTACK_ASM)
+	set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wa,--execstack")
+endif()
+
+if(HAS_EXECSTACK_LINK)
+	set(LINK_FLAGS "${LINK_FLAGS} -Wl,-z,execstack")
+endif()
+
 if (DEBUG)
 	set(COMPILE_FLAGS "${COMPILE_FLAGS} -g3 -O3 -ggdb")
 else()

rehlds/dedicated/CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.1)
 project(hlds CXX)
 
+include(CheckCXXCompilerFlag)
+
 option(DEBUG "Build with debug information." OFF)
 
 set(CMAKE_CXX_STANDARD 14)
@@ -14,6 +16,18 @@ set(LINK_FLAGS "-m32 -no-pie -Wl,--no-export-dynamic")
 
 set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wall -fno-exceptions -fno-strict-aliasing -fno-strict-overflow")
 
+check_cxx_compiler_flag("-Wa,--execstack" HAS_EXECSTACK_ASM)
+check_cxx_compiler_flag("-Wl,-z,execstack" HAS_EXECSTACK_LINK)
+
+# Glibc >=2.41 fixes
+if(HAS_EXECSTACK_ASM)
+	set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wa,--execstack")
+endif()
+
+if(HAS_EXECSTACK_LINK)
+	set(LINK_FLAGS "${LINK_FLAGS} -Wl,-z,execstack")
+endif()
+
 if (DEBUG)
 	set(COMPILE_FLAGS "${COMPILE_FLAGS} -g3 -O3 -ggdb")
 else()