Skip to content

Commit 47da3fc

Browse files
nathanchancenathanchance
committed
Revert "Merge pull request ClangBuiltLinux#321 from nathanchance/ppc64le-llvm-ias"
This reverts commit fdee477, reversing changes made to 3aa7dcd. An ld.lld change in main breaks booting CONFIG_RELOCATABLE kernels, which includes Fedora and OpenSUSE's configurations. Revert this change for now, until a solution or appropriate workaround can be created. Link: ClangBuiltLinux/linux#1581 Signed-off-by: Nathan Chancellor <[email protected]>
1 parent af9feef commit 47da3fc

File tree

5 files changed

+23
-28
lines changed

5 files changed

+23
-28
lines changed

‎.github/workflows/mainline-clang-15.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -431,10 +431,10 @@ jobs:
431431
name: output_artifact_defconfigs
432432
- name: Check Build and Boot Logs
433433
run: ./check_logs.py
434-
_184d8d4f81b0cb5c1f31ff3bfa495255:
434+
_b83e803d7dd6c3201bea198a418a70ce:
435435
runs-on: ubuntu-latest
436436
needs: kick_tuxsuite_defconfigs
437-
name: ARCH=powerpc LLVM=1 LLVM_IAS=1 LLVM_VERSION=15 powernv_defconfig
437+
name: ARCH=powerpc LLVM=1 LLVM_IAS=0 LLVM_VERSION=15 powernv_defconfig
438438
env:
439439
ARCH: powerpc
440440
LLVM_VERSION: 15
@@ -732,10 +732,10 @@ jobs:
732732
name: output_artifact_distribution_configs
733733
- name: Check Build and Boot Logs
734734
run: ./check_logs.py
735-
_3604dd182915d18674b48e45803faa77:
735+
_08fb5d721ebe5360162eab624a731362:
736736
runs-on: ubuntu-latest
737737
needs: kick_tuxsuite_distribution_configs
738-
name: ARCH=powerpc LLVM=1 LLVM_IAS=1 LLVM_VERSION=15 https://src.fedoraproject.org/rpms/kernel/raw/rawhide/f/kernel-ppc64le-fedora.config+CONFIG_BPF_PRELOAD=n
738+
name: ARCH=powerpc CC=clang LLVM_IAS=0 LLVM_VERSION=15 https://src.fedoraproject.org/rpms/kernel/raw/rawhide/f/kernel-ppc64le-fedora.config+CONFIG_BPF_PRELOAD=n
739739
env:
740740
ARCH: powerpc
741741
LLVM_VERSION: 15
@@ -751,10 +751,10 @@ jobs:
751751
name: output_artifact_distribution_configs
752752
- name: Check Build and Boot Logs
753753
run: ./check_logs.py
754-
_03b8db92013edc5ad35714594a030940:
754+
_cf214bc1ac3d0d1e5d672c288d3a49e6:
755755
runs-on: ubuntu-latest
756756
needs: kick_tuxsuite_distribution_configs
757-
name: ARCH=powerpc LLVM=1 LLVM_IAS=0 LLVM_VERSION=15 https://github.com/openSUSE/kernel-source/raw/master/config/ppc64le/default
757+
name: ARCH=powerpc CC=clang LLVM_IAS=0 LLVM_VERSION=15 https://github.com/openSUSE/kernel-source/raw/master/config/ppc64le/default
758758
env:
759759
ARCH: powerpc
760760
LLVM_VERSION: 15

‎.github/workflows/next-clang-15.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -431,10 +431,10 @@ jobs:
431431
name: output_artifact_defconfigs
432432
- name: Check Build and Boot Logs
433433
run: ./check_logs.py
434-
_184d8d4f81b0cb5c1f31ff3bfa495255:
434+
_b83e803d7dd6c3201bea198a418a70ce:
435435
runs-on: ubuntu-latest
436436
needs: kick_tuxsuite_defconfigs
437-
name: ARCH=powerpc LLVM=1 LLVM_IAS=1 LLVM_VERSION=15 powernv_defconfig
437+
name: ARCH=powerpc LLVM=1 LLVM_IAS=0 LLVM_VERSION=15 powernv_defconfig
438438
env:
439439
ARCH: powerpc
440440
LLVM_VERSION: 15
@@ -751,10 +751,10 @@ jobs:
751751
name: output_artifact_distribution_configs
752752
- name: Check Build and Boot Logs
753753
run: ./check_logs.py
754-
_3604dd182915d18674b48e45803faa77:
754+
_08fb5d721ebe5360162eab624a731362:
755755
runs-on: ubuntu-latest
756756
needs: kick_tuxsuite_distribution_configs
757-
name: ARCH=powerpc LLVM=1 LLVM_IAS=1 LLVM_VERSION=15 https://src.fedoraproject.org/rpms/kernel/raw/rawhide/f/kernel-ppc64le-fedora.config+CONFIG_BPF_PRELOAD=n
757+
name: ARCH=powerpc CC=clang LLVM_IAS=0 LLVM_VERSION=15 https://src.fedoraproject.org/rpms/kernel/raw/rawhide/f/kernel-ppc64le-fedora.config+CONFIG_BPF_PRELOAD=n
758758
env:
759759
ARCH: powerpc
760760
LLVM_VERSION: 15
@@ -770,10 +770,10 @@ jobs:
770770
name: output_artifact_distribution_configs
771771
- name: Check Build and Boot Logs
772772
run: ./check_logs.py
773-
_3f59e2fc30565fc140588eaca2035b8c:
773+
_cf214bc1ac3d0d1e5d672c288d3a49e6:
774774
runs-on: ubuntu-latest
775775
needs: kick_tuxsuite_distribution_configs
776-
name: ARCH=powerpc LLVM=1 LLVM_IAS=1 LLVM_VERSION=15 https://github.com/openSUSE/kernel-source/raw/master/config/ppc64le/default
776+
name: ARCH=powerpc CC=clang LLVM_IAS=0 LLVM_VERSION=15 https://github.com/openSUSE/kernel-source/raw/master/config/ppc64le/default
777777
env:
778778
ARCH: powerpc
779779
LLVM_VERSION: 15

