diff options
| author | Thomas Preud'homme <thomas.preudhomme@arm.com> | 2017-05-05 16:50:40 +0000 |
|---|---|---|
| committer | Thomas Preud'homme <thopre01@gcc.gnu.org> | 2017-05-05 16:50:40 +0000 |
| commit | 2f738ca53b64a4cde021f3274946b9426ee4fea5 (patch) | |
| tree | 7bb1fcd07064c4f2cc226ff6a79b00fbca38e6ec /gcc/config.gcc | |
| parent | 77fa3ec1b25e4f66ea87b3049c91c7249c1ec92c (diff) | |
| download | gcc-2f738ca53b64a4cde021f3274946b9426ee4fea5.zip gcc-2f738ca53b64a4cde021f3274946b9426ee4fea5.tar.gz gcc-2f738ca53b64a4cde021f3274946b9426ee4fea5.tar.bz2 | |
[ARM] Allow combination of aprofile and rmprofile multilibs
2017-05-05 Thomas Preud'homme <thomas.preudhomme@arm.com>
gcc/
* config.gcc: Allow combinations of aprofile and rmprofile values for
--with-multilib-list.
* config/arm/t-multilib: New file.
* config/arm/t-aprofile: Remove initialization of MULTILIB_*
variables. Remove setting of ISA and floating-point ABI in
MULTILIB_OPTIONS and MULTILIB_DIRNAMES. Set architecture and FPU in
MULTI_ARCH_OPTS_A and MULTI_ARCH_DIRS_A rather than MULTILIB_OPTIONS
and MULTILIB_DIRNAMES respectively. Add comment to introduce all
matches. Add architecture matches for marvel-pj4 and generic-armv7-a
CPU options.
* config/arm/t-rmprofile: Likewise except for the matches changes.
* doc/install.texi (--with-multilib-list): Document the combination of
aprofile and rmprofile values and warn about pitfalls in doing that.
From-SVN: r247646
Diffstat (limited to 'gcc/config.gcc')
| -rw-r--r-- | gcc/config.gcc | 40 |
1 files changed, 12 insertions, 28 deletions
diff --git a/gcc/config.gcc b/gcc/config.gcc index b8bb4d6..5c9feac 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -3791,34 +3791,18 @@ case "${target}" in # 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 if test "x${tmake_profile_file}" != x ; then # arm/t-aprofile and arm/t-rmprofile are only |