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

Linus Torvalds committed 7 years ago

Commit 63863ee2 parents fbcde19 259799e1 file · +1 −1Browse files

Unified · Split

scripts/gcc-plugins/arm_ssp_per_task_plugin.c+1−1

@@ -36,7 +36,7 @@ static unsigned int arm_pertask_ssp_rtl_execute(void) · 35 unmodified lines
36	36	mask = GEN_INT(sext_hwi(sp_mask, GET_MODE_PRECISION(Pmode)));
37	37	masked_sp = gen_reg_rtx(Pmode);
38	38
39		− emit_insn_before(gen_rtx_SET(masked_sp,
	39	+ emit_insn_before(gen_rtx_set(masked_sp,
40	40	gen_rtx_AND(Pmode,
41	41	stack_pointer_rtx,
42	42	mask)),