Skip to contentSkip to conversation

support/autobuilder: fix riscv toolchains

PATCH New Yann E. MORIN 2 participants 2 messages Jan 1, 2020 – Jan 2, 2020 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 support/autobuilder: fix riscv toolchains

In commit aee39cbf27e (arch/riscv: set the default float ABI based on ISA extensions), the default ABI changed, so the config fragments used by the autobuilders were adapated accordingly, in commit f89871e81085 (support/config-fragments: fix br-riscv{32,64} toolchain fragments).

But now, we need to revert again, because the newer toolchains are now using the default ABI again.

We do not really do a revert, though, because the original change was right, and a revert would mean it was not.

Fixes:

    http://autobuild.buildroot.org/results/b59/b593267fb9fc9a002b977e049b2a5389dbaded30/ (riscv32)
    http://autobuild.buildroot.org/results/b42/b42a4b22b29f47d5c85be119b310f1dfb61112a1/ (riscv64)
    ... and so many others on various packages...
Cc Thomas Petazzoni <[email protected]>
Cc Mark Corbin <[email protected]>
---
 support/config-fragments/autobuild/br-riscv32.config | 1 -
 support/config-fragments/autobuild/br-riscv64.config | 1 -
 2 files changed, 2 deletions(-)
support/config-fragments/autobuild/br-riscv32.config +0 -1
index 4ec6ca9f89..f8901edf2d 100644
@@ -1,6 +1,5 @@
 BR2_riscv=y
 BR2_RISCV_32=y
-BR2_RISCV_ABI_ILP32=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
 BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv32-glibc-2019.11.tar.bz2"
support/config-fragments/autobuild/br-riscv64.config +0 -1
index 0706c7b5da..f98675d8dd 100644
@@ -1,5 +1,4 @@
 BR2_riscv=y
-BR2_RISCV_ABI_LP64=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
 BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-riscv64-glibc-2019.11.tar.bz2"
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 support/autobuilder: fix riscv toolchains

Quoted 16 lines · On Wed, 1 Jan 2020 22:31:32 +0100 "Yann E. MORIN" <[email protected]>…

In commit aee39cbf27e (arch/riscv: set the default float ABI based on ISA extensions), the default ABI changed, so the config fragments used by the autobuilders were adapated accordingly, in commit f89871e81085 (support/config-fragments: fix br-riscv{32,64} toolchain fragments).

But now, we need to revert again, because the newer toolchains are now using the default ABI again.

We do not really do a revert, though, because the original change was right, and a revert would mean it was not.

Fixes:

    http://autobuild.buildroot.org/results/b59/b593267fb9fc9a002b977e049b2a5389dbaded30/ (riscv32)
    http://autobuild.buildroot.org/results/b42/b42a4b22b29f47d5c85be119b310f1dfb61112a1/ (riscv64)
    ... and so many others on various packages...
Quoted 7 lines
Cc Thomas Petazzoni <[email protected]>
Cc Mark Corbin <[email protected]>
---
 support/config-fragments/autobuild/br-riscv32.config | 1 -
 support/config-fragments/autobuild/br-riscv64.config | 1 -
 2 files changed, 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com