projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e167433)
[arm] reset all multilib variables
authorRichard Earnshaw <rearnsha@arm.com>
Fri, 16 Jun 2017 21:06:01 +0000 (21:06 +0000)
committerRichard Earnshaw <rearnsha@gcc.gnu.org>
Fri, 16 Jun 2017 21:06:01 +0000 (21:06 +0000)
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 patch | blob | history
gcc/config/arm/t-phoenix patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 810cd751dd3af7e322d808f9fc8b5f8fe45838f6..fce364221944bcd01d654edbc8ced12c0a0fa6a7 100644 (file)
--- 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 dea52570f63eea7b7a254ec5366309fb2fe0e146..4930ba871586808e0a38065680cffec04379911b 100644 (file)
--- 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