Merge pull request #7334 from Bo98/std-nehalem

ENV/std: conditionally apply AES-NI workaround
This commit is contained in:
Mike McQuaid 2020-04-13 09:05:29 +01:00 committed by GitHub
commit c5c161adb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -112,9 +112,11 @@ module Stdenv
def clang
super
replace_in_cflags(/-Xarch_#{Hardware::CPU.arch_32_bit} (-march=\S*)/, '\1')
# Clang mistakenly enables AES-NI on plain Nehalem
map = Hardware::CPU.optimization_flags
.merge(nehalem: "-march=nehalem -Xclang -target-feature -Xclang -aes")
if DevelopmentTools.clang_build_version < 700
# Clang mistakenly enables AES-NI on plain Nehalem
map[:nehalem] = "-march=nehalem -Xclang -target-feature -Xclang -aes"
end
set_cpu_cflags map
end