Revert "cross-arm-none-eabi: update to 0.27 (gcc-8.2.0)"

This reverts commit b290e5b09f.

Fails to build with gcc-8.2.0 and needs to be fixed to avoid staging.

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller 2018-08-14 19:46:29 +02:00
parent 958e38b361
commit 1c97ba92ef
No known key found for this signature in database
GPG Key ID: 6764EC32352D0647
2 changed files with 38 additions and 27 deletions

View File

@ -29,26 +29,42 @@ index b8bb4d65825..713e35b62af 100644
use_gcc_stdint=wrap
;;
arm*-*-fuchsia*)
@@ -3899,43 +3899,6 @@
@@ -3787,56 +3787,6 @@ case "${target}" in
echo "Switch \"--with-tune\" may not be used with switch \"--with-cpu\"" 1>&2
exit 1
fi
-
- # Add extra multilibs
- if test "x$with_multilib_list" != x; then
- arm_multilibs=`echo $with_multilib_list | sed -e 's/,/ /g'`
- if test "x${arm_multilibs}" != xdefault ; then
- for arm_multilib in ${arm_multilibs}; do
- case ${arm_multilib} in
- aprofile|rmprofile)
- tmake_profile_file="arm/t-multilib"
- ;;
- *)
- echo "Error: --with-multilib-list=${with_multilib_list} not supported." 1>&2
- exit 1
- ;;
- esac
- done
- fi
- case ${arm_multilibs} in
- aprofile)
- # Note that arm/t-aprofile is a
- # stand-alone make file fragment to be
- # used only with itself. We do not
- # specifically use the
- # TM_MULTILIB_OPTION framework because
- # this shorthand is more
- # pragmatic.
- tmake_profile_file="arm/t-aprofile"
- ;;
- rmprofile)
- # Note that arm/t-rmprofile is a
- # stand-alone make file fragment to be
- # used only with itself. We do not
- # specifically use the
- # TM_MULTILIB_OPTION framework because
- # this shorthand is more
- # pragmatic.
- tmake_profile_file="arm/t-rmprofile"
- ;;
- default)
- ;;
- *)
- echo "Error: --with-multilib-list=${with_multilib_list} not supported." 1>&2
- exit 1
- ;;
- esac
-
- if test "x${tmake_profile_file}" != x ; then
- # arm/t-aprofile and arm/t-rmprofile are only
@ -63,16 +79,13 @@ index b8bb4d65825..713e35b62af 100644
- echo "Error: You cannot use any of --with-arch/cpu/fpu/float/mode with --with-multilib-list=${with_multilib_list}" 1>&2
- exit 1
- fi
- # But pass the default value for float-abi
- # through to the multilib selector
- with_float="soft"
-
- tmake_file="${tmake_file} ${tmake_profile_file}"
- TM_MULTILIB_CONFIG="$with_multilib_list"
- fi
- fi
target_cpu_cname=${target_cpu_cname:-arm6}
with_cpu=${with_cpu:-$target_cpu_cname}
;;
fr*-*-*linux*)
diff --git a/gcc/config/arm/t-mlibs b/gcc/config/arm/t-mlibs
new file mode 100644
index 00000000000..5720cf7503d

View File

@ -1,18 +1,18 @@
# Template file for 'cross-arm-none-eabi'
_binutils_version=2.29.1
_gcc_version=8.2.0
_gcc_version=7.3.0
_newlib_version=2.4.0.20161025
_triplet=arm-none-eabi
_sysroot="/usr/${_triplet}"
pkgname=cross-${_triplet}
version=0.27
version=0.2
revision=1
short_desc="GNU cross bare metal toolchain"
maintainer="Thomas Bernard <thomas@famillebernardgouriou.fr>"
homepage="http://www.voidlinux.eu"
license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1.0-or-later"
license="GPL-3, GPL-2, LGPL-2.1"
distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
@ -20,7 +20,7 @@ distfiles="
checksum="
1509dff41369fb70aed23682351b663b56db894034773e6dbf7d5d6071fc55cc
196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080
832ca6ae04636adbb430e865a1451adf6979ab44ca1c8374f61fba65645ce15c
cbecbc637496fcec02829c12babf8441c6500eb1933c776d2fa4e0a9a35f081f"
lib32disabled=yes
@ -33,8 +33,6 @@ create_wrksrc=yes
hostmakedepends="perl flex bison"
makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
broken="Does not build; some stage says hard-float support is required. Assigned to @teajay-fr"
_apply_patch() {
local args="$1" pname="$(basename $2)"