From 34e88b0605a9a8ba8b2c7f1d0b670f1949bef894 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Fri, 20 Aug 2021 18:43:57 -0500 Subject: [PATCH] linuxkm: properly pass {AM_,}CPPFLAGS to Kbuild, and include kdf.h in module_exports.c.template. --- Makefile.am | 3 ++- linuxkm/Makefile | 2 +- linuxkm/module_exports.c.template | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6a514406b..2fefc9cae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -201,7 +201,8 @@ if BUILD_LINUXKM SUBDIRS_OPT += linuxkm DIST_SUBDIRS_OPT += linuxkm - export KERNEL_ROOT KERNEL_ARCH KERNEL_EXTRA_CFLAGS AM_CFLAGS CFLAGS AM_CCASFLAGS CCASFLAGS \ + export KERNEL_ROOT KERNEL_ARCH KERNEL_EXTRA_CFLAGS AM_CPPFLAGS CPPFLAGS \ + AM_CFLAGS CFLAGS AM_CCASFLAGS CCASFLAGS \ src_libwolfssl_la_OBJECTS ENABLED_CRYPT_TESTS ENABLED_LINUXKM_PIE ENABLED_ASM \ CFLAGS_FPU_DISABLE CFLAGS_FPU_ENABLE CFLAGS_SIMD_DISABLE CFLAGS_SIMD_ENABLE \ CFLAGS_AUTO_VECTORIZE_DISABLE CFLAGS_AUTO_VECTORIZE_ENABLE \ diff --git a/linuxkm/Makefile b/linuxkm/Makefile index de2988a37..091ee5bf6 100644 --- a/linuxkm/Makefile +++ b/linuxkm/Makefile @@ -33,7 +33,7 @@ ifndef SRC_TOP SRC_TOP=$(shell dirname $(MODULE_TOP)) endif -WOLFSSL_CFLAGS=-DHAVE_CONFIG_H -I$(SRC_TOP) -DBUILDING_WOLFSSL $(AM_CFLAGS) $(CFLAGS) -Wno-declaration-after-statement -Wno-redundant-decls +WOLFSSL_CFLAGS=-DHAVE_CONFIG_H -I$(SRC_TOP) -DBUILDING_WOLFSSL $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -Wno-declaration-after-statement -Wno-redundant-decls ifdef KERNEL_EXTRA_CFLAGS WOLFSSL_CFLAGS += $(KERNEL_EXTRA_CFLAGS) endif diff --git a/linuxkm/module_exports.c.template b/linuxkm/module_exports.c.template index 677f1cb70..b1cc4533d 100644 --- a/linuxkm/module_exports.c.template +++ b/linuxkm/module_exports.c.template @@ -127,6 +127,10 @@ #endif #endif +#ifndef NO_KDF + #include +#endif + #ifdef _MSC_VER /* 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy */ #pragma warning(disable: 4996)