--- a/hotspot/test/compiler/intrinsics/sha/cli/SHAOptionsBase.java	Mon Nov 07 10:12:14 2016 +0100
+++ b/hotspot/test/compiler/intrinsics/sha/cli/SHAOptionsBase.java	Mon Oct 31 11:36:45 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,7 +74,7 @@
      *         instructions required by the option are not supported.
      */
     public static String getWarningForUnsupportedCPU(String optionName) {
-        if (Platform.isSparc() || Platform.isAArch64() ||
+        if (Platform.isAArch64() || Platform.isS390x() || Platform.isSparc() ||
             Platform.isX64() || Platform.isX86()) {
             switch (optionName) {
             case SHAOptionsBase.USE_SHA_OPTION:
@@ -89,7 +89,7 @@
                 throw new Error("Unexpected option " + optionName);
             }
         } else {
-            throw new Error("Support for CPUs different fromn X86, SPARC, and AARCH64 "
+            throw new Error("Support for CPUs different fromn AARCH64, S390x, SPARC, and X86 "
                             + "is not implemented");
         }
     }