--- old/make/gensrc/GensrcVarHandles.gmk	2016-05-31 12:16:44.750380050 +0300
+++ new/make/gensrc/GensrcVarHandles.gmk	2016-05-31 12:16:44.658380387 +0300
@@ -38,14 +38,18 @@
 
   $1_FILENAME := $(VARHANDLES_GENSRC_DIR)/VarHandle$$($1_Type)s.java
 
-  ifneq ($$(findstring $$($1_Type), Object Int Long), )
+  ifneq ($$(findstring $$($1_Type), Object Boolean Byte Short Char Int Long), )
     $1_ARGS += -KCAS
   endif
 
-  ifneq ($$(findstring $$($1_Type), Int Long), )
+  ifneq ($$(findstring $$($1_Type), Byte Short Char Int Long), )
     $1_ARGS += -KAtomicAdd
   endif
 
+  ifneq ($$(findstring $$($1_Type), Byte Short Char), )
+    $1_ARGS += -KShorterThanInt
+  endif
+
   $$($1_FILENAME): $(VARHANDLES_SRC_DIR)/X-VarHandle.java.template $(BUILD_TOOLS_JDK)
         ifeq ($$($1_Type), Object)
 	  $$(eval $1_type := $$($1_Type))