Skip to content

Commit 154fc41

Browse files
committed
generator.yml: Use the integrated assembler with s390 on -next
The s390 folks have updated their asm to work with the integrated assembler. Enable it for s390 builds on -next. We cannot switch to LLVM=1 because ld.lld and llvm-objcopy do not support s390: ClangBuiltLinux/linux#1524 ClangBuiltLinux/linux#1530 For now, we will just use 'CC=clang LLVM_IAS=1'. Closes: ClangBuiltLinux#363 Signed-off-by: Nathan Chancellor <[email protected]>
1 parent a6d9517 commit 154fc41

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

generator.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ tiers:
259259
- &llvm {llvm: true, llvm_ias: false, make_variables: {LLVM: 1, LLVM_IAS: 0}}
260260
- &lld {llvm: false, llvm_ias: false, make_variables: {LD: ld.lld, LLVM_IAS: 0}}
261261
- &clang {llvm: false, llvm_ias: false, make_variables: {LLVM_IAS: 0}}
262+
- &clang_ias {llvm: false, llvm_ias: true, make_variables: {LLVM_IAS: 1}}
262263
# Architecture specific tiers
263264
# ARM32 aspeed_g5_defconfig https://github.com/ClangBuiltLinux/linux/issues/732
264265
- &arm32_v6_llvm {llvm: true, llvm_ias: false, make_variables: {LD: arm-linux-gnueabihf-ld, LLVM: 1, LLVM_IAS: 0}}
@@ -376,10 +377,10 @@ builds:
376377
- {<< : *ppc64le_suse, << : *next, << : *llvm_full, boot: true, << : *llvm_tot}
377378
- {<< : *riscv, << : *next, << : *llvm_full, boot: true, << : *llvm_tot}
378379
- {<< : *riscv_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_tot}
379-
- {<< : *s390, << : *next, << : *clang, boot: true, << : *llvm_tot}
380-
- {<< : *s390_kasan, << : *next, << : *clang, boot: true, << : *llvm_tot}
381-
- {<< : *s390_fedora, << : *next, << : *clang, boot: true, << : *llvm_tot}
382-
- {<< : *s390_suse, << : *next, << : *clang, boot: true, << : *llvm_tot}
380+
- {<< : *s390, << : *next, << : *clang_ias, boot: true, << : *llvm_tot}
381+
- {<< : *s390_kasan, << : *next, << : *clang_ias, boot: true, << : *llvm_tot}
382+
- {<< : *s390_fedora, << : *next, << : *clang_ias, boot: true, << : *llvm_tot}
383+
- {<< : *s390_suse, << : *next, << : *clang_ias, boot: true, << : *llvm_tot}
383384
- {<< : *um, << : *next, << : *llvm_full, boot: true, << : *llvm_tot}
384385
- {<< : *x86_64, << : *next, << : *llvm_full, boot: true, << : *llvm_tot}
385386
- {<< : *x86_64_lto_full, << : *next, << : *llvm_full, boot: true, << : *llvm_tot}
@@ -734,10 +735,10 @@ builds:
734735
- {<< : *ppc64le_suse, << : *next, << : *llvm_full, boot: true, << : *llvm_latest}
735736
- {<< : *riscv, << : *next, << : *llvm_full, boot: true, << : *llvm_latest}
736737
- {<< : *riscv_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_latest}
737-
- {<< : *s390, << : *next, << : *clang, boot: true, << : *llvm_latest}
738-
- {<< : *s390_kasan, << : *next, << : *clang, boot: true, << : *llvm_latest}
739-
- {<< : *s390_fedora, << : *next, << : *clang, boot: true, << : *llvm_latest}
740-
- {<< : *s390_suse, << : *next, << : *clang, boot: true, << : *llvm_latest}
738+
- {<< : *s390, << : *next, << : *clang_ias, boot: true, << : *llvm_latest}
739+
- {<< : *s390_kasan, << : *next, << : *clang_ias, boot: true, << : *llvm_latest}
740+
- {<< : *s390_fedora, << : *next, << : *clang_ias, boot: true, << : *llvm_latest}
741+
- {<< : *s390_suse, << : *next, << : *clang_ias, boot: true, << : *llvm_latest}
741742
- {<< : *um, << : *next, << : *llvm_full, boot: true, << : *llvm_latest}
742743
- {<< : *x86_64, << : *next, << : *llvm_full, boot: true, << : *llvm_latest}
743744
- {<< : *x86_64_lto_full, << : *next, << : *llvm_full, boot: true, << : *llvm_latest}

0 commit comments

Comments
 (0)