| Message ID | 20220513202159.1550547-2-samitolvanen@google.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | KCFI support | expand |
On Fri, May 13, 2022 at 01:21:39PM -0700, Sami Tolvanen wrote: > Explicitly filter out CC_FLAGS_CFI in preparation for the flags being > removed from CC_FLAGS_LTO. > > Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Is it worth merging all the "existing" CC_FLAGS_LTO/CFI splits into a single patch? Either way: Reviewed-by: Kees Cook <keescook@chromium.org>
On Sat, May 14, 2022 at 2:42 PM Kees Cook <keescook@chromium.org> wrote: > > On Fri, May 13, 2022 at 01:21:39PM -0700, Sami Tolvanen wrote: > > Explicitly filter out CC_FLAGS_CFI in preparation for the flags being > > removed from CC_FLAGS_LTO. > > > > Signed-off-by: Sami Tolvanen <samitolvanen@google.com> > > Is it worth merging all the "existing" CC_FLAGS_LTO/CFI splits into a > single patch? Either way: Sure, I can merge them in the next version. Sami
diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile index d0537573501e..234fb2910622 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -39,6 +39,8 @@ KBUILD_CFLAGS := $(cflags-y) -Os -DDISABLE_BRANCH_PROFILING \ # remove SCS flags from all objects in this directory KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS), $(KBUILD_CFLAGS)) +# disable CFI +KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_CFI), $(KBUILD_CFLAGS)) # disable LTO KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_LTO), $(KBUILD_CFLAGS))
Explicitly filter out CC_FLAGS_CFI in preparation for the flags being removed from CC_FLAGS_LTO. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> --- drivers/firmware/efi/libstub/Makefile | 2 ++ 1 file changed, 2 insertions(+)