Step 5/10 of the namespace unification of CPU mitigations related Kconfig options. [ mingo: Converted a few more uses in comments/messages as well. ]
Showing the changes to scripts (3 of 39 files). Show all
Unified · Split
| @@ -262,7 +262,7 @@ ifdef CONFIG_FTRACE_MCOUNT_USE_OBJTOOL · 261 unmodified lines | |||
| 262 | objtool-args-$(CONFIG_HAVE_OBJTOOL_NOP_MCOUNT) += --mnop | 262 | objtool-args-$(CONFIG_HAVE_OBJTOOL_NOP_MCOUNT) += --mnop |
| 263 | endif | 263 | endif |
| 264 | objtool-args-$(CONFIG_UNWINDER_ORC) += --orc | 264 | objtool-args-$(CONFIG_UNWINDER_ORC) += --orc |
| 265 | objtool-args-$(CONFIG_RETPOLINE) += --retpoline | 265 | objtool-args-$(CONFIG_MITIGATION_RETPOLINE) += --retpoline |
| 266 | objtool-args-$(CONFIG_RETHUNK) += --rethunk | 266 | objtool-args-$(CONFIG_RETHUNK) += --rethunk |
| 267 | objtool-args-$(CONFIG_SLS) += --sls | 267 | objtool-args-$(CONFIG_SLS) += --sls |
| 268 | objtool-args-$(CONFIG_STACK_VALIDATION) += --stackval | 268 | objtool-args-$(CONFIG_STACK_VALIDATION) += --stackval |
| @@ -155,7 +155,7 @@ fn main() { · 154 unmodified lines | |||
| 155 | "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", | 155 | "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", |
| 156 | ); | 156 | ); |
| 157 | let mut features = "-3dnow,-3dnowa,-mmx,+soft-float".to_string(); | 157 | let mut features = "-3dnow,-3dnowa,-mmx,+soft-float".to_string(); |
| 158 | if cfg.has("RETPOLINE") { | 158 | if cfg.has("MITIGATION_RETPOLINE") { |
| 159 | features += ",+retpoline-external-thunk"; | 159 | features += ",+retpoline-external-thunk"; |
| 160 | } | 160 | } |
| 161 | ts.push("features", features); | 161 | ts.push("features", features); |
| @@ -1843,7 +1843,7 @@ static void add_header(struct buffer *b, struct module *mod) · 1842 unmodified lines | |||
| 1843 | 1843 | ||
| 1844 | buf_printf(b, | 1844 | buf_printf(b, |
| 1845 | "\n" | 1845 | "\n" |
| 1846 | "#ifdef CONFIG_RETPOLINE\n" | 1846 | "#ifdef CONFIG_MITIGATION_RETPOLINE\n" |
| 1847 | "MODULE_INFO(retpoline, \"Y\");\n" | 1847 | "MODULE_INFO(retpoline, \"Y\");\n" |
| 1848 | "#endif\n"); | 1848 | "#endif\n"); |
| 1849 | 1849 | ||