From eff4fe398be381eeab0228c5e20afd3d5125212d Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Wed, 6 Jul 2022 17:37:43 -0500 Subject: [PATCH] src/include.am: fix gating around sha* and BUILD_ARMASM, to avoid empty-translation-unit warnings for sha{256,512}.c on armasm builds. --- src/include.am | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/include.am b/src/include.am index 361bf6a89..7a608f9ac 100644 --- a/src/include.am +++ b/src/include.am @@ -170,8 +170,7 @@ src_libwolfssl_la_SOURCES += \ src_libwolfssl_la_SOURCES += \ wolfcrypt/src/hmac.c \ - wolfcrypt/src/random.c \ - wolfcrypt/src/sha256.c + wolfcrypt/src/random.c src_libwolfssl_la_SOURCES += wolfcrypt/src/kdf.c @@ -201,13 +200,14 @@ endif if BUILD_ARMASM src_libwolfssl_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha256.c -endif +else +src_libwolfssl_la_SOURCES += wolfcrypt/src/sha256.c if BUILD_INTELASM src_libwolfssl_la_SOURCES += wolfcrypt/src/sha256_asm.S endif +endif if BUILD_SHA512 -src_libwolfssl_la_SOURCES += wolfcrypt/src/sha512.c if BUILD_ARMASM src_libwolfssl_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha512.c if BUILD_ARMASM_INLINE @@ -217,11 +217,13 @@ else src_libwolfssl_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha512-asm.S src_libwolfssl_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha512-asm.S endif -endif +else +src_libwolfssl_la_SOURCES += wolfcrypt/src/sha512.c if BUILD_INTELASM src_libwolfssl_la_SOURCES += wolfcrypt/src/sha512_asm.S endif endif +endif if BUILD_SHA3 src_libwolfssl_la_SOURCES += wolfcrypt/src/sha3.c