src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp

rev 12121 : [mq]: all_changes.patch

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -359,10 +359,12 @@
    }
 
   int minimum_alignment = 16;
 #if defined(SPARC) || (defined(X86) && !defined(AMD64))
   minimum_alignment = 4;
+#elif defined(S390)
+  minimum_alignment = 2;
 #endif
 
   if (InteriorEntryAlignment < minimum_alignment) {
     CommandLineError::print(verbose,
                             "InteriorEntryAlignment (" INTX_FORMAT ") must be "