diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/config/rs6000/linux64.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h index 2ded330..5c9f8e3 100644 --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h @@ -132,20 +132,29 @@ extern int dot_symbols; if ((rs6000_isa_flags & OPTION_MASK_POWERPC64) == 0) \ { \ rs6000_isa_flags |= OPTION_MASK_POWERPC64; \ - error ("%<-m64%> requires a PowerPC64 cpu"); \ + error ("%<-m64%> requires a PowerPC64 cpu"); \ } \ + if (!global_options_set.x_rs6000_current_cmodel) \ + SET_CMODEL (CMODEL_MEDIUM); \ if ((rs6000_isa_flags_explicit \ & OPTION_MASK_MINIMAL_TOC) != 0) \ { \ if (global_options_set.x_rs6000_current_cmodel \ && rs6000_current_cmodel != CMODEL_SMALL) \ error ("%<-mcmodel incompatible with other toc options%>"); \ - SET_CMODEL (CMODEL_SMALL); \ + if (TARGET_MINIMAL_TOC) \ + SET_CMODEL (CMODEL_SMALL); \ + else if (TARGET_PCREL \ + || (PCREL_SUPPORTED_BY_OS \ + && (rs6000_isa_flags_explicit \ + & OPTION_MASK_PCREL) == 0)) \ + /* Ignore -mno-minimal-toc. */ \ + ; \ + else \ + SET_CMODEL (CMODEL_SMALL); \ } \ else \ { \ - if (!global_options_set.x_rs6000_current_cmodel) \ - SET_CMODEL (CMODEL_MEDIUM); \ if (rs6000_current_cmodel != CMODEL_SMALL) \ { \ if (!global_options_set.x_TARGET_NO_FP_IN_TOC) \ |