mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-07-30 16:26:33 +08:00
Merge 339a122d5783771f7bc6cef4dbcef27eba2907bc into 3bb373867917b674265067cbd38b9d252c43d014
This commit is contained in:
commit
0bf5766e12
@ -111,7 +111,7 @@ component_check_code_style () {
|
||||
}
|
||||
|
||||
support_check_code_style () {
|
||||
case $(uncrustify --version) in
|
||||
case $(uncrustify --version 2>/dev/null) in
|
||||
*0.75.1*) true;;
|
||||
*) false;;
|
||||
esac
|
||||
|
||||
@ -227,7 +227,7 @@ support_build_baremetal () {
|
||||
# Older Glibc versions include time.h from other headers such as stdlib.h,
|
||||
# which makes the no-time.h-in-baremetal check fail. Ubuntu 16.04 has this
|
||||
# problem, Ubuntu 18.04 is ok.
|
||||
! grep -q -F time.h /usr/include/x86_64-linux-gnu/sys/types.h
|
||||
! grep -s -q -F time.h /usr/include/x86_64-linux-gnu/sys/types.h
|
||||
}
|
||||
|
||||
component_build_tfm () {
|
||||
|
||||
@ -94,13 +94,11 @@ support_test_aesni () {
|
||||
#
|
||||
# The name of this function is possibly slightly misleading, but needs to align
|
||||
# with the name of the corresponding test, component_test_aesni.
|
||||
#
|
||||
# In principle 32-bit x86 can support AESNI, but our implementation does not
|
||||
# support 32-bit x86, so we check for x86-64.
|
||||
# We can only grep /proc/cpuinfo on Linux, so this also checks for Linux
|
||||
# We check only for 64-bit x86 here: 32-bit AESNI is tested separately
|
||||
# in component_test_aesni_m32.
|
||||
(gcc -v 2>&1 | grep Target | grep -q x86_64) &&
|
||||
[[ "$HOSTTYPE" == "x86_64" && "$OSTYPE" == "linux-gnu" ]] &&
|
||||
(lscpu | grep -qw aes)
|
||||
[[ "$HOSTTYPE" == "x86_64" && "$OSTYPE" == "linux-gnu" ]] &&
|
||||
(lscpu | grep -qw aes) 2>/dev/null
|
||||
}
|
||||
|
||||
component_test_aesni () { # ~ 60s
|
||||
@ -157,7 +155,7 @@ component_test_aesni () { # ~ 60s
|
||||
}
|
||||
|
||||
support_test_aesni_m32 () {
|
||||
support_test_m32_no_asm && (lscpu | grep -qw aes)
|
||||
support_test_m32_no_asm && (lscpu | grep -qw aes) 2>/dev/null
|
||||
}
|
||||
|
||||
component_test_aesni_m32 () { # ~ 60s
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user