mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
4fb05e45df
Apply an upstream patch that removes unnecessary CFLAGs, avoiding generation of incompatible code. Commit0bd5367233is reverted so the accelerated version builds by default on x86_64. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com> (cherry picked from commit639419ec4f)
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From 9ba77300f9f5dea9f53aed00bf6c33d10b7b2fce Mon Sep 17 00:00:00 2001
|
|
From: Sean Parkinson <sean@wolfssl.com>
|
|
Date: Thu, 7 Jul 2022 09:30:48 +1000
|
|
Subject: [PATCH] AESNI: fix configure to use minimal compiler flags
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index df97ac75c..6abb0c744 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -2142,21 +2142,19 @@ then
|
|
if test "$ENABLED_AESNI" = "yes" || test "$ENABLED_INTELASM" = "yes"
|
|
then
|
|
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AESNI"
|
|
- if test "$GCC" = "yes"
|
|
+ if test "$CC" != "icc"
|
|
then
|
|
- # clang needs these flags
|
|
- if test "$CC" = "clang"
|
|
- then
|
|
- AM_CFLAGS="$AM_CFLAGS -maes -mpclmul"
|
|
- else
|
|
- # GCC needs these flags, icc doesn't
|
|
- # opt levels greater than 2 may cause problems on systems w/o
|
|
- # aesni
|
|
- if test "$CC" != "icc"
|
|
- then
|
|
- AM_CFLAGS="$AM_CFLAGS -maes -msse4 -mpclmul"
|
|
- fi
|
|
- fi
|
|
+ case $host_os in
|
|
+ mingw*)
|
|
+ # Windows uses intrinsics for GCM which uses SSE4 instructions.
|
|
+ # MSVC has own build files.
|
|
+ AM_CFLAGS="$AM_CFLAGS -maes -msse4 -mpclmul"
|
|
+ ;;
|
|
+ *)
|
|
+ # Intrinsics used in AES_set_decrypt_key (TODO: rework)
|
|
+ AM_CFLAGS="$AM_CFLAGS -maes"
|
|
+ ;;
|
|
+ esac
|
|
fi
|
|
AS_IF([test "x$ENABLED_AESGCM" != "xno"],[AM_CCASFLAGS="$AM_CCASFLAGS -DHAVE_AESGCM"])
|
|
fi
|