diff --git a/srcpkgs/cross-arm-none-eabi/files/enable-with-multilib-list-for-arm.patch b/srcpkgs/cross-arm-none-eabi/files/enable-with-multilib-list-for-arm.patch
index 8825c30ca1..a3f54bcad1 100644
--- a/srcpkgs/cross-arm-none-eabi/files/enable-with-multilib-list-for-arm.patch
+++ b/srcpkgs/cross-arm-none-eabi/files/enable-with-multilib-list-for-arm.patch
@@ -29,42 +29,26 @@ index b8bb4d65825..713e35b62af 100644
  	  use_gcc_stdint=wrap
  	  ;;
  	arm*-*-fuchsia*)
-@@ -3787,56 +3787,6 @@ case "${target}" in
- 			echo "Switch \"--with-tune\" may not be used with switch \"--with-cpu\""  1>&2
+@@ -3899,43 +3899,6 @@
  			exit 1
  		fi
--
+ 
 -		# Add extra multilibs
 -		if test "x$with_multilib_list" != x; then
 -			arm_multilibs=`echo $with_multilib_list | sed -e 's/,/ /g'`
--			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${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
 -
 -			if test "x${tmake_profile_file}" != x ; then
 -				# arm/t-aprofile and arm/t-rmprofile are only
@@ -79,13 +63,16 @@ 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
diff --git a/srcpkgs/cross-arm-none-eabi/template b/srcpkgs/cross-arm-none-eabi/template
index d50ea80f8c..270fbd7979 100644
--- a/srcpkgs/cross-arm-none-eabi/template
+++ b/srcpkgs/cross-arm-none-eabi/template
@@ -1,18 +1,18 @@
 # Template file for 'cross-arm-none-eabi'
 _binutils_version=2.29.1
-_gcc_version=7.3.0
+_gcc_version=8.2.0
 _newlib_version=2.4.0.20161025
 
 _triplet=arm-none-eabi
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.2
+version=0.27
 revision=1
 short_desc="GNU cross bare metal toolchain"
 maintainer="Thomas Bernard <thomas@famillebernardgouriou.fr>"
 homepage="http://www.voidlinux.eu"
-license="GPL-3, GPL-2, LGPL-2.1"
+license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1.0-or-later"
 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
- 832ca6ae04636adbb430e865a1451adf6979ab44ca1c8374f61fba65645ce15c
+ 196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080
  cbecbc637496fcec02829c12babf8441c6500eb1933c776d2fa4e0a9a35f081f"
 
 lib32disabled=yes
@@ -33,6 +33,8 @@ 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)"