Skip to content

Commit a72ab03

Browse files
samitolvanenpalmer-dabbelt
authored andcommitted
riscv/purgatory: Disable CFI
Filter out CC_FLAGS_CFI when CONFIG_CFI_CLANG. Reviewed-by: Kees Cook <keescook@chromium.org> Tested-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Link: https://lore.kernel.org/r/20230710183544.999540-13-samitolvanen@google.com Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent af0ead4 commit a72ab03

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/riscv/purgatory/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ ifdef CONFIG_STACKPROTECTOR_STRONG
7777
PURGATORY_CFLAGS_REMOVE += -fstack-protector-strong
7878
endif
7979

80+
ifdef CONFIG_CFI_CLANG
81+
PURGATORY_CFLAGS_REMOVE += $(CC_FLAGS_CFI)
82+
endif
83+
8084
CFLAGS_REMOVE_purgatory.o += $(PURGATORY_CFLAGS_REMOVE)
8185
CFLAGS_purgatory.o += $(PURGATORY_CFLAGS)
8286

0 commit comments

Comments
 (0)