diff options
author | Caroline Tice <cmtice@chromium.org> | 2013-06-21 12:05:49 -0700 |
---|---|---|
committer | Caroline Tice <cmtice@chromium.org> | 2013-06-21 12:05:49 -0700 |
commit | 9c1705845241cdea5cf61574218edef282901fbd (patch) | |
tree | 021da661f8a821bc7eea277521fa13f2043879a0 /gcc/config/rs6000/rs6000-opts.h | |
parent | 9bdedf4df4166718fa0a44811c643214c6880471 (diff) | |
parent | 8a46ed36b0449c870d0a938c1010ad610ebcf4f7 (diff) | |
download | gcc-9c1705845241cdea5cf61574218edef282901fbd.tar.gz |
Merge branch 'master' into vtv
Conflicts:
gcc/ChangeLog
gcc/cp/ChangeLog
gcc/cp/decl2.c
gcc/varasm.c
libstdc++-v3/ChangeLog
Diffstat (limited to 'gcc/config/rs6000/rs6000-opts.h')
-rw-r--r-- | gcc/config/rs6000/rs6000-opts.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/gcc/config/rs6000/rs6000-opts.h b/gcc/config/rs6000/rs6000-opts.h index e143a4ca203..d528a4fd87a 100644 --- a/gcc/config/rs6000/rs6000-opts.h +++ b/gcc/config/rs6000/rs6000-opts.h @@ -30,21 +30,22 @@ /* Processor type. Order must match cpu attribute in MD file. */ enum processor_type { - PROCESSOR_RS64A, - PROCESSOR_MPCCORE, - PROCESSOR_PPC403, - PROCESSOR_PPC405, - PROCESSOR_PPC440, - PROCESSOR_PPC476, PROCESSOR_PPC601, PROCESSOR_PPC603, PROCESSOR_PPC604, PROCESSOR_PPC604e, PROCESSOR_PPC620, PROCESSOR_PPC630, + PROCESSOR_PPC750, PROCESSOR_PPC7400, PROCESSOR_PPC7450, + + PROCESSOR_PPC403, + PROCESSOR_PPC405, + PROCESSOR_PPC440, + PROCESSOR_PPC476, + PROCESSOR_PPC8540, PROCESSOR_PPC8548, PROCESSOR_PPCE300C2, @@ -53,16 +54,21 @@ enum processor_type PROCESSOR_PPCE500MC64, PROCESSOR_PPCE5500, PROCESSOR_PPCE6500, + PROCESSOR_POWER4, PROCESSOR_POWER5, PROCESSOR_POWER6, PROCESSOR_POWER7, + PROCESSOR_POWER8, + + PROCESSOR_RS64A, + PROCESSOR_MPCCORE, PROCESSOR_CELL, PROCESSOR_PPCA2, - PROCESSOR_TITAN, - PROCESSOR_POWER8 + PROCESSOR_TITAN }; + /* FP processor type. */ enum fpu_type_t { |