[PATCH][SPARC] Fix cpu auto-detection in M7 and S7 (Sonoma)

[Jose E. Marchesi]

Starting with the M7 we will be using the same identifiers to identify
the cpu in both Solaris (via kstat) and GNU/Linux (via /proc/cpuinfo).
This little patch fixes the SPARC M7 entry in cpu_names, and also adds
an entry for the Sonoma SoC.

Tested in sparc64-*-linux-gnu, sparcv9-*-linux-gnu and
sparc-sun-solaris2.11 targets.

2016-06-08  Jose E. Marchesi  <jose.march...@oracle.com>

        * config/sparc/driver-sparc.c (cpu_names): Fix the entry for the
        SPARC-M7 and add an entry for SPARC-S7 cpus (Sonoma).


diff --git a/gcc/config/sparc/driver-sparc.c b/gcc/config/sparc/driver-sparc.c
index b81763e..ea174bf 100644
--- a/gcc/config/sparc/driver-sparc.c
+++ b/gcc/config/sparc/driver-sparc.c
@@ -57,7 +57,6 @@ static const struct cpu_names {
   { "UltraSPARC-T2+",  "niagara2" },
   { "SPARC-T3",                "niagara3" },
   { "SPARC-T4",                "niagara4" },
-  { "SPARC-M7",                "niagara7" },
 #else
   { "SuperSparc",      "supersparc" },
   { "HyperSparc",      "hypersparc" },
@@ -74,9 +73,10 @@ static const struct cpu_names {
   { "UltraSparc T2",   "niagara2" },
   { "UltraSparc T3",   "niagara3" },
   { "UltraSparc T4",   "niagara4" },
-  { "UltraSparc M7",   "niagara7" },
   { "LEON",            "leon3" },
 #endif
+  { "SPARC-M7",                "niagara7" },
+  { "SPARC-S7",                "niagara7" },
   { NULL,      NULL }
   };