--- a/jdk/make/gensrc/GensrcVarHandles.gmk Mon Jun 06 16:18:01 2016 -0700
+++ b/jdk/make/gensrc/GensrcVarHandles.gmk Wed Jun 15 11:20:15 2016 +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))