diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2022-12-20 15:02:46 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2022-12-20 15:02:46 -0800 |
| commit | a9763aa0bda186d8d86101e8ee90a37f606d9f64 (patch) | |
| tree | 58f4fb795fed3f4b2c1cb6bbac9ed25b3134d390 /scripts/Makefile.lib | |
| parent | bcd5b5912c6ce4f7c9491407a38b5d0acd11459b (diff) | |
| parent | 1644d755d0b06d0f1ee93e1c44336c29386546b4 (diff) | |
| download | linux-a9763aa0bda186d8d86101e8ee90a37f606d9f64.tar.gz linux-a9763aa0bda186d8d86101e8ee90a37f606d9f64.zip | |
Merge branch 'master' into mm-nonmm-stable
Diffstat (limited to 'scripts/Makefile.lib')
| -rw-r--r-- | scripts/Makefile.lib | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index b28ac83bd9f0..4a4a5f67c1a6 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -258,6 +258,9 @@ objtool-args-$(CONFIG_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 +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 |