mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 17:30:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Linux multilib configurations with default architectures

Browse Source 
gcc/

	* config/mips/mips.h (MIPS_ISA_LEVEL_SPEC): Only infer an ISA
	level from an ARCH; do not inject the default.
	(MIPS_DEFAULT_ISA_LEVEL_SPEC): New macro split out from
	MIPS_ISA_LEVEL_SPEC.
	(MIPS_ISA_NAN2008_SPEC): Update comment.
	(BASE_DRIVER_SELF_SPECS): Likewise.
	* config/mips/elfoabi.h (DRIVER_SELF_SPECS): Add
	MIPS_DEFAULT_ISA_LEVEL_SPEC.
	* config/mips/mti-elf.h (DRIVER_SELF_SPECS): Likewise.
	* config/mips/mti-linux.h (DRIVER_SELF_SPECS): Likewise.
	* config/mips/sde.h (DRIVER_SELF_SPECS): Likewise.

From-SVN: r219580
This commit is contained in:
Matthew Fortune 2015-01-14 08:35:52 +00:00 committed by Matthew Fortune
parent 46b622cc24
commit fcd7669cb6
6 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gcc/ChangeLog
View File

@ -1,3 +1,17 @@
2015-01-14 Matthew Fortune <matthew.fortune@imgtec.com>
* config/mips/mips.h (MIPS_ISA_LEVEL_SPEC): Only infer an ISA
level from an ARCH; do not inject the default.
(MIPS_DEFAULT_ISA_LEVEL_SPEC): New macro split out from
MIPS_ISA_LEVEL_SPEC.
(MIPS_ISA_NAN2008_SPEC): Update comment.
(BASE_DRIVER_SELF_SPECS): Likewise.
* config/mips/elfoabi.h (DRIVER_SELF_SPECS): Add
MIPS_DEFAULT_ISA_LEVEL_SPEC.
* config/mips/mti-elf.h (DRIVER_SELF_SPECS): Likewise.
* config/mips/mti-linux.h (DRIVER_SELF_SPECS): Likewise.
* config/mips/sde.h (DRIVER_SELF_SPECS): Likewise.
2015-01-14 Richard Biener <rguenther@suse.de>
PR tree-optimization/64493

3
gcc/config/mips/elfoabi.h
View File

@ -20,6 +20,9 @@ along with GCC; see the file COPYING3. If not see
#undef DRIVER_SELF_SPECS
#define DRIVER_SELF_SPECS \
/* Set the ISA for the default multilib. */ \
MIPS_DEFAULT_ISA_LEVEL_SPEC, \
\
/* Make sure a -mips option is present. This helps us to pick \
the right multilib, and also makes the later specs easier \
to write. */ \

16
gcc/config/mips/mips.h
View File

@ -704,8 +704,7 @@ struct mips_cpu_info {
#define MIPS_ARCH_OPTION_SPEC \
MIPS_ISA_LEVEL_OPTION_SPEC "|march=*"
/* A spec that infers a -mips argument from an -march argument,
or injects the default if no architecture is specified. */
/* A spec that infers a -mips argument from an -march argument. */
#define MIPS_ISA_LEVEL_SPEC \
"%{" MIPS_ISA_LEVEL_OPTION_SPEC ":;: \
@ -725,7 +724,13 @@ struct mips_cpu_info {
%{march=mips64r2|march=loongson3a|march=octeon|march=xlp: -mips64r2} \
%{march=mips64r3: -mips64r3} \
%{march=mips64r5: -mips64r5} \
%{march=mips64r6: -mips64r6} \
%{march=mips64r6: -mips64r6}}"
/* A spec that injects the default multilib ISA if no architecture is
specified. */
#define MIPS_DEFAULT_ISA_LEVEL_SPEC \
"%{" MIPS_ISA_LEVEL_OPTION_SPEC ":;: \
%{!march=*: -" MULTILIB_ISA_DEFAULT "}}"
/* A spec that infers a -mhard-float or -msoft-float setting from an
@ -757,6 +762,7 @@ struct mips_cpu_info {
"%{msynci|mno-synci:;:%{mips32r2|mips32r3|mips32r5|mips32r6|mips64r2 \
|mips64r3|mips64r5|mips64r6:-msynci;:-mno-synci}}"
/* Infer a -mnan=2008 setting from a -mips argument. */
#define MIPS_ISA_NAN2008_SPEC \
"%{mnan*:;mips32r6|mips64r6:-mnan=2008}"
@ -806,7 +812,9 @@ struct mips_cpu_info {
{"mips-plt", "%{!mplt:%{!mno-plt:-m%(VALUE)}}" }, \
{"synci", "%{!msynci:%{!mno-synci:-m%(VALUE)}}" }
/* A spec that infers the -mdsp setting from an -march argument. */
/* A spec that infers the:
-mnan=2008 setting from a -mips argument,
-mdsp setting from a -march argument. */
#define BASE_DRIVER_SELF_SPECS \
MIPS_ISA_NAN2008_SPEC, \
"%{!mno-dsp: \

3
gcc/config/mips/mti-elf.h
View File

@ -19,6 +19,9 @@ along with GCC; see the file COPYING3. If not see
#undef DRIVER_SELF_SPECS
#define DRIVER_SELF_SPECS \
/* Set the ISA for the default multilib. */ \
MIPS_DEFAULT_ISA_LEVEL_SPEC, \
\
/* Make sure a -mips option is present. This helps us to pick \
the right multilib, and also makes the later specs easier \
to write. */ \

3
gcc/config/mips/mti-linux.h
View File

@ -31,6 +31,9 @@ along with GCC; see the file COPYING3. If not see
#undef DRIVER_SELF_SPECS
#define DRIVER_SELF_SPECS \
/* Set the ISA for the default multilib. */ \
MIPS_DEFAULT_ISA_LEVEL_SPEC, \
\
/* Make sure a -mips option is present. This helps us to pick \
the right multilib, and also makes the later specs easier \
to write. */ \

3
gcc/config/mips/sde.h
View File

@ -20,6 +20,9 @@ along with GCC; see the file COPYING3. If not see
#undef DRIVER_SELF_SPECS
#define DRIVER_SELF_SPECS \
/* Set the ISA for the default multilib. */ \
MIPS_DEFAULT_ISA_LEVEL_SPEC, \
\
/* Make sure a -mips option is present. This helps us to pick \
the right multilib, and also makes the later specs easier \
to write. */ \