From 907ffde577c57b918b0a625e691b66dc54b6c7ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Thu, 24 Oct 2019 21:57:59 +0200 Subject: [PATCH] Drop explicit MSVC's DYNAMICBASE option setting in favour of defaults This option is not supported on Arm64 and the defaults should be fine --- cmake/msvc_legacy_quirks.cmake | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cmake/msvc_legacy_quirks.cmake b/cmake/msvc_legacy_quirks.cmake index b682ebad0..d975d2c42 100644 --- a/cmake/msvc_legacy_quirks.cmake +++ b/cmake/msvc_legacy_quirks.cmake @@ -169,17 +169,6 @@ foreach (_build_type ${_build_types_as_upper}) string(APPEND CMAKE_EXE_LINKER_FLAGS_${_build_type} " /TLBID:1") string(APPEND CMAKE_SHARED_LINKER_FLAGS_${_build_type} " /TLBID:1") - # FIXME: This is not necessary. This is MSVC's default. - # Address space layout randomization - # See https://msdn.microsoft.com/en-us/library/bb384887.aspx - string(APPEND CMAKE_EXE_LINKER_FLAGS_${_build_type} " /DYNAMICBASE") - if(ENABLE_CFI) - # CFI requires /DYNAMICBASE to be enabled. - string(APPEND CMAKE_SHARED_LINKER_FLAGS_${_build_type} " /DYNAMICBASE") - else() - string(APPEND CMAKE_SHARED_LINKER_FLAGS_${_build_type} " /DYNAMICBASE:NO") - endif() - # FIXME: This is not necessary. This is MSVC's default. # Indicate that the executable is compatible with DEP # See https://msdn.microsoft.com/en-us/library/ms235442.aspx