diff -r 33c794d84ba4 -r 09a6352d52ad make-rules/makemaker.mk
--- a/make-rules/makemaker.mk	Thu Mar 10 11:56:21 2016 -0800
+++ b/make-rules/makemaker.mk	Thu Mar 10 12:36:54 2016 -0800
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 # Perl 5.12 and older are 32-bit only.
-# Perl 5.16 and newer are 64-bit only.
+# Perl 5.20 and newer are 64-bit only.
 
 COMMON_PERL_ENV +=	MAKE=$(GMAKE)
 COMMON_PERL_ENV +=	PATH=$(dir $(CC)):$(SPRO_VROOT)/bin:$(PATH)
@@ -38,61 +38,61 @@
 $(BUILD_DIR)/$(MACH32)-5.12/.configured:	BITS=32
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.configured:	PERL_VERSION=5.12-mt
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.configured:	BITS=32
-$(BUILD_DIR)/$(MACH64)-5.16/.configured:	PERL_VERSION=5.16
-$(BUILD_DIR)/$(MACH64)-5.16/.configured:	BITS=64
 $(BUILD_DIR)/$(MACH64)-5.20/.configured:	PERL_VERSION=5.20
 $(BUILD_DIR)/$(MACH64)-5.20/.configured:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.22/.configured:	PERL_VERSION=5.22
+$(BUILD_DIR)/$(MACH64)-5.22/.configured:	BITS=64
 
 
 $(BUILD_DIR)/$(MACH32)-5.12/.tested:	PERL_VERSION=5.12
 $(BUILD_DIR)/$(MACH32)-5.12/.tested:	BITS=32
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.tested:	PERL_VERSION=5.12-mt
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.tested:	BITS=32
-$(BUILD_DIR)/$(MACH64)-5.16/.tested:	PERL_VERSION=5.16
-$(BUILD_DIR)/$(MACH64)-5.16/.tested:	BITS=64
 $(BUILD_DIR)/$(MACH64)-5.20/.tested:	PERL_VERSION=5.20
 $(BUILD_DIR)/$(MACH64)-5.20/.tested:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.22/.tested:	PERL_VERSION=5.22
+$(BUILD_DIR)/$(MACH64)-5.22/.tested:	BITS=64
 
 
 $(BUILD_DIR)/$(MACH32)-5.12/.tested-and-compared:	PERL_VERSION=5.12
 $(BUILD_DIR)/$(MACH32)-5.12/.tested-and-compared:	BITS=32
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.tested-and-compared:	PERL_VERSION=5.12-mt
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.tested-and-compared:	BITS=32
-$(BUILD_DIR)/$(MACH64)-5.16/.tested-and-compared:	PERL_VERSION=5.16
-$(BUILD_DIR)/$(MACH64)-5.16/.tested-and-compared:	BITS=64
 $(BUILD_DIR)/$(MACH64)-5.20/.tested-and-compared:	PERL_VERSION=5.20
 $(BUILD_DIR)/$(MACH64)-5.20/.tested-and-compared:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.22/.tested-and-compared:	PERL_VERSION=5.22
+$(BUILD_DIR)/$(MACH64)-5.22/.tested-and-compared:	BITS=64
 
 
 $(BUILD_DIR)/$(MACH32)-5.12/.system-tested:	PERL_VERSION=5.12
 $(BUILD_DIR)/$(MACH32)-5.12/.system-tested:	BITS=32
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested:	PERL_VERSION=5.12-mt
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested:	BITS=32
-$(BUILD_DIR)/$(MACH64)-5.16/.system-tested:	PERL_VERSION=5.16
-$(BUILD_DIR)/$(MACH64)-5.16/.system-tested:	BITS=64
 $(BUILD_DIR)/$(MACH64)-5.20/.system-tested:	PERL_VERSION=5.20
 $(BUILD_DIR)/$(MACH64)-5.20/.system-tested:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.22/.system-tested:	PERL_VERSION=5.22
