From de50268dfdb0133a95e245da09e4a3f81861a255 Mon Sep 17 00:00:00 2001
From: Daniel Pouzzner <douzzer@wolfssl.com>
Date: Thu, 11 Sep 2025 10:24:53 -0500
Subject: [PATCH] linuxkm/Kbuild: don't undefine CONFIG_OBJTOOL (breaks FIPS
 hash stability on some target kernels/configs);

add config-based gate on "$(WOLFCRYPT_PIE_FILES): OBJECT_FILES_NON_STANDARD := y".
---
 linuxkm/Kbuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/linuxkm/Kbuild b/linuxkm/Kbuild
index 92de8199e..1aae01065 100644
--- a/linuxkm/Kbuild
+++ b/linuxkm/Kbuild
@@ -130,8 +130,9 @@ ifeq "$(ENABLED_LINUXKM_PIE)" "yes"
     $(obj)/linuxkm/module_hooks.o: ccflags-y += $(PIE_SUPPORT_FLAGS)
     # using inline retpolines leads to "unannotated intra-function call"
     # warnings from objtool without this:
-    undefine CONFIG_OBJTOOL
-    $(WOLFCRYPT_PIE_FILES): OBJECT_FILES_NON_STANDARD := y
+    ifneq "$(CONFIG_MITIGATION_RETPOLINE)$(CONFIG_MITIGATION_RETHUNK)" ""
+        $(WOLFCRYPT_PIE_FILES): OBJECT_FILES_NON_STANDARD := y
+    endif
 endif
 
 ifdef KERNEL_EXTRA_CFLAGS_REMOVE