From b275f0de6801ae64d3c866f52238c901777a0470 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Fri, 27 Nov 2015 11:55:08 +0100 Subject: [PATCH] gcc: use soft-float on mipsel-musl (like in cross-*) and sysv hashes. --- srcpkgs/gcc/template | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index 44b4b1d9d00..7133db23c78 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -57,7 +57,8 @@ case "$XBPS_TARGET_MACHINE" in aarch64) _triplet="aarch64-linux-gnu";; aarch64-musl) _triplet="aarch64-linux-musl";; mips-musl) _triplet="mips-linux-musl";; - mipsel-musl) _triplet="mipsel-linux-muslhf";; + mipsel-musl) _triplet="mipsel-linux-musl";; + mipselhf-musl) _triplet="mipsel-linux-muslhf";; esac case "$XBPS_TARGET_MACHINE" in *-musl) depends+=" musl";; @@ -88,10 +89,12 @@ pre_configure() { sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in } do_configure() { - local _langs _args + local _langs _args _hash + _hash=gnu case "$XBPS_TARGET_MACHINE" in - mipsel-musl) _args+=" --with-arch=mips32r2 --with-float=hard";; + mipselhf-musl) _args+=" --with-arch=mips32r2 --with-float=hard"; _hash=sysv;; + mipsel-musl) _args+=" --with-arch=mips32r2 --with-float=soft"; _hash=sysv;; mips-musl) _args+=" --with-arch=mip32r2 --with-float=soft";; armv5*) _args+=" --with-arch=armv5te --with-float=soft";; armv6l*) _args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard";; @@ -152,7 +155,7 @@ do_configure() { --with-system-zlib --enable-shared --enable-lto \ --enable-linker-build-id --disable-werror --disable-nls \ --enable-checking=release --disable-libstdcxx-pch \ - --enable-cloog-backend=isl --with-linker-hash-style=gnu \ + --enable-cloog-backend=isl --with-linker-hash-style=$_hash \ --enable-languages=${_langs} ${_args} } do_build() {