From 99d6bcf7ae8980e04dabe8b86df9c70ad04dc5ba Mon Sep 17 00:00:00 2001 From: Richard Earnshaw <rearnsha@arm.com> Date: Fri, 16 Jun 2017 21:06:01 +0000 Subject: [PATCH] [arm] reset all multilib variables NB. This configuration does not build in GCC-7 and doesn't build now either. This patch resets a couple of multlib variables which previously were not cleared. It almost certainly needs further work to make it use the new option framework correctly, but since the library configurations are already clearly wrong, it's not clear what the changes need to be. In particular it tries to build a hard-float library for ARM7TDMI in both ARM and thumb modes, but ARMv4t does not support any floating-point instructions; furthermore, GCC has never supported a hard-float thumb1 library. * config/arm/t-phoenix (MULTILIB_REUSE): Clear variable. (MULTILIB_REQUIRED): Likewise. From-SVN: r249303 --- gcc/ChangeLog | 5 +++++ gcc/config/arm/t-phoenix | 20 +++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 810cd751dd3a..fce364221944 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2017-06-16 Richard Earnshaw <rearnsha@arm.com> + + * config/arm/t-phoenix (MULTILIB_REUSE): Clear variable. + (MULTILIB_REQUIRED): Likewise. + 2017-06-16 Richard Earnshaw <rearnsha@arm.com> * config/arm/t-linux-eabi (MULTILIB_EXCEPTIONS): Set to empty. diff --git a/gcc/config/arm/t-phoenix b/gcc/config/arm/t-phoenix index dea52570f63e..4930ba871586 100644 --- a/gcc/config/arm/t-phoenix +++ b/gcc/config/arm/t-phoenix @@ -16,14 +16,16 @@ # along with GCC; see the file COPYING3. If not see # <http://www.gnu.org/licenses/>. -MULTILIB_OPTIONS = marm/mthumb -MULTILIB_DIRNAMES = arm thumb -MULTILIB_EXCEPTIONS = -MULTILIB_MATCHES = +MULTILIB_OPTIONS = marm/mthumb +MULTILIB_DIRNAMES = arm thumb +MULTILIB_EXCEPTIONS = +MULTILIB_MATCHES = +MULTILIB_REUSE = +MULTILIB_REQUIRED = -MULTILIB_OPTIONS += mfloat-abi=hard -MULTILIB_DIRNAMES += fpu -MULTILIB_MATCHES += mfloat-abi?hard=mhard-float +MULTILIB_OPTIONS += mfloat-abi=hard +MULTILIB_DIRNAMES += fpu +MULTILIB_MATCHES += mfloat-abi?hard=mhard-float -MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork -MULTILIB_DIRNAMES += normal interwork +MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork +MULTILIB_DIRNAMES += normal interwork -- GitLab