‎generator.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,9 @@ builds:
308308
- {<< : *mipsel, << : *mainline, << : *llvm_full, boot: true, << : *llvm_tot}
309309
- {<< : *ppc32, << : *mainline, << : *llvm, boot: true, << : *llvm_tot}
310310
- {<< : *ppc64, << : *mainline, << : *ppc64_llvm, boot: true, << : *llvm_tot}
311-
- {<< : *ppc64le, << : *mainline, << : *llvm_full, boot: true, << : *llvm_tot}
312-
- {<< : *ppc64le_fedora, << : *mainline, << : *llvm_full, boot: true, << : *llvm_tot}
313-
# SUSE ppc64le build with LLVM_IAS=0: https://github.com/ClangBuiltLinux/linux/issues/1418
314-
- {<< : *ppc64le_suse, << : *mainline, << : *llvm, boot: true, << : *llvm_tot}
311+
- {<< : *ppc64le, << : *mainline, << : *llvm, boot: true, << : *llvm_tot}
312+
- {<< : *ppc64le_fedora, << : *mainline, << : *clang, boot: true, << : *llvm_tot}
313+
- {<< : *ppc64le_suse, << : *mainline, << : *clang, boot: true, << : *llvm_tot}
315314
- {<< : *riscv, << : *mainline, << : *llvm_full, boot: true, << : *llvm_tot}
316315
- {<< : *riscv_allmod, << : *mainline, << : *llvm_full, boot: false, << : *llvm_tot}
317316
- {<< : *s390, << : *mainline, << : *clang, boot: true, << : *llvm_tot}
@@ -370,9 +369,9 @@ builds:
370369
- {<< : *mipsel, << : *next, << : *llvm_full, boot: true, << : *llvm_tot}
371370
- {<< : *ppc32, << : *next, << : *llvm, boot: true, << : *llvm_tot}
372371
- {<< : *ppc64, << : *next, << : *ppc64_llvm, boot: true, << : *llvm_tot}
373-
- {<< : *ppc64le, << : *next, << : *llvm_full, boot: true, << : *llvm_tot}
374-
- {<< : *ppc64le_fedora, << : *next, << : *llvm_full, boot: true, << : *llvm_tot}
375-
- {<< : *ppc64le_suse, << : *next, << : *llvm_full, boot: true, << : *llvm_tot}
372+
- {<< : *ppc64le, << : *next, << : *llvm, boot: true, << : *llvm_tot}
373+
- {<< : *ppc64le_fedora, << : *next, << : *clang, boot: true, << : *llvm_tot}
374+
- {<< : *ppc64le_suse, << : *next, << : *clang, boot: true, << : *llvm_tot}
376375
- {<< : *riscv, << : *next, << : *llvm_full, boot: true, << : *llvm_tot}
377376
- {<< : *riscv_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_tot}
378377
- {<< : *s390, << : *next, << : *clang, boot: true, << : *llvm_tot}

‎tuxsuite/mainline-clang-15.tux.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ sets:
266266
kernel_image: zImage.epapr
267267
make_variables:
268268
LLVM: 1
269-
LLVM_IAS: 1
269+
LLVM_IAS: 0
270270
- git_repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
271271
git_ref: master
272272
target_arch: riscv
@@ -445,8 +445,7 @@ sets:
445445
- kernel
446446
kernel_image: zImage.epapr
447447
make_variables:
448-
LLVM: 1
449-
LLVM_IAS: 1
448+
LLVM_IAS: 0
450449
- git_repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
451450
git_ref: master
452451
target_arch: powerpc
@@ -456,7 +455,6 @@ sets:
456455
- kernel
457456
kernel_image: zImage.epapr
458457
make_variables:
459-
LLVM: 1
460458
LLVM_IAS: 0
461459
- git_repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
462460
git_ref: master

‎tuxsuite/next-clang-15.tux.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ sets:
266266
kernel_image: zImage.epapr
267267
make_variables:
268268
LLVM: 1
269-
LLVM_IAS: 1
269+
LLVM_IAS: 0
270270
- git_repo: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
271271
git_ref: master
272272
target_arch: riscv
@@ -458,8 +458,7 @@ sets:
458458
- kernel
459459
kernel_image: zImage.epapr
460460
make_variables:
461-
LLVM: 1
462-
LLVM_IAS: 1
461+
LLVM_IAS: 0
463462
- git_repo: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
464463
git_ref: master
465464
target_arch: powerpc
@@ -469,8 +468,7 @@ sets:
469468
- kernel
470469
kernel_image: zImage.epapr
471470
make_variables:
472-
LLVM: 1
473-
LLVM_IAS: 1
471+
LLVM_IAS: 0
474472
- git_repo: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
475473
git_ref: master
476474
target_arch: s390

0 commit comments

Comments
 (0)