--- old/src/share/vm/memory/generation.hpp	2015-02-18 17:38:22.148814767 -0500
+++ new/src/share/vm/memory/generation.hpp	2015-02-18 17:38:21.192760673 -0500
@@ -145,7 +145,7 @@
     // GenGrain.
     // Note: on ARM we add 1 bit for card_table_base to be properly aligned
     // (we expect its low byte to be zero - see implementation of post_barrier)
-    LogOfGenGrain = 16 ARM_ONLY(+1),
+    LogOfGenGrain = 16 ARM32_ONLY(+1),
     GenGrain = 1 << LogOfGenGrain
   };