Upstream: https://projects.archlinux.org/svntogit/community.git/tree/trunk/enable-with-multilib-list-for-arm.patch?h=packages/arm-none-eabi-gcc
commit 71587241301d28b68bbe2f41c5eb2856053c750c
Author: Anatol Pomozov <anatol.pomozov@gmail.com>
Date: Tue May 9 21:19:27 2017 -0700
ARM patch https://gcc.gnu.org/ml/gcc-patches/2012-05/msg00083/enable-with-multilib-list-for-arm.patch
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index f675e073ecc..cced5329b47 100644
@@ -558,6 +558,7 @@ lang_opt_files=@lang_opt_files@ $(srcdir)/c-family/c.opt $(srcdir)/common.opt
lang_specs_files=@lang_specs_files@
lang_tree_files=@lang_tree_files@
target_cpu_default=@target_cpu_default@
+with_multilib_list=@with_multilib_list@
OBJC_BOEHM_GC=@objc_boehm_gc@
extra_modes_file=@extra_modes_file@
extra_opt_files=@extra_opt_files@
diff --git a/gcc/config.gcc b/gcc/config.gcc
index b8bb4d65825..713e35b62af 100644
@@ -1140,7 +1140,7 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems* | arm*-*-fuchsia*)
tm_file="$tm_file newlib-stdint.h"
- tmake_file="${tmake_file} arm/t-bpabi"
+ tmake_file="${tmake_file} arm/t-bpabi arm/t-mlibs"
@@ -3787,56 +3787,6 @@ case "${target}" in
echo "Switch \"--with-tune\" may not be used with switch \"--with-cpu\"" 1>&2
- if test "x$with_multilib_list" != x; then
- arm_multilibs=`echo $with_multilib_list | sed -e 's/,/ /g'`
- case ${arm_multilibs} in
- # Note that arm/t-aprofile is a
- # stand-alone make file fragment to be
- # used only with itself. We do not
- # TM_MULTILIB_OPTION framework because
- # this shorthand is more
- tmake_profile_file="arm/t-aprofile"
- # Note that arm/t-rmprofile is a
- # stand-alone make file fragment to be
- # used only with itself. We do not
- # TM_MULTILIB_OPTION framework because
- # this shorthand is more
- tmake_profile_file="arm/t-rmprofile"
- echo "Error: --with-multilib-list=${with_multilib_list} not supported." 1>&2
- if test "x${tmake_profile_file}" != x ; then
- # arm/t-aprofile and arm/t-rmprofile are only
- # designed to work without any with-cpu,
- # with-arch, with-mode, with-fpu or with-float
- if test "x$with_arch" != x \
- || test "x$with_cpu" != x \
- || test "x$with_float" != x \
- || test "x$with_fpu" != x \
- || test "x$with_mode" != x ; then
- echo "Error: You cannot use any of --with-arch/cpu/fpu/float/mode with --with-multilib-list=${with_multilib_list}" 1>&2
- tmake_file="${tmake_file} ${tmake_profile_file}"
diff --git a/gcc/config/arm/t-mlibs b/gcc/config/arm/t-mlibs