diff options
| author | Segher Boessenkool <segher@kernel.crashing.org> | 2022-03-11 21:15:18 +0000 |
|---|---|---|
| committer | Segher Boessenkool <segher@kernel.crashing.org> | 2022-03-12 16:02:19 +0000 |
| commit | 80fcc4b6afee72443bef551064826b3b4b6785e6 (patch) | |
| tree | 7c2ea4cad4efd8d729f7162b41202c139debe819 | |
| parent | a07b8f4fb756484893b5612cbe9410970dc76db9 (diff) | |
| download | gcc-80fcc4b6afee72443bef551064826b3b4b6785e6.zip gcc-80fcc4b6afee72443bef551064826b3b4b6785e6.tar.gz gcc-80fcc4b6afee72443bef551064826b3b4b6785e6.tar.bz2 | |
rs6000: Do not use rs6000_cpu for .machine ppc and ppc64 (PR104829)
Fixes: 77eccbf39ed5
rs6000.h has
#define PROCESSOR_POWERPC PROCESSOR_PPC604
#define PROCESSOR_POWERPC64 PROCESSOR_RS64A
which means that if you use things like -mcpu=powerpc -mvsx it will no
longer work after my latest .machine patch. This causes GCC build errors
in some cases, not a good idea (even if the errors are actually
pre-existing: using -mvsx with a machine that does not have VSX cannot
work properly).
2022-03-11 Segher Boessenkool <segher@kernel.crashing.org>
PR target/104829
* config/rs6000/rs6000.cc (rs6000_machine_from_flags): Don't output
"ppc" and "ppc64" based on rs6000_cpu.
| -rw-r--r-- | gcc/config/rs6000/rs6000.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc index 3afe78f..283e830 100644 --- a/gcc/config/rs6000/rs6000.cc +++ b/gcc/config/rs6000/rs6000.cc @@ -5804,20 +5804,28 @@ rs6000_machine_from_flags (void) if (rs6000_cpu == PROCESSOR_MPCCORE) return "\"821\""; +#if 0 + /* This (and ppc64 below) are disabled here (for now at least) because + PROCESSOR_POWERPC, PROCESSOR_POWERPC64, and PROCESSOR_COMMON + are #define'd as some of these. Untangling that is a job for later. */ + /* 600 series and 700 series, "classic" */ if (rs6000_cpu == PROCESSOR_PPC601 || rs6000_cpu == PROCESSOR_PPC603 || rs6000_cpu == PROCESSOR_PPC604 || rs6000_cpu == PROCESSOR_PPC604e - || rs6000_cpu == PROCESSOR_PPC750 || rs6000_cpu == PROCESSOR_POWERPC) + || rs6000_cpu == PROCESSOR_PPC750) return "ppc"; +#endif /* Classic with AltiVec, "G4" */ if (rs6000_cpu == PROCESSOR_PPC7400 || rs6000_cpu == PROCESSOR_PPC7450) return "\"7450\""; +#if 0 /* The older 64-bit CPUs */ if (rs6000_cpu == PROCESSOR_PPC620 || rs6000_cpu == PROCESSOR_PPC630 - || rs6000_cpu == PROCESSOR_RS64A || rs6000_cpu == PROCESSOR_POWERPC64) + || rs6000_cpu == PROCESSOR_RS64A) return "ppc64"; +#endif HOST_WIDE_INT flags = rs6000_isa_flags; |