Skip to content

Commit 9c43c6a

Browse files
nathanchancenathanchance
committed
generator: Apply 3d9c49a to mainline trees
The change that prompted 3d9c49a is now in mainline so disable x86 builds on mainline and android-mainline with LLVM 13 and 14. Signed-off-by: Nathan Chancellor <[email protected]>
1 parent e49ae58 commit 9c43c6a

File tree

2 files changed

+0
-34
lines changed

2 files changed

+0
-34
lines changed

‎generator/yml/0009-llvm-13.yml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
- {<< : *arm64_suse, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
3838
- {<< : *hexagon, << : *mainline, << : *llvm_full, boot: false, << : *llvm_13}
3939
- {<< : *hexagon_allmod, << : *mainline, << : *llvm_full, boot: false, << : *llvm_13}
40-
- {<< : *i386, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
41-
- {<< : *i386_suse, << : *mainline, << : *llvm_full, boot: false, << : *llvm_13}
4240
- {<< : *mips, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
4341
- {<< : *mipsel, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
4442
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
@@ -52,20 +50,6 @@
5250
- {<< : *riscv_alpine, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
5351
- {<< : *riscv_suse, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
5452
- {<< : *um, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
55-
- {<< : *x86_64, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
56-
- {<< : *x86_64_lto_full, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
57-
- {<< : *x86_64_lto_thin, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
58-
- {<< : *x86_64_kasan, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
59-
- {<< : *x86_64_kcsan, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
60-
- {<< : *x86_64_ubsan, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
61-
- {<< : *x86_64_allmod, << : *mainline, << : *llvm_full, boot: false, << : *llvm_13}
62-
- {<< : *x86_64_allmod_lto, << : *mainline, << : *llvm_full, boot: false, << : *llvm_13}
63-
- {<< : *x86_64_allno, << : *mainline, << : *llvm_full, boot: false, << : *llvm_13}
64-
- {<< : *x86_64_allyes, << : *mainline, << : *llvm_full, boot: false, << : *llvm_13}
65-
- {<< : *x86_64_alpine, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
66-
- {<< : *x86_64_arch, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
67-
- {<< : *x86_64_fedora, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
68-
- {<< : *x86_64_suse, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
6953
##########
7054
# Next #
7155
##########
@@ -465,7 +449,6 @@
465449
# - {<< : *arm32_allmod, << : *android-mainline, << : *llvm_full, boot: false, << : *llvm_13}
466450
- {<< : *arm32_v7_t, << : *android-mainline, << : *llvm_full, boot: true, << : *llvm_13}
467451
- {<< : *arm64_gki, << : *android-mainline, << : *llvm_full, boot: true, << : *llvm_13}
468-
- {<< : *x86_64_gki, << : *android-mainline, << : *llvm_full, boot: true, << : *llvm_13}
469452
- {<< : *arm32_allmod, << : *android15-6_6, << : *llvm_full, boot: false, << : *llvm_13}
470453
- {<< : *arm32_v7_t, << : *android15-6_6, << : *llvm_full, boot: true, << : *llvm_13}
471454
- {<< : *arm64_gki, << : *android15-6_6, << : *llvm_full, boot: true, << : *llvm_13}

‎generator/yml/0009-llvm-14.yml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
- {<< : *arm64_suse, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
3333
- {<< : *hexagon, << : *mainline, << : *llvm_full, boot: false, << : *llvm_14}
3434
- {<< : *hexagon_allmod, << : *mainline, << : *llvm_full, boot: false, << : *llvm_14}
35-
- {<< : *i386, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
36-
- {<< : *i386_suse, << : *mainline, << : *llvm_full, boot: false, << : *llvm_14}
3735
- {<< : *mips, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
3836
- {<< : *mipsel, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
3937
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
@@ -50,20 +48,6 @@
5048
- {<< : *riscv_alpine, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
5149
- {<< : *riscv_suse, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
5250
- {<< : *um, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
53-
- {<< : *x86_64, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
54-
- {<< : *x86_64_lto_full, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
55-
- {<< : *x86_64_lto_thin, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
56-
- {<< : *x86_64_kasan, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
57-
- {<< : *x86_64_kcsan, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
58-
- {<< : *x86_64_ubsan, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
59-
- {<< : *x86_64_allmod, << : *mainline, << : *llvm_full, boot: false, << : *llvm_14}
60-
- {<< : *x86_64_allmod_lto, << : *mainline, << : *llvm_full, boot: false, << : *llvm_14}
61-
- {<< : *x86_64_allno, << : *mainline, << : *llvm_full, boot: false, << : *llvm_14}
62-
- {<< : *x86_64_allyes, << : *mainline, << : *llvm_full, boot: false, << : *llvm_14}
63-
- {<< : *x86_64_alpine, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
64-
- {<< : *x86_64_arch, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
65-
- {<< : *x86_64_fedora, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
66-
- {<< : *x86_64_suse, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
6751
##########
6852
# Next #
6953
##########
@@ -458,7 +442,6 @@
458442
- {<< : *arm32_allmod, << : *android-mainline, << : *llvm_full, boot: false, << : *llvm_14}
459443
- {<< : *arm32_v7_t, << : *android-mainline, << : *llvm_full, boot: true, << : *llvm_14}
460444
- {<< : *arm64_gki, << : *android-mainline, << : *llvm_full, boot: true, << : *llvm_14}
461-
- {<< : *x86_64_gki, << : *android-mainline, << : *llvm_full, boot: true, << : *llvm_14}
462445
- {<< : *arm32_allmod, << : *android15-6_6, << : *llvm_full, boot: false, << : *llvm_14}
463446
- {<< : *arm32_v7_t, << : *android15-6_6, << : *llvm_full, boot: true, << : *llvm_14}
464447
- {<< : *arm64_gki, << : *android15-6_6, << : *llvm_full, boot: true, << : *llvm_14}

0 commit comments

Comments
 (0)