This incorporates Magnus and Per's suggestions: - disable shenandoah for Zero next to other GCs and features - Make platform check simpler by not duplicating x86_64 and x86 checks. http://cr.openjdk.java.net/~rkennke/build-fixes/webrev.00/ Testing: hotspot_gc_shenandoah Ok? Roman