Skip to content

Commit 9a6ddc7

Browse files
nathanchancenathanchance
committed
generator.yml: Stop enabling CONFIG_PPC_DISABLE_WERROR=y for clang-14+
Split up the ppc64 configuration into a "no -Werror" variant so that -Werror can be enabled for clang-14+. -Warray-bounds is only enabled for 5.18+, so we only need this configuration enabled for clang-13 and older on 6.1 and newer. Closes: #617 Signed-off-by: Nathan Chancellor <[email protected]>
1 parent 32a9db9 commit 9a6ddc7

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

‎generator.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,9 @@ configs:
311311
- &mips {config: [malta_defconfig, CONFIG_BLK_DEV_INITRD=y, CONFIG_CPU_BIG_ENDIAN=y], kernel_image: vmlinux, ARCH: *mips-arch, << : *kernel}
312312
- &mipsel {config: [malta_defconfig, CONFIG_BLK_DEV_INITRD=y], kernel_image: vmlinux, ARCH: *mips-arch, << : *kernel}
313313
- &ppc32 {config: ppc44x_defconfig, kernel_image: uImage, ARCH: *powerpc-arch, << : *kernel}
314-
# Disable -Werror for ppc64_guest_defconfig for now: https://github.com/ClangBuiltLinux/linux/issues/1445
315-
- &ppc64 {config: [ppc64_guest_defconfig, CONFIG_PPC_DISABLE_WERROR=y], kernel_image: vmlinux, ARCH: *powerpc-arch, << : *kernel}
314+
- &ppc64 {config: ppc64_guest_defconfig, kernel_image: vmlinux, ARCH: *powerpc-arch, << : *kernel}
315+
# Disable -Werror for ppc64_guest_defconfig for clang-13 and older: https://github.com/ClangBuiltLinux/linux/issues/1445
316+
- &ppc64_no_werror {config: [ppc64_guest_defconfig, CONFIG_PPC_DISABLE_WERROR=y], kernel_image: vmlinux, ARCH: *powerpc-arch, << : *kernel}
316317
- &ppc64le {config: powernv_defconfig, kernel_image: zImage.epapr, ARCH: *powerpc-arch, << : *kernel}
317318
# CONFIG_BPF_PRELOAD disabled for all cross compiled Fedora configs: https://github.com/ClangBuiltLinux/linux/issues/1433
318319
- &ppc64le_fedora {config: [*ppc64le-fedora-config-url, CONFIG_BPF_PRELOAD=n], kernel_image: zImage.epapr, ARCH: *powerpc-arch, << : *kernel}
@@ -2683,7 +2684,7 @@ builds:
26832684
- {<< : *mipsel, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
26842685
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
26852686
# - {<< : *ppc32, << : *mainline, << : *llvm, boot: true, << : *llvm_13}
2686-
- {<< : *ppc64, << : *mainline, << : *llvm, boot: true, << : *llvm_13}
2687+
- {<< : *ppc64_no_werror, << : *mainline, << : *llvm, boot: true, << : *llvm_13}
26872688
- {<< : *ppc64le, << : *mainline, << : *llvm, boot: true, << : *llvm_13}
26882689
- {<< : *ppc64le_fedora, << : *mainline, << : *clang, boot: true, << : *llvm_13}
26892690
- {<< : *ppc64le_suse, << : *mainline, << : *clang, boot: true, << : *llvm_13}
@@ -2743,7 +2744,7 @@ builds:
27432744
- {<< : *mipsel, << : *next, << : *llvm_full, boot: true, << : *llvm_13}
27442745
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
27452746
# - {<< : *ppc32, << : *next, << : *llvm, boot: true, << : *llvm_13}
2746-
- {<< : *ppc64, << : *next, << : *llvm, boot: true, << : *llvm_13}
2747+
- {<< : *ppc64_no_werror, << : *next, << : *llvm, boot: true, << : *llvm_13}
27472748
- {<< : *ppc64le, << : *next, << : *llvm, boot: true, << : *llvm_13}
27482749
- {<< : *ppc64le_fedora, << : *next, << : *clang, boot: true, << : *llvm_13}
27492750
- {<< : *ppc64le_suse, << : *next, << : *clang, boot: true, << : *llvm_13}
@@ -2804,7 +2805,7 @@ builds:
28042805
- {<< : *mipsel, << : *stable, << : *llvm_full, boot: true, << : *llvm_13}
28052806
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
28062807
# - {<< : *ppc32, << : *stable, << : *llvm, boot: true, << : *llvm_13}
2807-
- {<< : *ppc64, << : *stable, << : *ppc64_llvm, boot: true, << : *llvm_13}
2808+
- {<< : *ppc64_no_werror, << : *stable, << : *ppc64_llvm, boot: true, << : *llvm_13}
28082809
- {<< : *ppc64le, << : *stable, << : *llvm, boot: true, << : *llvm_13}
28092810
- {<< : *ppc64le_fedora, << : *stable, << : *clang, boot: true, << : *llvm_13}
28102811
- {<< : *ppc64le_suse, << : *stable, << : *clang, boot: true, << : *llvm_13}
@@ -2864,7 +2865,7 @@ builds:
28642865
- {<< : *mipsel, << : *stable-6_1, << : *llvm_full, boot: true, << : *llvm_13}
28652866
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
28662867
# - {<< : *ppc32, << : *stable-6_1, << : *llvm, boot: true, << : *llvm_13}
2867-
- {<< : *ppc64, << : *stable-6_1, << : *ppc64_llvm, boot: true, << : *llvm_13}
2868+
- {<< : *ppc64_no_werror, << : *stable-6_1, << : *ppc64_llvm, boot: true, << : *llvm_13}
28682869
- {<< : *ppc64le, << : *stable-6_1, << : *llvm, boot: true, << : *llvm_13}
28692870
- {<< : *ppc64le_fedora, << : *stable-6_1, << : *clang, boot: true, << : *llvm_13}
28702871
- {<< : *ppc64le_suse, << : *stable-6_1, << : *clang, boot: true, << : *llvm_13}
@@ -3111,7 +3112,7 @@ builds:
31113112
- {<< : *mipsel, << : *mainline, << : *llvm_full, boot: true, << : *llvm_12}
31123113
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
31133114
# - {<< : *ppc32, << : *mainline, << : *llvm, boot: true, << : *llvm_12}
3114-
- {<< : *ppc64, << : *mainline, << : *llvm, boot: true, << : *llvm_12}
3115+
- {<< : *ppc64_no_werror, << : *mainline, << : *llvm, boot: true, << : *llvm_12}
31153116
- {<< : *ppc64le, << : *mainline, << : *llvm, boot: true, << : *llvm_12}
31163117
- {<< : *ppc64le_fedora, << : *mainline, << : *clang, boot: true, << : *llvm_12}
31173118
- {<< : *ppc64le_suse, << : *mainline, << : *clang, boot: true, << : *llvm_12}
@@ -3170,7 +3171,7 @@ builds:
31703171
- {<< : *mipsel, << : *next, << : *llvm_full, boot: true, << : *llvm_12}
31713172
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
31723173
# - {<< : *ppc32, << : *next, << : *llvm, boot: true, << : *llvm_12}
3173-
- {<< : *ppc64, << : *next, << : *llvm, boot: true, << : *llvm_12}
3174+
- {<< : *ppc64_no_werror, << : *next, << : *llvm, boot: true, << : *llvm_12}
31743175
- {<< : *ppc64le, << : *next, << : *llvm, boot: true, << : *llvm_12}
31753176
- {<< : *ppc64le_fedora, << : *next, << : *clang, boot: true, << : *llvm_12}
31763177
- {<< : *ppc64le_suse, << : *next, << : *clang, boot: true, << : *llvm_12}
@@ -3229,7 +3230,7 @@ builds:
32293230
- {<< : *mipsel, << : *stable, << : *llvm_full, boot: true, << : *llvm_12}
32303231
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
32313232
# - {<< : *ppc32, << : *stable, << : *llvm, boot: true, << : *llvm_12}
3232-
- {<< : *ppc64, << : *stable, << : *ppc64_llvm, boot: true, << : *llvm_12}
3233+
- {<< : *ppc64_no_werror, << : *stable, << : *ppc64_llvm, boot: true, << : *llvm_12}
32333234
- {<< : *ppc64le, << : *stable, << : *llvm, boot: true, << : *llvm_12}
32343235
- {<< : *ppc64le_fedora, << : *stable, << : *clang, boot: true, << : *llvm_12}
32353236
- {<< : *ppc64le_suse, << : *stable, << : *clang, boot: true, << : *llvm_12}
@@ -3288,7 +3289,7 @@ builds:
32883289
- {<< : *mipsel, << : *stable-6_1, << : *llvm_full, boot: true, << : *llvm_12}
32893290
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
32903291
# - {<< : *ppc32, << : *stable-6_1, << : *llvm, boot: true, << : *llvm_12}
3291-
- {<< : *ppc64, << : *stable-6_1, << : *ppc64_llvm, boot: true, << : *llvm_12}
3292+
- {<< : *ppc64_no_werror, << : *stable-6_1, << : *ppc64_llvm, boot: true, << : *llvm_12}
32923293
- {<< : *ppc64le, << : *stable-6_1, << : *llvm, boot: true, << : *llvm_12}
32933294
- {<< : *ppc64le_fedora, << : *stable-6_1, << : *clang, boot: true, << : *llvm_12}
32943295
- {<< : *ppc64le_suse, << : *stable-6_1, << : *clang, boot: true, << : *llvm_12}
@@ -3496,7 +3497,7 @@ builds:
34963497
- {<< : *mipsel, << : *mainline, << : *llvm, boot: true, << : *llvm_11}
34973498
# ppc32 and ppc64: Build disabled (https://gitlab.com/Linaro/tuxmake/-/issues/108)
34983499
# - {<< : *ppc32, << : *mainline, << : *llvm, boot: true, << : *llvm_11}
3499-
# - {<< : *ppc64, << : *mainline, << : *llvm, boot: true, << : *llvm_11}
3500+
# - {<< : *ppc64_no_werror, << : *mainline, << : *llvm, boot: true, << : *llvm_11}
35003501
- {<< : *ppc64le, << : *mainline, << : *ppc64_llvm, boot: true, << : *llvm_11}
35013502
- {<< : *ppc64le_fedora, << : *mainline, << : *clang, boot: true, << : *llvm_11}
35023503
- {<< : *ppc64le_suse, << : *mainline, << : *clang, boot: true, << : *llvm_11}
@@ -3555,7 +3556,7 @@ builds:
35553556
- {<< : *mipsel, << : *next, << : *llvm, boot: true, << : *llvm_11}
35563557
# ppc32 and ppc64: Build disabled (https://gitlab.com/Linaro/tuxmake/-/issues/108)
35573558
# - {<< : *ppc32, << : *next, << : *llvm, boot: true, << : *llvm_11}
3558-
# - {<< : *ppc64, << : *next, << : *llvm, boot: true, << : *llvm_11}
3559+
# - {<< : *ppc64_no_werror, << : *next, << : *llvm, boot: true, << : *llvm_11}
35593560
- {<< : *ppc64le, << : *next, << : *ppc64_llvm, boot: true, << : *llvm_11}
35603561
- {<< : *ppc64le_fedora, << : *next, << : *clang, boot: true, << : *llvm_11}
35613562
- {<< : *ppc64le_suse, << : *next, << : *clang, boot: true, << : *llvm_11}
@@ -3614,7 +3615,7 @@ builds:
36143615
- {<< : *mipsel, << : *stable, << : *llvm, boot: true, << : *llvm_11}
36153616
# ppc32 and ppc64: Build disabled (https://gitlab.com/Linaro/tuxmake/-/issues/108)
36163617
# - {<< : *ppc32, << : *stable, << : *llvm, boot: true, << : *llvm_11}
3617-
# - {<< : *ppc64, << : *stable, << : *ppc64_llvm, boot: true, << : *llvm_11}
3618+
# - {<< : *ppc64_no_werror, << : *stable, << : *ppc64_llvm, boot: true, << : *llvm_11}
36183619
- {<< : *ppc64le, << : *stable, << : *ppc64_llvm, boot: true, << : *llvm_11}
36193620
- {<< : *ppc64le_fedora, << : *stable, << : *clang, boot: true, << : *llvm_11}
36203621
- {<< : *ppc64le_suse, << : *stable, << : *clang, boot: true, << : *llvm_11}
@@ -3673,7 +3674,7 @@ builds:
36733674
- {<< : *mipsel, << : *stable-6_1, << : *llvm, boot: true, << : *llvm_11}
36743675
# ppc32 and ppc64: Build disabled (https://gitlab.com/Linaro/tuxmake/-/issues/108)
36753676
# - {<< : *ppc32, << : *stable-6_1, << : *llvm, boot: true, << : *llvm_11}
3676-
# - {<< : *ppc64, << : *stable-6_1, << : *ppc64_llvm, boot: true, << : *llvm_11}
3677+
# - {<< : *ppc64_no_werror, << : *stable-6_1, << : *ppc64_llvm, boot: true, << : *llvm_11}
36773678
- {<< : *ppc64le, << : *stable-6_1, << : *ppc64_llvm, boot: true, << : *llvm_11}
36783679
- {<< : *ppc64le_fedora, << : *stable-6_1, << : *clang, boot: true, << : *llvm_11}
36793680
- {<< : *ppc64le_suse, << : *stable-6_1, << : *clang, boot: true, << : *llvm_11}

0 commit comments

Comments
 (0)