Merge branch 'x86/bugs' into x86/core, to pick up pending changes before dependent...

[thirdparty/linux.git] / scripts / Makefile.lib

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index cd5b181060f151f2c28186feb5b96db37ee04da9..473f5496ae61e782865df6834cabeae5fd54e2d8 100644 (file)
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -254,7 +254,7 @@ objtool := $(objtree)/tools/objtool/objtool
 
 objtool-args-$(CONFIG_HAVE_JUMP_LABEL_HACK)            += --hacks=jump_label
 objtool-args-$(CONFIG_HAVE_NOINSTR_HACK)               += --hacks=noinstr
-objtool-args-$(CONFIG_CALL_DEPTH_TRACKING)             += --hacks=skylake
+objtool-args-$(CONFIG_MITIGATION_CALL_DEPTH_TRACKING)  += --hacks=skylake
 objtool-args-$(CONFIG_X86_KERNEL_IBT)                  += --ibt
 objtool-args-$(CONFIG_FINEIBT)                         += --cfi
 objtool-args-$(CONFIG_FTRACE_MCOUNT_USE_OBJTOOL)       += --mcount
@@ -262,9 +262,9 @@ ifdef CONFIG_FTRACE_MCOUNT_USE_OBJTOOL
 objtool-args-$(CONFIG_HAVE_OBJTOOL_NOP_MCOUNT)         += --mnop
 endif
 objtool-args-$(CONFIG_UNWINDER_ORC)                    += --orc
-objtool-args-$(CONFIG_RETPOLINE)                       += --retpoline
-objtool-args-$(CONFIG_RETHUNK)                         += --rethunk
-objtool-args-$(CONFIG_SLS)                             += --sls
+objtool-args-$(CONFIG_MITIGATION_RETPOLINE)            += --retpoline
+objtool-args-$(CONFIG_MITIGATION_RETHUNK)              += --rethunk
+objtool-args-$(CONFIG_MITIGATION_SLS)                  += --sls
 objtool-args-$(CONFIG_STACK_VALIDATION)                        += --stackval
 objtool-args-$(CONFIG_HAVE_STATIC_CALL_INLINE)         += --static-call
 objtool-args-$(CONFIG_HAVE_UACCESS_VALIDATION)         += --uaccess