--- a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp Thu Sep 22 18:23:15 2016 +0200
+++ b/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp Thu Sep 22 18:29:15 2016 +0200
@@ -1,5 +1,5 @@
/*
- * 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
@@ -361,6 +361,8 @@
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) {