diff options
Diffstat (limited to 'gcc-4.9/gcc/config/mips/mti-linux.h')
-rw-r--r-- | gcc-4.9/gcc/config/mips/mti-linux.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc-4.9/gcc/config/mips/mti-linux.h b/gcc-4.9/gcc/config/mips/mti-linux.h index d9b65f82c..101c82a5a 100644 --- a/gcc-4.9/gcc/config/mips/mti-linux.h +++ b/gcc-4.9/gcc/config/mips/mti-linux.h @@ -48,11 +48,13 @@ along with GCC; see the file COPYING3. If not see or -mgp setting. */ \ "%{!mabi=*: %{" MIPS_32BIT_OPTION_SPEC ": -mabi=32;: -mabi=n32}}", \ \ - /* If no FP option is specified, infer one from the ABI/ISA level. */\ - "%{!mfp*: %{mabi=32: %{" MIPS_FPXX_OPTION_SPEC ": -mfpxx}}}", \ + /* If no FP ABI option is specified, infer one from the \ + ABI/ISA level unless there is a conflicting option. */ \ + "%{!msoft-float: %{!msingle-float: %{!mfp*: %{!mmsa: %{mabi=32: %{" \ + MIPS_FPXX_OPTION_SPEC ": -mfpxx}}}}}}", \ \ /* Base SPECs. */ \ BASE_DRIVER_SELF_SPECS \ \ /* Use the standard linux specs for everything else. */ \ - LINUX64_DRIVER_SELF_SPECS + LINUX_DRIVER_SELF_SPECS |