Skip to content

Commit f5956d3

Browse files
nathanchancenathanchance
committed
generator: yml: Handle CONFIG_CFI_CLANG → CONFIG_CFI
Commit 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI") is in -next and mainline so these builds need to be adjusted to keep kCFI enabled. Change the old builds so that new builds inherit the new configuration through copying. Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent 75e61db commit f5956d3

12 files changed

+147
-142
lines changed

‎generator/yml/0007-configs.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ configs:
1414
- &arm32_v6 {config: aspeed_g5_defconfig, ARCH: *arm-arch, << : *kernel_dtbs}
1515
- &arm32_v7 {config: multi_v7_defconfig, ARCH: *arm-arch, << : *kernel}
1616
- &arm32_v7_t {config: [multi_v7_defconfig, CONFIG_THUMB2_KERNEL=y], ARCH: *arm-arch, << : *kernel}
17-
- &arm32_cfi {config: [multi_v7_defconfig, CONFIG_CFI_CLANG=y], ARCH: *arm-arch, << : *kernel}
17+
- &arm32_cfi {config: [multi_v7_defconfig, CONFIG_CFI=y], ARCH: *arm-arch, << : *kernel}
18+
- &arm32_cfi_cl {config: [multi_v7_defconfig, CONFIG_CFI_CLANG=y], ARCH: *arm-arch, << : *kernel}
1819
- &arm32_imx {config: imx_v4_v5_defconfig, ARCH: *arm-arch, << : *default}
1920
- &arm32_omap {config: omap2plus_defconfig, ARCH: *arm-arch, << : *default}
2021
- &arm32_lpae_fp {config: [multi_v7_defconfig, CONFIG_ARM_LPAE=y, CONFIG_UNWINDER_FRAME_POINTER=y], ARCH: *arm-arch, << : *kernel}
@@ -29,8 +30,10 @@ configs:
2930
- &arm64be {config: [defconfig, CONFIG_CPU_BIG_ENDIAN=y], ARCH: *arm64-arch, << : *kernel}
3031
- &arm64_lto_full {config: [defconfig, CONFIG_LTO_CLANG_FULL=y], ARCH: *arm64-arch, << : *kernel}
3132
- &arm64_lto_thin {config: [defconfig, CONFIG_LTO_CLANG_THIN=y], ARCH: *arm64-arch, << : *kernel}
32-
- &arm64_cfi {config: [defconfig, CONFIG_CFI_CLANG=y], ARCH: *arm64-arch, << : *kernel}
33-
- &arm64_cfi_lto {config: [defconfig, CONFIG_CFI_CLANG=y, CONFIG_LTO_CLANG_THIN=y], ARCH: *arm64-arch, << : *kernel}
33+
- &arm64_cfi {config: [defconfig, CONFIG_CFI=y], ARCH: *arm64-arch, << : *kernel}
34+
- &arm64_cfi_cl {config: [defconfig, CONFIG_CFI_CLANG=y], ARCH: *arm64-arch, << : *kernel}
35+
- &arm64_cfi_lto {config: [defconfig, CONFIG_CFI=y, CONFIG_LTO_CLANG_THIN=y], ARCH: *arm64-arch, << : *kernel}
36+
- &arm64_cfi_cl_lto {config: [defconfig, CONFIG_CFI_CLANG=y, CONFIG_LTO_CLANG_THIN=y], ARCH: *arm64-arch, << : *kernel}
3437
- &arm64_kasan {<< : *arm64-kasan-configs, ARCH: *arm64-arch, << : *kernel}
3538
- &arm64_kasan_sw {<< : *arm64-kasan-sw-configs, ARCH: *arm64-arch, << : *kernel}
3639
- &arm64_ubsan {config: [defconfig, CONFIG_UBSAN=y], ARCH: *arm64-arch, << : *kernel}
@@ -94,8 +97,10 @@ configs:
9497
- &x86_64 {config: defconfig, << : *kernel}
9598
- &x86_64_lto_full {config: [defconfig, CONFIG_LTO_CLANG_FULL=y], << : *kernel}
9699
- &x86_64_lto_thin {config: [defconfig, CONFIG_LTO_CLANG_THIN=y], << : *kernel}
97-
- &x86_64_cfi {config: [defconfig, CONFIG_CFI_CLANG=y], << : *kernel}
98-
- &x86_64_cfi_lto {config: [defconfig, CONFIG_CFI_CLANG=y, CONFIG_LTO_CLANG_THIN=y], << : *kernel}
100+
- &x86_64_cfi {config: [defconfig, CONFIG_CFI=y], << : *kernel}
101+
- &x86_64_cfi_cl {config: [defconfig, CONFIG_CFI_CLANG=y], << : *kernel}
102+
- &x86_64_cfi_lto {config: [defconfig, CONFIG_CFI=y, CONFIG_LTO_CLANG_THIN=y], << : *kernel}
103+
- &x86_64_cfi_cl_lto {config: [defconfig, CONFIG_CFI_CLANG=y, CONFIG_LTO_CLANG_THIN=y], << : *kernel}
99104
- &x86_64_gki {config: gki_defconfig, << : *kernel}
100105
- &x86_64_cut {config: x86_64_cuttlefish_defconfig, << : *kernel}
101106
- &x86_64_allmod {config: allmodconfig, << : *default}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
- {<< : *arm64, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_12}
141141
- {<< : *arm64_lto_full, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_12}
142142
- {<< : *arm64_lto_thin, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_12}
143-
- {<< : *arm64_cfi_lto, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_12}
143+
- {<< : *arm64_cfi_cl_lto, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_12}
144144
- {<< : *arm64_kasan, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_12}
145145
- {<< : *arm64_kasan_sw, << : *stable-5_15, << : *llvm_full, boot: false, << : *llvm_12}
146146
- {<< : *arm64_ubsan, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_12}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@
296296
- {<< : *arm64, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_13}
297297
- {<< : *arm64_lto_full, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_13}
298298
- {<< : *arm64_lto_thin, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_13}
299-
- {<< : *arm64_cfi_lto, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_13}
299+
- {<< : *arm64_cfi_cl_lto, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_13}
300300
- {<< : *arm64_kasan, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_13}
301301
- {<< : *arm64_kasan_sw, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_13}
302302
- {<< : *arm64_ubsan, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_13}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
- {<< : *arm64, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_14}
293293
- {<< : *arm64_lto_full, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_14}
294294
- {<< : *arm64_lto_thin, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_14}
295-
- {<< : *arm64_cfi_lto, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_14}
295+
- {<< : *arm64_cfi_cl_lto, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_14}
296296
- {<< : *arm64_kasan, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_14}
297297
- {<< : *arm64_kasan_sw, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_14}
298298
- {<< : *arm64_ubsan, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_14}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@
425425
- {<< : *arm64be, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_15}
426426
- {<< : *arm64_lto_full, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_15}
427427
- {<< : *arm64_lto_thin, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_15}
428-
- {<< : *arm64_cfi_lto, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_15}
428+
- {<< : *arm64_cfi_cl_lto, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_15}
429429
- {<< : *arm64_kasan, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_15}
430430
- {<< : *arm64_kasan_sw, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_15}
431431
- {<< : *arm64_ubsan, << : *stable-5_15, << : *llvm_full, boot: true, << : *llvm_15}

0 commit comments

Comments
 (0)