--- a/make-rules/makemaker.mk	Mon Feb 11 08:59:55 2013 -0800
+++ b/make-rules/makemaker.mk	Mon Feb 11 10:12:25 2013 -0800
@@ -21,8 +21,8 @@
 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
-# we only do 32 bit perl for now.
-BITS=32
+# Perl 5.12 and older are 32-bit only.
+# Perl 5.16 and newer are 64-bit only.
 
 COMMON_PERL_ENV +=	MAKE=$(GMAKE)
 COMMON_PERL_ENV +=	PATH=$(dir $(CC)):$(SPRO_VROOT)/bin:$(PATH)
@@ -33,18 +33,24 @@
 # Yes.  Perl is just scripts, for now, but we need architecture
 # directories so that it populates all architecture prototype
 # directories.
-PERLBD_ARCH = $(BUILD_DIR)/$(MACH32)
 
-$(PERLBD_ARCH)-5.12/.configured:		PERL_VERSION=5.12
+$(BUILD_DIR)/$(MACH32)-5.12/.configured:	PERL_VERSION=5.12
+$(BUILD_DIR)/$(MACH32)-5.12/.configured:	BITS=32
+$(BUILD_DIR)/$(MACH64)-5.16/.configured:	PERL_VERSION=5.16
+$(BUILD_DIR)/$(MACH64)-5.16/.configured:	BITS=64
 
-BUILD_32 =	$(PERL_VERSIONS:%=$(PERLBD_ARCH)-%/.built)
-INSTALL_32 =	$(BUILD_32:%/.built=%/.installed)
-TEST_32 =	$(BUILD_32:%/.built=%/.tested)
+BUILD_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.built
+BUILD_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.built
 
+INSTALL_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.installed
+INSTALL_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.installed
+
+TEST_32 =	$(BUILD_DIR)/$(MACH32)-5.12/.tested
+TEST_64 =	$(BUILD_DIR)/$(MACH64)-5.16/.tested
 
 COMPONENT_CONFIGURE_ENV +=	$(COMMON_PERL_ENV)
 COMPONENT_CONFIGURE_ENV +=	PERL="$(PERL)"
-$(PERLBD_ARCH)-%/.configured:	$(SOURCE_DIR)/.prep
+$(BUILD_DIR)/%/.configured:	$(SOURCE_DIR)/.prep
 	($(RM) -r $(@D) ; $(MKDIR) $(@D))
 	$(CLONEY) $(SOURCE_DIR) $(@D)
 	$(COMPONENT_PRE_CONFIGURE_ACTION)
@@ -55,7 +61,7 @@
 
 
 COMPONENT_BUILD_ENV +=	$(COMMON_PERL_ENV)
-$(PERLBD_ARCH)-%/.built:	$(PERLBD_ARCH)-%/.configured
+$(BUILD_DIR)/%/.built:	$(BUILD_DIR)/%/.configured
 	$(COMPONENT_PRE_BUILD_ACTION)
 	(cd $(@D) ; $(ENV) $(COMPONENT_BUILD_ENV) \
 		$(GMAKE) $(COMPONENT_BUILD_ARGS) $(COMPONENT_BUILD_TARGETS))
@@ -66,7 +72,7 @@
 COMPONENT_INSTALL_ARGS +=	DESTDIR="$(PROTO_DIR)"
 COMPONENT_INSTALL_TARGETS =	install_vendor
 COMPONENT_INSTALL_ENV +=	$(COMMON_PERL_ENV)
-$(PERLBD_ARCH)-%/.installed:	$(PERLBD_ARCH)-%/.built
+$(BUILD_DIR)/%/.installed:	$(BUILD_DIR)/%/.built
 	$(COMPONENT_PRE_INSTALL_ACTION)
 	(cd $(@D) ; $(ENV) $(COMPONENT_INSTALL_ENV) $(GMAKE) \
 			$(COMPONENT_INSTALL_ARGS) $(COMPONENT_INSTALL_TARGETS))
@@ -76,7 +82,7 @@
 
 COMPONENT_TEST_TARGETS =	check
 COMPONENT_TEST_ENV +=	$(COMMON_PERL_ENV)
-$(PERLBD_ARCH)-%/.tested:	$(PERLBD_ARCH)-%/.built
+$(BUILD_DIR)/%/.tested:	$(BUILD_DIR)/%/.built
 	$(COMPONENT_PRE_TEST_ACTION)
 	(cd $(@D) ; $(ENV) $(COMPONENT_TEST_ENV) $(GMAKE) \
 			$(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))