aboutsummaryrefslogtreecommitdiff
path: root/support/config-fragments
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-09-23 21:36:26 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-09-23 21:56:24 +0200
commitf89871e81085fe955f4fe602070dc32628d30f3a (patch)
treecb3361e3eaa0ae0ddafd49b284378227fee2b69a /support/config-fragments
parenta87c61737c69581435a38d82547d03ee7d0c9e5c (diff)
downloadbuildroot-f89871e81085fe955f4fe602070dc32628d30f3a.tar.gz
buildroot-f89871e81085fe955f4fe602070dc32628d30f3a.tar.bz2
support/config-fragments: fix br-riscv{32,64} toolchain fragments
Since commit aee39cbf27e833fad9962eb99b5655dbadcfee60 ("arch/riscv: set the default float ABI based on ISA extensions"), RISC-V 32/64 use the lp32d/lp64d ABIs by default. But our pre-built external toolchains were built with the LP32/LP64 ABI. Building with lp32d/lp64d gcc flags, but a toolchain built with the LP32/LP64 ABI causes a number of failures such as: /home/mark/buildroot-test/instance-1/output/host/riscv64-buildroot-linux-gnu/sysroot/usr/include/gnu/stubs.h:11:11: fatal error: gnu/stubs-lp64d.h: No such file or directory or: /home/mark/buildroot-test/instance-1/output/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-gnu/7.4.0/../../../../riscv64-buildroot-linux-gnu/bin/ld: /tmp/cc2BTtFE.o: can't link hard-float modules with soft-float modules /home/mark/buildroot-test/instance-1/output/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-gnu/7.4.0/../../../../riscv64-buildroot-linux-gnu/bin/ld: failed to merge target specific data of file /tmp/cc2BTtFE.o So let's fix our config fragments to reflect the ABIs those toolchains were built with. Fixes: http://autobuild.buildroot.net/results/a3959b0613cf561059483abc580b144be4817d1a/ (libsepol) http://autobuild.buildroot.net/results/3db50d8a0a913413b2198d6c301419136d2d22a7/ (attr) http://autobuild.buildroot.net/results/7780fada05b8440ae3e97618615624a6a2dac03f/ (libusb) and many others Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'support/config-fragments')
-rw-r--r--support/config-fragments/autobuild/br-riscv32.config1
-rw-r--r--support/config-fragments/autobuild/br-riscv64.config1
2 files changed, 2 insertions, 0 deletions
diff --git a/support/config-fragments/autobuild/br-riscv32.config b/support/config-fragments/autobuild/br-riscv32.config
index cea472400b..e34f7b4aad 100644
--- a/support/config-fragments/autobuild/br-riscv32.config
+++ b/support/config-fragments/autobuild/br-riscv32.config
@@ -1,5 +1,6 @@
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.05.1.tar.bz2"
diff --git a/support/config-fragments/autobuild/br-riscv64.config b/support/config-fragments/autobuild/br-riscv64.config
index 2b6ba7094d..7c98512694 100644
--- a/support/config-fragments/autobuild/br-riscv64.config
+++ b/support/config-fragments/autobuild/br-riscv64.config
@@ -1,4 +1,5 @@
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.05.1.tar.bz2"