diff options
| author | Linus Torvalds | 2019-05-13 16:01:52 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2019-05-13 16:01:52 -0700 |
| commit | 63863ee8e2f6f6ae47be3dff4af2f2806f5ca2dd (patch) | |
| tree | 0552b0884ef1848e01959e3d9d262028536d90b2 /scripts | |
| parent | fbcde197e1befae4228715edf1288c7646808b8b (diff) | |
| parent | 259799ea5a9aa099a267f3b99e1f7078bbaf5c5e (diff) | |
Merge tag 'gcc-plugins-v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull gcc plugin fix from Kees Cook:
"Fix ARM stack-protector-per-task plugin build for older GCC < 6 (Chris
Packham)"
* tag 'gcc-plugins-v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/kees/linux:
gcc-plugins: arm_ssp_per_task_plugin: Fix for older GCC < 6
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/gcc-plugins/arm_ssp_per_task_plugin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/gcc-plugins/arm_ssp_per_task_plugin.c b/scripts/gcc-plugins/arm_ssp_per_task_plugin.c index 89c47f57d1ce..8c1af9bdcb1b 100644 --- a/scripts/gcc-plugins/arm_ssp_per_task_plugin.c +++ b/scripts/gcc-plugins/arm_ssp_per_task_plugin.c @@ -36,7 +36,7 @@ static unsigned int arm_pertask_ssp_rtl_execute(void) mask = GEN_INT(sext_hwi(sp_mask, GET_MODE_PRECISION(Pmode))); masked_sp = gen_reg_rtx(Pmode); - emit_insn_before(gen_rtx_SET(masked_sp, + emit_insn_before(gen_rtx_set(masked_sp, gen_rtx_AND(Pmode, stack_pointer_rtx, mask)), |