s390: Add zEC12 machine model. Fix spelling for some older models.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12905

diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
index a468f8d9e57c9614d9144b59a82b9006c3958856..04f05c762eb65d8d29ca119cbba7ab1edacbeed4 100644 (file)
--- a/coregrind/m_machine.c
+++ b/coregrind/m_machine.c
@@ -531,6 +531,7 @@ static UInt VG_(get_machine_model)(void)
       { "2098", VEX_S390X_MODEL_Z10_BC },
       { "2817", VEX_S390X_MODEL_Z196 },
       { "2818", VEX_S390X_MODEL_Z114 },
+      { "2827", VEX_S390X_MODEL_ZEC12 },
    };
 
    Int    model, n, fh;

diff --git a/tests/s390x_features.c b/tests/s390x_features.c
index f0fdb63462a1dfdb36ecbf9304e7b160a22f91a7..837d83eda2f0fdc5d6b23020767ca9ac49b73885 100644 (file)
--- a/tests/s390x_features.c
+++ b/tests/s390x_features.c
@@ -79,12 +79,13 @@ model_info models[] = {
    { "2066", "z800"   },
    { "2084", "z990"   },
    { "2086", "z890"   },
-   { "2094", "z9-ec"  },
-   { "2096", "z9-bc"  },
-   { "2097", "z10-ec" },
-   { "2098", "z10-bc" },
+   { "2094", "z9-EC"  },
+   { "2096", "z9-BC"  },
+   { "2097", "z10-EC" },
+   { "2098", "z10-BC" },
    { "2817", "z196"   },
    { "2818", "z114"   },
+   { "2827", "zEC12"  },
 };