Merge pull request #156 from nathanchance/ppc-next-llvm-11

Use ld.bfd for powerpc64le on -next with LLVM 11
ClangBuiltLinux · Jun 29, 2021 · a9bee6a · a9bee6a
2 parents 45b5f41 + 7ac13c8
commit a9bee6a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/next.yml b/.github/workflows/next.yml
@@ -1123,10 +1123,10 @@ jobs:
       run: echo "::add-matcher::.github/problem-matchers/clang-errors-warnings.json"
     - name: Boot Test
       run: ./check_logs.py
-  _4761930fb3185292c157074cdf5031ca:
+  _3f3a86728b9bc2f14f25d79aec646231:
     runs-on: ubuntu-20.04
     needs: kick_tuxsuite_defconfigs
-    name: ARCH=powerpc LLVM=1 LLVM_VERSION=11 powernv_defconfig+CONFIG_PPC_DISABLE_WERROR=y
+    name: ARCH=powerpc LLVM=1 LD=powerpc64le-linux-gnu-ld LLVM_VERSION=11 powernv_defconfig+CONFIG_PPC_DISABLE_WERROR=y
     env:
       ARCH: powerpc
       LLVM_VERSION: 11

diff --git a/generator.yml b/generator.yml
@@ -116,7 +116,7 @@ tiers:
   - &llvm_arm32_v6      {llvm: true,  llvm_ias: false, make_variables: {LD: arm-linux-gnueabihf-ld, LLVM: 1}}
   # MIPS big endian                                                     https://github.com/ClangBuiltLinux/linux/issues/1025
   - &mips_llvm          {llvm: true,  llvm_ias: false, make_variables: {LD: mips-linux-gnu-ld, LLVM: 1}}
-  # PowerPC 64-bit big endian                                           https://github.com/ClangBuiltLinux/linux/issues/602
+  # PowerPC 64-bit big endian                                           https://github.com/ClangBuiltLinux/linux/issues/602 and https://github.com/ClangBuiltLinux/linux/issues/1260
   - &ppc64_llvm         {llvm: true,  llvm_ias: false, make_variables: {LD: powerpc64le-linux-gnu-ld, LLVM: 1}}
   # RISC-V                                                              https://github.com/ClangBuiltLinux/linux/issues/1020
   - &riscv_llvm_full    {llvm: true,  llvm_ias: true,  make_variables: {LD: riscv64-linux-gnu-ld, LLVM: 1, LLVM_IAS: 1}}
@@ -538,7 +538,7 @@ builds:
   # ppc32 and ppc64: Build disabled (https://gitlab.com/Linaro/tuxmake/-/issues/108)
   # - {<< : *ppc32,             << : *next,             << : *llvm,            boot: true,  llvm_version: *llvm_11}
   # - {<< : *ppc64,             << : *next,             << : *ppc64_llvm,      boot: true,  llvm_version: *llvm_11}
-  - {<< : *ppc64le,           << : *next,             << : *llvm,            boot: true,  llvm_version: *llvm_11}
+  - {<< : *ppc64le,           << : *next,             << : *ppc64_llvm,      boot: true,  llvm_version: *llvm_11}
   # riscv: Boot disabled (https://github.com/ClangBuiltLinux/linux/issues/1389)
   # https://github.com/ClangBuiltLinux/linux/issues/1023
   # https://github.com/ClangBuiltLinux/linux/issues/1143

diff --git a/tuxsuite/next.tux.yml b/tuxsuite/next.tux.yml
@@ -711,6 +711,7 @@ sets:
     - modules
     kernel_image: zImage.epapr
     make_variables:
+      LD: powerpc64le-linux-gnu-ld
       LLVM: 1
   - git_repo: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
     git_ref: master