diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-02-14 10:48:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-02-14 10:49:37 +0100 |
| commit | 4589f199eb68afd462bd792f730c7936fe3dafb5 (patch) | |
| tree | 3c12ca1431b72ec6746df4d8b99780a3ba0d5cc5 /scripts/generate_rust_target.rs | |
| parent | Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the br... (diff) | |
| parent | x86/retpoline: Ensure default return thunk isn't used at runtime (diff) | |
| download | linux-4589f199eb68afd462bd792f730c7936fe3dafb5.tar.xz linux-4589f199eb68afd462bd792f730c7936fe3dafb5.zip | |
Merge branch 'x86/bugs' into x86/core, to pick up pending changes before dependent patches
Merge in pending alternatives patching infrastructure changes, before
applying more patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/generate_rust_target.rs')
| -rw-r--r-- | scripts/generate_rust_target.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/generate_rust_target.rs b/scripts/generate_rust_target.rs index 0da52b548ba5..19f72bfdbb82 100644 --- a/scripts/generate_rust_target.rs +++ b/scripts/generate_rust_target.rs @@ -155,7 +155,7 @@ fn main() { "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", ); let mut features = "-3dnow,-3dnowa,-mmx,+soft-float".to_string(); - if cfg.has("RETPOLINE") { + if cfg.has("MITIGATION_RETPOLINE") { features += ",+retpoline-external-thunk"; } ts.push("features", features); |