Skip to content

Commit 7fa6a27

Browse files
nathanchancemasahir0y
authored andcommitted
x86/build: Do not add -falign flags unconditionally for clang
clang does not support -falign-jumps and only recently gained support for -falign-loops. When one of the configuration options that adds these flags is enabled, clang warns and all cc-{disable-warning,option} that follow fail because -Werror gets added to test for the presence of this warning: clang-14: warning: optimization flag '-falign-jumps=0' is not supported [-Wignored-optimization-argument] To resolve this, add a couple of cc-option calls when building with clang; gcc has supported these options since 3.2 so there is no point in testing for their support. -falign-functions was implemented in clang-7, -falign-loops was implemented in clang-14, and -falign-jumps has not been implemented yet. Link: https://lore.kernel.org/r/[email protected]/ Link: https://lore.kernel.org/r/[email protected]/ Reported-by: kernel test robot <[email protected]> Reviewed-by: Nick Desaulniers <[email protected]> Acked-by: Borislav Petkov <[email protected]> Signed-off-by: Nathan Chancellor <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]>
1 parent 7c80144 commit 7fa6a27

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

arch/x86/Makefile_32.cpu

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44

55
tune = $(call cc-option,-mtune=$(1),$(2))
66

7+
ifdef CONFIG_CC_IS_CLANG
8+
align := -falign-functions=0 $(call cc-option,-falign-jumps=0) $(call cc-option,-falign-loops=0)
9+
else
10+
align := -falign-functions=0 -falign-jumps=0 -falign-loops=0
11+
endif
12+
713
cflags-$(CONFIG_M486SX) += -march=i486
814
cflags-$(CONFIG_M486) += -march=i486
915
cflags-$(CONFIG_M586) += -march=i586
@@ -19,11 +25,11 @@ cflags-$(CONFIG_MK6) += -march=k6
1925
# They make zero difference whatsosever to performance at this time.
2026
cflags-$(CONFIG_MK7) += -march=athlon
2127
cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8,-march=athlon)
22-
cflags-$(CONFIG_MCRUSOE) += -march=i686 -falign-functions=0 -falign-jumps=0 -falign-loops=0
23-
cflags-$(CONFIG_MEFFICEON) += -march=i686 $(call tune,pentium3) -falign-functions=0 -falign-jumps=0 -falign-loops=0
28+
cflags-$(CONFIG_MCRUSOE) += -march=i686 $(align)
29+
cflags-$(CONFIG_MEFFICEON) += -march=i686 $(call tune,pentium3) $(align)
2430
cflags-$(CONFIG_MWINCHIPC6) += $(call cc-option,-march=winchip-c6,-march=i586)
2531
cflags-$(CONFIG_MWINCHIP3D) += $(call cc-option,-march=winchip2,-march=i586)
26-
cflags-$(CONFIG_MCYRIXIII) += $(call cc-option,-march=c3,-march=i486) -falign-functions=0 -falign-jumps=0 -falign-loops=0
32+
cflags-$(CONFIG_MCYRIXIII) += $(call cc-option,-march=c3,-march=i486) $(align)
2733
cflags-$(CONFIG_MVIAC3_2) += $(call cc-option,-march=c3-2,-march=i686)
2834
cflags-$(CONFIG_MVIAC7) += -march=i686
2935
cflags-$(CONFIG_MCORE2) += -march=i686 $(call tune,core2)

0 commit comments

Comments
 (0)