Update contrib/restricted/aws/s2n to 1.3.12

ref:f8279d764b4c00974a63543a1364c91e2b81b7a6

2 files changed, 23 insertions, 5 deletions

diff --git a/build/conf/license.conf b/build/conf/license.conf
index 0a316705d2..a34482c919 100644
--- a/build/conf/license.conf
+++ b/build/conf/license.conf
@@ -35,7 +35,6 @@ LICENSES_UNATTRIBUTED= \
     Bison-Exception \
     Bison-exception-2.2 \
     BouncyCastle-MIT \
-    Brian-Gladman-3-Clause \
     Bsd-New-Tcpdump \
     Bsd-Original-Uc-1986 \
     CC-BY-1.0 \
@@ -349,6 +348,7 @@ CUSTOM_LICENSE_MUSL_EXCEPTION=Musl-Exception-in-Musllib
 # TODO: this list is almost empty. needed for DEVRULES-151
 LICENSES_REQUIRE_CITATION= \
     Apache-2.0 \
+    Brian-Gladman-3-Clause \
     Cmu-Computing-Services \
     OpenSSL \
     Spencer-94 \
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 0ae67c43e4..3a235a9379 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -5553,14 +5553,18 @@ when (($ARCH_X86_64 || $ARCH_I386) && $DISABLE_INSTRUCTION_SETS != "yes") {
         PCLMUL_CFLAGS=-mpclmul
         AVX_CFLAGS=-mavx
 
-        # On Intel FMA3 instruction set comes together with AVX-2 extension starting with Broadwell / Haswell.
+        # On Intel BMI1, BMI2 and FMA3 instruction sets come together with AVX-2 extension starting with Broadwell / Haswell.
         # See:
         # https://en.wikipedia.org/wiki/FMA_instruction_set
+        # https://en.wikipedia.org/wiki/X86_Bit_manipulation_instruction_set
         #
-        # AMD implemented it in Piledriver architecture over AVX prior to AVX-2 which was introduced in Zen.
+        # AMD implemented FMA3 in Piledriver architecture over AVX (that is, prior to AVX-2 which was introduced in Zen).
+        # BMI2 implementation was released by AMD along with AVX-2 support.
         # See:
         # https://en.wikipedia.org/wiki/Template:AMD_x86_CPU_features
-        AVX2_CFLAGS=-mavx2 -mfma
+        #
+        # Due to the above, it looks safe to enable all three extensions whenever AVX-2 is enabled.
+        AVX2_CFLAGS=-mavx2 -mfma -mbmi -mbmi2
 
         # All Intel CPUS with AVX-512 have these instructions except for the Knights Landing / Knights Mill
         # (these are Xeon Phi)
@@ -6208,6 +6212,13 @@ macro SRC_C_XOP(FILE, FLAGS...) {
 }
 
 # tag:cpu tag:src-processing
+### @usage SRC_C_PCLMUL(File Flags...)
+### Compile single .c-file with PCLMUL instruction enabled
+macro SRC_C_PCLMUL(FILE) {
+    _SRC(c $FILE $PCLMUL_CFLAGS COMPILE_OUT_SUFFIX .pclmul)
+}
+
+# tag:cpu tag:src-processing
 ### @usage SRC_C_AVX(File Flags...)
 ### Compile single .c-file with AVX and extra Flags.
 macro SRC_C_AVX(FILE, FLAGS...) {
@@ -6222,6 +6233,13 @@ macro SRC_C_AVX2(FILE, FLAGS...) {
 }
 
 # tag:cpu tag:src-processing
+### @usage SRC_C_AVX2(File Flags...)
+### Compile single .c-file with AVX512 extension enabled
+macro SRC_C_AVX512(FILE, FLAGS...) {
+    _SRC(c $FILE $AVX512_CFLAGS $FLAGS COMPILE_OUT_SUFFIX .avx512)
+}
+
+# tag:cpu tag:src-processing
 ### @usage SRC_CPP_PIC(File Flags...)
 ### Compile single .c-file with -fPIC and extra Flags.
 macro SRC_CPP_PIC(FILE, FLAGS...) {
@@ -8842,7 +8860,7 @@ macro GO_MOCKGEN_MOCKS() {
 }
 
 JAVA_IGNORE_CLASSPATH_CLASH_DEFAULE_VALUE=\
-   ru.yandex.devtools.test.annotations.YaIgnore 
+   ru.yandex.devtools.test.annotations.YaIgnore
 
 # tag:java-specific
 JAVA_IGNORE_CLASSPATH_CLASH_VALUE=$JAVA_IGNORE_CLASSPATH_CLASH_DEFAULE_VALUE