From 8cd47e1f90ee6c1dbedb462b252c8e1e7b079e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Date: Fri, 18 Sep 2015 21:10:36 -0700 Subject: trusty: Set OPENSSL_STATIC_ARMCAP* based on make variables Change-Id: Ide28171787db4e481b0b05b4107e58071d8c0fee --- rules.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/rules.mk b/rules.mk index d484ae37..e2d5ae39 100644 --- a/rules.mk +++ b/rules.mk @@ -60,6 +60,17 @@ LOCAL_SRC_FILES := $(filter-out src/crypto/x509v3/v3_utl.c,$(LOCAL_SRC_FILES)) # no-op threading functions. MODULE_CFLAGS += -DTRUSTY +# Define static armcap based on lk build variables +MODULE_STATIC_ARMCAP := -DOPENSSL_STATIC_ARMCAP +toarmcap = $(if $(filter-out 0 false,$(2)),-DOPENSSL_STATIC_ARMCAP_$(1),) +MODULE_STATIC_ARMCAP += $(call toarmcap,NEON,$(USE_ARM_V7_NEON)) +MODULE_STATIC_ARMCAP += $(call toarmcap,AES,$(USE_ARM_V8_AES)) +MODULE_STATIC_ARMCAP += $(call toarmcap,PMULL,$(USE_ARM_V8_PMULL)) +MODULE_STATIC_ARMCAP += $(call toarmcap,SHA1,$(USE_ARM_V8_SHA1)) +MODULE_STATIC_ARMCAP += $(call toarmcap,SHA256,$(USE_ARM_V8_SHA2)) +MODULE_CFLAGS += $(MODULE_STATIC_ARMCAP) +MODULE_ASMFLAGS += $(MODULE_STATIC_ARMCAP) + MODULE_SRCS += $(addprefix $(LOCAL_DIR)/,$(LOCAL_SRC_FILES)) MODULE_SRCS += $(addprefix $(LOCAL_DIR)/,$(LOCAL_SRC_FILES_$(ARCH))) LOCAL_C_INCLUDES := src/crypto src/include -- cgit v1.2.3