Skip to content

Commit 65ed0a6

Browse files
committed
generator: yml: Disable integrated assembler for certain MIPS builds
On mainline and -next, which contain commit 56651128e2fb ("MIPS: Fix idle VS timer enqueue"), builds older than clang-nightly (21.0.0) fail with: <instantiation>:7:11: error: expected an immediate ori $26, r4k_wait_idle_size - 2 ^ <instantiation>:10:13: error: expected an immediate addiu $26, r4k_wait_exit - r4k_wait_insn + 2 ^ <instantiation>:10:29: error: expected an immediate addiu $26, r4k_wait_exit - r4k_wait_insn + 2 ^ <instantiation>:7:11: error: expected an immediate ori $26, r4k_wait_idle_size - 2 ^ <instantiation>:10:13: error: expected an immediate addiu $26, r4k_wait_exit - r4k_wait_insn + 2 ^ <instantiation>:10:29: error: expected an immediate addiu $26, r4k_wait_exit - r4k_wait_insn + 2 ^ This was fixed tangentially in LLVM main. Switch to GNU binutils to retain as much LLVM coverage as possible. Link: llvm/llvm-project@b65e094 Link: https://lore.kernel.org/[email protected]/ Signed-off-by: Nathan Chancellor <[email protected]>
1 parent 2d8dcdf commit 65ed0a6

File tree

8 files changed

+48
-32
lines changed

8 files changed

+48
-32
lines changed