+$(BUILD_DIR)/$(MACH64)-5.22/.system-tested:	BITS=64
 
 
 $(BUILD_DIR)/$(MACH32)-5.12/.system-tested-and-compared:	PERL_VERSION=5.12
 $(BUILD_DIR)/$(MACH32)-5.12/.system-tested-and-compared:	BITS=32
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested-and-compared:	PERL_VERSION=5.12-mt
 $(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested-and-compared:	BITS=32
-$(BUILD_DIR)/$(MACH64)-5.16/.system-tested-and-compared:	PERL_VERSION=5.16
-$(BUILD_DIR)/$(MACH64)-5.16/.system-tested-and-compared:	BITS=64
 $(BUILD_DIR)/$(MACH64)-5.20/.system-tested-and-compared:	PERL_VERSION=5.20
 $(BUILD_DIR)/$(MACH64)-5.20/.system-tested-and-compared:	BITS=64
+$(BUILD_DIR)/$(MACH64)-5.22/.system-tested-and-compared:	PERL_VERSION=5.22
+$(BUILD_DIR)/$(MACH64)-5.22/.system-tested-and-compared:	BITS=64
 
 
 BUILD_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.built
 BUILD_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.built
-BUILD_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.built
-BUILD_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.built
+BUILD_64 =	$(BUILD_DIR)/$(MACH64)-5.20/.built
+BUILD_64 +=	$(BUILD_DIR)/$(MACH64)-5.22/.built
 
 INSTALL_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.installed
 INSTALL_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.installed
-INSTALL_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.installed
-INSTALL_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.installed
+INSTALL_64 =	$(BUILD_DIR)/$(MACH64)-5.20/.installed
+INSTALL_64 +=	$(BUILD_DIR)/$(MACH64)-5.22/.installed
 
 COMPONENT_CONFIGURE_ENV +=	$(COMMON_PERL_ENV)
 COMPONENT_CONFIGURE_ENV +=	PERL="$(PERL)"
@@ -145,25 +145,25 @@
 ifeq ($(strip $(wildcard $(COMPONENT_TEST_RESULTS_DIR)/results-*.master)),)
 TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.tested
 TEST_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.tested
-TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.tested
-TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.tested
+TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.20/.tested
+TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.22/.tested
 else
 TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.tested-and-compared
 TEST_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.tested-and-compared
-TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.tested-and-compared
-TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.tested-and-compared
+TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.20/.tested-and-compared
+TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.22/.tested-and-compared
 endif
 
 ifeq ($(strip $(wildcard $(COMPONENT_TEST_RESULTS_DIR)/results-*.master)),)
 SYSTEM_TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.system-tested
 SYSTEM_TEST_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested
-SYSTEM_TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.system-tested
-SYSTEM_TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.system-tested
+SYSTEM_TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.20/.system-tested
+SYSTEM_TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.22/.system-tested
 else
 SYSTEM_TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.system-tested-and-compared
 SYSTEM_TEST_32 +=	$(BUILD_DIR)/$(MACH32)-5.12-mt/.system-tested-and-compared
-SYSTEM_TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.system-tested-and-compared
-SYSTEM_TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.20/.system-tested-and-compared
+SYSTEM_TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.20/.system-tested-and-compared
+SYSTEM_TEST_64 +=	$(BUILD_DIR)/$(MACH64)-5.22/.system-tested-and-compared
 endif
 
 # test the built source
@@ -238,9 +238,9 @@
 ifneq ($(findstring 5.12-mt, $(PERL_VERSIONS)),)
 REQUIRED_PACKAGES += runtime/perl-threaded-512
 endif
-ifneq ($(findstring 5.16, $(PERL_VERSIONS)),)
-REQUIRED_PACKAGES += runtime/perl-516
-endif
 ifneq ($(findstring 5.20, $(PERL_VERSIONS)),)
 REQUIRED_PACKAGES += runtime/perl-520
 endif
+ifneq ($(findstring 5.22, $(PERL_VERSIONS)),)
+REQUIRED_PACKAGES += runtime/perl-522
+endif