Skip to content

Commit 685969e

Browse files
committed
kbuild: remove cc-option test of -ffreestanding
Some Makefiles already pass -ffreestanding unconditionally. For example, arch/arm64/lib/Makefile, arch/x86/purgatory/Makefile. No problem report so far about hard-coding this option. So, we can assume all supported compilers know -ffreestanding. I confirmed GCC 4.8 and Clang manuals document this option. Get rid of cc-option from -ffreestanding. Signed-off-by: Masahiro Yamada <[email protected]> Reviewed-by: Nick Desaulniers <[email protected]> Reviewed-by: Kees Cook <[email protected]> Acked-by: Ard Biesheuvel <[email protected]>
1 parent 893ab00 commit 685969e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

arch/s390/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2
2727
KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY
2828
KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float
2929
KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables
30-
KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-option,-ffreestanding)
30+
KBUILD_CFLAGS_DECOMPRESSOR += -ffreestanding
3131
KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, address-of-packed-member)
3232
KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g)
3333
KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))

arch/x86/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ REALMODE_CFLAGS := $(M16_CFLAGS) -g -Os -DDISABLE_BRANCH_PROFILING \
3636
-fno-strict-aliasing -fomit-frame-pointer -fno-pic \
3737
-mno-mmx -mno-sse
3838

39-
REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -ffreestanding)
39+
REALMODE_CFLAGS += -ffreestanding
4040
REALMODE_CFLAGS += -fno-stack-protector
4141
REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -Wno-address-of-packed-member)
4242
REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), $(cc_stack_align4))

arch/x86/boot/compressed/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ cflags-$(CONFIG_X86_32) := -march=i386
3535
cflags-$(CONFIG_X86_64) := -mcmodel=small
3636
KBUILD_CFLAGS += $(cflags-y)
3737
KBUILD_CFLAGS += -mno-mmx -mno-sse
38-
KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
38+
KBUILD_CFLAGS += -ffreestanding
3939
KBUILD_CFLAGS += -fno-stack-protector
4040
KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
4141
KBUILD_CFLAGS += $(call cc-disable-warning, gnu)

drivers/firmware/efi/libstub/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ cflags-$(CONFIG_EFI_GENERIC_STUB) += -I$(srctree)/scripts/dtc/libfdt
2929
KBUILD_CFLAGS := $(cflags-y) -Os -DDISABLE_BRANCH_PROFILING \
3030
-include $(srctree)/drivers/firmware/efi/libstub/hidden.h \
3131
-D__NO_FORTIFY \
32-
$(call cc-option,-ffreestanding) \
32+
-ffreestanding \
3333
-fno-stack-protector \
3434
$(call cc-option,-fno-addrsig) \
3535
-D__DISABLE_EXPORTS

0 commit comments

Comments
 (0)