diff options
author | Jozef Lawrynowicz <jozef.l@mittosystems.com> | 2020-09-07 17:35:04 +0100 |
---|---|---|
committer | Jozef Lawrynowicz <jozef.l@mittosystems.com> | 2020-09-07 17:35:04 +0100 |
commit | 7f87e446691f1debfe2671a40f8738bd5e128832 (patch) | |
tree | 7b55127322a9db6b09f7a224a9455f3480343ac4 /gcc/config/msp430 | |
parent | 84e9fc470f57c9a53295c3f7ebe805523cdd181c (diff) | |
download | gcc-7f87e446691f1debfe2671a40f8738bd5e128832.zip gcc-7f87e446691f1debfe2671a40f8738bd5e128832.tar.gz gcc-7f87e446691f1debfe2671a40f8738bd5e128832.tar.bz2 |
MSP430: Don't override default ISA when MCU name is unrecognized
430X is the default ISA under normal operation, so even when the MCU name
passed to -mmcu= is unrecognized, it should not be overriden.
gcc/ChangeLog:
* config/msp430/msp430.c (msp430_option_override): Don't set the
ISA to 430 when the MCU is unrecognized.
gcc/testsuite/ChangeLog:
* gcc.target/msp430/430x-default-isa.c: New test.
Diffstat (limited to 'gcc/config/msp430')
-rw-r--r-- | gcc/config/msp430/msp430.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c index c2b2497..129b916 100644 --- a/gcc/config/msp430/msp430.c +++ b/gcc/config/msp430/msp430.c @@ -223,7 +223,7 @@ msp430_option_override (void) if (target_cpu == NULL) warning (0, "Unrecognized MCU name %qs, assuming that it is " - "just a MSP430 with no hardware multiply.\n" + "just a MSP430X with no hardware multiply.\n" "Use the %<-mcpu%> and %<-mhwmult%> options to " "set these explicitly.", target_mcu); @@ -242,22 +242,15 @@ msp430_option_override (void) if (msp430_warn_mcu) warning (0, "Unrecognized MCU name %qs, assuming that it just " - "supports the MSP430 ISA.\nUse the %<-mcpu%> option " + "supports the MSP430X ISA.\nUse the %<-mcpu%> option " "to set the ISA explicitly.", target_mcu); - - msp430x = false; } else if (msp430_warn_mcu) warning (0, "Unrecognized MCU name %qs.", target_mcu); } } - /* The F5 series are all able to support the 430X ISA. */ - if (target_cpu == NULL && target_mcu == NULL - && msp430_hwmult_type == MSP430_HWMULT_F5SERIES) - msp430x = true; - if (TARGET_LARGE && !msp430x) error ("%<-mlarge%> requires a 430X-compatible %<-mmcu=%>"); |