From 79859bc5dd7f54847e8042f612c8bc35ecf40b10 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Mon, 18 Apr 2016 11:30:12 +0200 Subject: [PATCH 1/2] 8153275: Zero JVM fails to initialize after JDK-8152440 Use a value for InitArrayShortSize which passes validation Reviewed-by: aph, andrew, coleenp --- hotspot/src/cpu/zero/vm/globals_zero.hpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hotspot/src/cpu/zero/vm/globals_zero.hpp b/hotspot/src/cpu/zero/vm/globals_zero.hpp index 52a3cacbd70..eb09f466c62 100644 --- a/hotspot/src/cpu/zero/vm/globals_zero.hpp +++ b/hotspot/src/cpu/zero/vm/globals_zero.hpp @@ -43,7 +43,12 @@ define_pd_global(intx, CodeEntryAlignment, 32); define_pd_global(intx, OptoLoopAlignment, 16); define_pd_global(intx, InlineFrequencyCount, 100); define_pd_global(intx, InlineSmallCode, 1000); -define_pd_global(intx, InitArrayShortSize, -1); // not used + +// not used, but must satisfy following constraints: +// 1.) must be in the allowed range for intx *and* +// 2.) % BytesPerLong == 0 so as to not +// violate the constraint verifier on JVM start-up. +define_pd_global(intx, InitArrayShortSize, 0); #define DEFAULT_STACK_YELLOW_PAGES (2) #define DEFAULT_STACK_RED_PAGES (1) From 2aff402303141be1b02c049ef3bbd8772dbf53ce Mon Sep 17 00:00:00 2001 From: Coleen Phillimore Date: Thu, 21 Apr 2016 02:58:04 -0400 Subject: [PATCH 2/2] 8154280: Zero build fails with undeclared G1LastPLABAverageOccupancy Reviewed-by: twisti --- hotspot/src/share/vm/gc/g1/g1EvacStats.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/src/share/vm/gc/g1/g1EvacStats.cpp b/hotspot/src/share/vm/gc/g1/g1EvacStats.cpp index 0a66488f71d..2b6c3917800 100644 --- a/hotspot/src/share/vm/gc/g1/g1EvacStats.cpp +++ b/hotspot/src/share/vm/gc/g1/g1EvacStats.cpp @@ -24,6 +24,7 @@ #include "precompiled.hpp" #include "memory/allocation.inline.hpp" +#include "gc/g1/g1_globals.hpp" #include "gc/g1/g1EvacStats.hpp" #include "gc/shared/gcId.hpp" #include "logging/log.hpp"