[25/30,arm,phoenix] reset all multilib variables

Message ID 3e6ae4b89e7412968d08a5c198af2f33133399a1.1497004220.git.Richard.Earnshaw@arm.com
State New
Headers show
  • Reworking the -mcpu, -march and -mfpu options
Related show

Commit Message

Richard Earnshaw (lists) June 9, 2017, 12:53 p.m.
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

	* config/arm/t-phoenix (MULTILIB_REUSE): Clear variable.
 gcc/config/arm/t-phoenix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)


diff --git a/gcc/config/arm/t-phoenix b/gcc/config/arm/t-phoenix
index dea5257..4930ba8 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_OPTIONS	= marm/mthumb
-MULTILIB_OPTIONS     += mfloat-abi=hard
-MULTILIB_MATCHES     += mfloat-abi?hard=mhard-float
+MULTILIB_OPTIONS	+= mfloat-abi=hard
+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