generator/yml/0009-llvm-13.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@
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-
- {<< : *mips, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
41-
- {<< : *mipsel, << : *mainline, << : *llvm_full, boot: true, << : *llvm_13}
40+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
41+
- {<< : *mips, << : *mainline, << : *llvm, boot: true, << : *llvm_13}
42+
- {<< : *mipsel, << : *mainline, << : *llvm, boot: true, << : *llvm_13}
4243
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
4344
# - {<< : *ppc32, << : *mainline, << : *llvm, boot: true, << : *llvm_13}
4445
- {<< : *ppc64_no_werror, << : *mainline, << : *llvm, boot: true, << : *llvm_13}
@@ -86,8 +87,9 @@
8687
- {<< : *arm64_suse, << : *next, << : *llvm_full, boot: true, << : *llvm_13}
8788
- {<< : *hexagon, << : *next, << : *llvm_full, boot: false, << : *llvm_13}
8889
- {<< : *hexagon_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_13}
89-
- {<< : *mips, << : *next, << : *llvm_full, boot: true, << : *llvm_13}
90-
- {<< : *mipsel, << : *next, << : *llvm_full, boot: true, << : *llvm_13}
90+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
91+
- {<< : *mips, << : *next, << : *llvm, boot: true, << : *llvm_13}
92+
- {<< : *mipsel, << : *next, << : *llvm, boot: true, << : *llvm_13}
9193
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
9294
# - {<< : *ppc32, << : *next, << : *llvm, boot: true, << : *llvm_13}
9395
- {<< : *ppc64_no_werror, << : *next, << : *llvm, boot: true, << : *llvm_13}

generator/yml/0009-llvm-14.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@
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-
- {<< : *mips, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
36-
- {<< : *mipsel, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
35+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
36+
- {<< : *mips, << : *mainline, << : *llvm, boot: true, << : *llvm_14}
37+
- {<< : *mipsel, << : *mainline, << : *llvm, boot: true, << : *llvm_14}
3738
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
3839
# - {<< : *ppc32, << : *mainline, << : *llvm, boot: true, << : *llvm_14}
3940
- {<< : *ppc64, << : *mainline, << : *llvm_full, boot: true, << : *llvm_14}
@@ -78,8 +79,9 @@
7879
- {<< : *arm64_suse, << : *next, << : *llvm_full, boot: true, << : *llvm_14}
7980
- {<< : *hexagon, << : *next, << : *llvm_full, boot: false, << : *llvm_14}
8081
- {<< : *hexagon_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_14}
81-
- {<< : *mips, << : *next, << : *llvm_full, boot: true, << : *llvm_14}
82-
- {<< : *mipsel, << : *next, << : *llvm_full, boot: true, << : *llvm_14}
82+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
83+
- {<< : *mips, << : *next, << : *llvm, boot: true, << : *llvm_14}
84+
- {<< : *mipsel, << : *next, << : *llvm, boot: true, << : *llvm_14}
8385
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
8486
# - {<< : *ppc32, << : *next, << : *llvm, boot: true, << : *llvm_14}
8587
- {<< : *ppc64, << : *next, << : *llvm_full, boot: true, << : *llvm_14}

generator/yml/0009-llvm-15.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@
3535
- {<< : *hexagon_allmod, << : *mainline, << : *llvm_full, boot: false, << : *llvm_15}
3636
- {<< : *i386, << : *mainline, << : *llvm_full, boot: true, << : *llvm_15}
3737
- {<< : *i386_suse, << : *mainline, << : *llvm_full, boot: false, << : *llvm_15}
38-
- {<< : *mips, << : *mainline, << : *llvm_full, boot: true, << : *llvm_15}
39-
- {<< : *mipsel, << : *mainline, << : *llvm_full, boot: true, << : *llvm_15}
38+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
39+
- {<< : *mips, << : *mainline, << : *llvm, boot: true, << : *llvm_15}
40+
- {<< : *mipsel, << : *mainline, << : *llvm, boot: true, << : *llvm_15}
4041
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
4142
# - {<< : *ppc32, << : *mainline, << : *llvm, boot: true, << : *llvm_15}
4243
- {<< : *ppc64, << : *mainline, << : *llvm_full, boot: true, << : *llvm_15}
@@ -103,8 +104,9 @@
103104
- {<< : *hexagon_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_15}
104105
- {<< : *i386, << : *next, << : *llvm_full, boot: true, << : *llvm_15}
105106
- {<< : *i386_suse, << : *next, << : *llvm_full, boot: false, << : *llvm_15}
106-
- {<< : *mips, << : *next, << : *llvm_full, boot: true, << : *llvm_15}
107-
- {<< : *mipsel, << : *next, << : *llvm_full, boot: true, << : *llvm_15}
107+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
108+
- {<< : *mips, << : *next, << : *llvm, boot: true, << : *llvm_15}
109+
- {<< : *mipsel, << : *next, << : *llvm, boot: true, << : *llvm_15}
108110
# ppc32: Build disabled (https://github.com/ClangBuiltLinux/linux/issues/1679)
109111
# - {<< : *ppc32, << : *next, << : *llvm, boot: true, << : *llvm_15}
110112
- {<< : *ppc64, << : *next, << : *llvm_full, boot: true, << : *llvm_15}

generator/yml/0009-llvm-16.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@
3939
- {<< : *hexagon_allmod, << : *mainline, << : *llvm_full, boot: false, << : *llvm_16}
4040
- {<< : *i386, << : *mainline, << : *llvm_full, boot: true, << : *llvm_16}
4141
- {<< : *i386_suse, << : *mainline, << : *llvm_full, boot: false, << : *llvm_16}
42-
- {<< : *mips, << : *mainline, << : *llvm_full, boot: true, << : *llvm_16}
43-
- {<< : *mipsel, << : *mainline, << : *llvm_full, boot: true, << : *llvm_16}
42+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
43+
- {<< : *mips, << : *mainline, << : *llvm, boot: true, << : *llvm_16}
44+
- {<< : *mipsel, << : *mainline, << : *llvm, boot: true, << : *llvm_16}
4445
# ppc32: Boot disabled (https://github.com/ClangBuiltLinux/linux/issues/1814)
4546
- {<< : *ppc32, << : *mainline, << : *llvm, boot: false, << : *llvm_16}
4647
- {<< : *ppc64, << : *mainline, << : *llvm_full, boot: true, << : *llvm_16}
@@ -113,8 +114,9 @@
113114
- {<< : *hexagon_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_16}
114115
- {<< : *i386, << : *next, << : *llvm_full, boot: true, << : *llvm_16}
115116
- {<< : *i386_suse, << : *next, << : *llvm_full, boot: false, << : *llvm_16}
116-
- {<< : *mips, << : *next, << : *llvm_full, boot: true, << : *llvm_16}
117-
- {<< : *mipsel, << : *next, << : *llvm_full, boot: true, << : *llvm_16}
117+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
118+
- {<< : *mips, << : *next, << : *llvm, boot: true, << : *llvm_16}
119+
- {<< : *mipsel, << : *next, << : *llvm, boot: true, << : *llvm_16}
118120
# ppc32: Boot disabled (https://github.com/ClangBuiltLinux/linux/issues/1814)
119121
- {<< : *ppc32, << : *next, << : *llvm, boot: false, << : *llvm_16}
120122
- {<< : *ppc64, << : *next, << : *llvm_full, boot: true, << : *llvm_16}

generator/yml/0009-llvm-17.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@
4040
- {<< : *hexagon_allmod, << : *mainline, << : *llvm_full, boot: false, << : *llvm_17}
4141
- {<< : *i386, << : *mainline, << : *llvm_full, boot: true, << : *llvm_17}
4242
- {<< : *i386_suse, << : *mainline, << : *llvm_full, boot: false, << : *llvm_17}
43-
- {<< : *mips, << : *mainline, << : *llvm_full, boot: true, << : *llvm_17}
44-
- {<< : *mipsel, << : *mainline, << : *llvm_full, boot: true, << : *llvm_17}
43+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
44+
- {<< : *mips, << : *mainline, << : *llvm, boot: true, << : *llvm_17}
45+
- {<< : *mipsel, << : *mainline, << : *llvm, boot: true, << : *llvm_17}
4546
# ppc32: Boot disabled (https://github.com/ClangBuiltLinux/linux/issues/1814)
4647
- {<< : *ppc32, << : *mainline, << : *llvm, boot: false, << : *llvm_17}
4748
- {<< : *ppc64, << : *mainline, << : *llvm_full, boot: true, << : *llvm_17}
@@ -117,8 +118,9 @@
117118
- {<< : *hexagon_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_17}
118119
- {<< : *i386, << : *next, << : *llvm_full, boot: true, << : *llvm_17}
119120
- {<< : *i386_suse, << : *next, << : *llvm_full, boot: false, << : *llvm_17}
120-
- {<< : *mips, << : *next, << : *llvm_full, boot: true, << : *llvm_17}
121-
- {<< : *mipsel, << : *next, << : *llvm_full, boot: true, << : *llvm_17}
121+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
122+
- {<< : *mips, << : *next, << : *llvm, boot: true, << : *llvm_17}
123+
- {<< : *mipsel, << : *next, << : *llvm, boot: true, << : *llvm_17}
122124
# ppc32: Boot disabled (https://github.com/ClangBuiltLinux/linux/issues/1814)
123125
- {<< : *ppc32, << : *next, << : *llvm, boot: false, << : *llvm_17}
124126
- {<< : *ppc64, << : *next, << : *llvm_full, boot: true, << : *llvm_17}

generator/yml/0009-llvm-18.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@
4545
- {<< : *loong_lto_thin, << : *mainline, << : *llvm_full, boot: true, << : *llvm_18}
4646
- {<< : *loong_allmod, << : *mainline, << : *llvm_full, boot: false, << : *llvm_18}
4747
- {<< : *loong_allmod_lto, << : *mainline, << : *llvm_full, boot: false, << : *llvm_18}
48-
- {<< : *mips, << : *mainline, << : *llvm_full, boot: true, << : *llvm_18}
49-
- {<< : *mipsel, << : *mainline, << : *llvm_full, boot: true, << : *llvm_18}
48+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
49+
- {<< : *mips, << : *mainline, << : *llvm, boot: true, << : *llvm_18}
50+
- {<< : *mipsel, << : *mainline, << : *llvm, boot: true, << : *llvm_18}
5051
# ppc32: Boot disabled (https://github.com/ClangBuiltLinux/linux/issues/1814)
5152
- {<< : *ppc32, << : *mainline, << : *llvm, boot: false, << : *llvm_18}
5253
- {<< : *ppc64, << : *mainline, << : *llvm_full, boot: true, << : *llvm_18}
@@ -128,8 +129,9 @@
128129
- {<< : *loong_lto_thin, << : *next, << : *llvm_full, boot: true, << : *llvm_18}
129130
- {<< : *loong_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_18}
130131
- {<< : *loong_allmod_lto, << : *next, << : *llvm_full, boot: false, << : *llvm_18}
131-
- {<< : *mips, << : *next, << : *llvm_full, boot: true, << : *llvm_18}
132-
- {<< : *mipsel, << : *next, << : *llvm_full, boot: true, << : *llvm_18}
132+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
133+
- {<< : *mips, << : *next, << : *llvm, boot: true, << : *llvm_18}
134+
- {<< : *mipsel, << : *next, << : *llvm, boot: true, << : *llvm_18}
133135
# ppc32: Boot disabled (https://github.com/ClangBuiltLinux/linux/issues/1814)
134136
- {<< : *ppc32, << : *next, << : *llvm, boot: false, << : *llvm_18}
135137
- {<< : *ppc64, << : *next, << : *llvm_full, boot: true, << : *llvm_18}

generator/yml/0009-llvm-19.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@
4545
- {<< : *loong_lto_thin, << : *mainline, << : *llvm_full, boot: true, << : *llvm_19}
4646
- {<< : *loong_allmod, << : *mainline, << : *llvm_full, boot: false, << : *llvm_19}
4747
- {<< : *loong_allmod_lto, << : *mainline, << : *llvm_full, boot: false, << : *llvm_19}
48-
- {<< : *mips, << : *mainline, << : *llvm_full, boot: true, << : *llvm_19}
49-
- {<< : *mipsel, << : *mainline, << : *llvm_full, boot: true, << : *llvm_19}
48+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
49+
- {<< : *mips, << : *mainline, << : *llvm, boot: true, << : *llvm_19}
50+
- {<< : *mipsel, << : *mainline, << : *llvm, boot: true, << : *llvm_19}
5051
# ppc32: Boot disabled (https://github.com/ClangBuiltLinux/linux/issues/1814)
5152
- {<< : *ppc32, << : *mainline, << : *llvm, boot: false, << : *llvm_19}
5253
- {<< : *ppc64, << : *mainline, << : *llvm_full, boot: true, << : *llvm_19}
@@ -128,8 +129,9 @@
128129
- {<< : *loong_lto_thin, << : *next, << : *llvm_full, boot: true, << : *llvm_19}
129130
- {<< : *loong_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_19}
130131
- {<< : *loong_allmod_lto, << : *next, << : *llvm_full, boot: false, << : *llvm_19}
131-
- {<< : *mips, << : *next, << : *llvm_full, boot: true, << : *llvm_19}
132-
- {<< : *mipsel, << : *next, << : *llvm_full, boot: true, << : *llvm_19}
132+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
133+
- {<< : *mips, << : *next, << : *llvm, boot: true, << : *llvm_19}
134+
- {<< : *mipsel, << : *next, << : *llvm, boot: true, << : *llvm_19}
133135
# ppc32: Boot disabled (https://github.com/ClangBuiltLinux/linux/issues/1814)
134136
- {<< : *ppc32, << : *next, << : *llvm, boot: false, << : *llvm_19}
135137
- {<< : *ppc64, << : *next, << : *llvm_full, boot: true, << : *llvm_19}

generator/yml/0009-llvm-latest.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@
4545
- {<< : *loong_lto_thin, << : *mainline, << : *llvm_full, boot: true, << : *llvm_latest}
4646
- {<< : *loong_allmod, << : *mainline, << : *llvm_full, boot: false, << : *llvm_latest}
4747
- {<< : *loong_allmod_lto, << : *mainline, << : *llvm_full, boot: false, << : *llvm_latest}
48-
- {<< : *mips, << : *mainline, << : *llvm_full, boot: true, << : *llvm_latest}
49-
- {<< : *mipsel, << : *mainline, << : *llvm_full, boot: true, << : *llvm_latest}
48+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
49+
- {<< : *mips, << : *mainline, << : *llvm, boot: true, << : *llvm_latest}
50+
- {<< : *mipsel, << : *mainline, << : *llvm, boot: true, << : *llvm_latest}
5051
# ppc32: Boot disabled (https://github.com/ClangBuiltLinux/linux/issues/1814)
5152
- {<< : *ppc32, << : *mainline, << : *llvm, boot: false, << : *llvm_latest}
5253
- {<< : *ppc64, << : *mainline, << : *llvm_full, boot: true, << : *llvm_latest}
@@ -129,8 +130,9 @@
129130
- {<< : *loong_lto_thin, << : *next, << : *llvm_full, boot: true, << : *llvm_latest}
130131
- {<< : *loong_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_latest}
131132
- {<< : *loong_allmod_lto, << : *next, << : *llvm_full, boot: false, << : *llvm_latest}
132-
- {<< : *mips, << : *next, << : *llvm_full, boot: true, << : *llvm_latest}
133-
- {<< : *mipsel, << : *next, << : *llvm_full, boot: true, << : *llvm_latest}
133+
# mips with the integrated assembler does not work after 56651128e2fb ("MIPS: Fix idle VS timer enqueue")
134+
- {<< : *mips, << : *next, << : *llvm, boot: true, << : *llvm_latest}
135+
- {<< : *mipsel, << : *next, << : *llvm, boot: true, << : *llvm_latest}
134136
# ppc32: Boot disabled (https://github.com/ClangBuiltLinux/linux/issues/1814)
135137
- {<< : *ppc32, << : *next, << : *llvm, boot: false, << : *llvm_latest}
136138
- {<< : *ppc64, << : *next, << : *llvm_full, boot: true, << : *llvm_latest}

0 commit comments

Comments
 (0)