From 5f87a05aa314776135eec1057dd644c0b25a9d14 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 6 Sep 2017 11:59:44 -0700 Subject: lib: crypto: Add the ability to select Intel AESNI instruction set at configure time. Add --accel-aes=[none|intelaesni] to select. Default is none. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13008 Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher --- third_party/aesni-intel/wscript | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'third_party') diff --git a/third_party/aesni-intel/wscript b/third_party/aesni-intel/wscript index 002ba5d42d1..eb92d6626fe 100644 --- a/third_party/aesni-intel/wscript +++ b/third_party/aesni-intel/wscript @@ -1,8 +1,17 @@ #!/usr/bin/env python +import Options +import Utils def configure(conf): - if conf.CHECK_CFLAGS('-Wp,-E,-lang-asm', '') and conf.env['SYSTEM_UNAME_MACHINE'] == 'x86_64': - conf.DEFINE('HAVE_AESNI_INTEL', 1) + if Options.options.accel_aes.lower() == "intelaesni": + if conf.CHECK_CFLAGS('-Wp,-E,-lang-asm', ''): + if conf.env['SYSTEM_UNAME_MACHINE'] == 'x86_64': + print("Compiling with Intel AES instructions") + conf.DEFINE('HAVE_AESNI_INTEL', 1) + else: + raise Utils.WafError('--aes-accel=intelaesni selected and non x86_64 CPU') + else: + raise Utils.WafError('--aes-accel=intelaesni selected and compiler rejects -Wp,-E,-lang-asm') def build(bld): if not bld.CONFIG_SET('HAVE_AESNI_INTEL'): -- cgit v1.2.1