diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 4942333ab587..10bb1516cf61 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -323,7 +323,8 @@ dev/syscons/scvesactl.c		optional	sc vga vesa
 dev/syscons/scvgarndr.c		optional	sc vga
 dev/tpm/tpm.c			optional	tpm
 dev/tpm/tpm20.c		optional	tpm
-dev/tpm/tpm_crb.c		optional	tpm acpi
+dev/tpm/tpm_crb.c		optional	tpm acpi \
+	compile-with "${NORMAL_C} ${NO_WINT_IN_BOOL_CONTEXT}"
 dev/tpm/tpm_tis.c		optional	tpm acpi
 dev/tpm/tpm_acpi.c		optional	tpm acpi
 dev/tpm/tpm_isa.c		optional	tpm isa
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 1e29b58663d4..61867dd8e725 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -37,6 +37,9 @@ CWARNEXTRA+=	-Wno-error-shift-negative-value
 .if ${COMPILER_VERSION} >= 40000
 CWARNEXTRA+=	-Wno-address-of-packed-member
 .endif
+.if ${COMPILER_VERSION} >= 100000
+NO_WINT_IN_BOOL_CONTEXT=	-Wno-int-in-bool-context
+.endif
 .endif
 
 .if ${COMPILER_TYPE} == "gcc"
diff --git a/sys/modules/tpm/Makefile b/sys/modules/tpm/Makefile
index 79c737b653e0..9fd80d7ae715 100644
--- a/sys/modules/tpm/Makefile
+++ b/sys/modules/tpm/Makefile
@@ -11,3 +11,5 @@ SRCS+=	tpm_isa.c tpm_acpi.c isa_if.h opt_acpi.h acpi_if.h
 SRCS+=	tpm20.c tpm_crb.c tpm_tis.c opt_tpm.h
 
 .include <bsd.kmod.mk>
+
+CWARNFLAGS.tpm_crb.c+=	${NO_WINT_IN_BOOL_CONTEXT}