--- old/make/jprt.properties	Mon May 21 14:10:30 2012
+++ new/make/jprt.properties	Mon May 21 14:10:30 2012
@@ -138,3 +138,7 @@
 #jprt.bundle.exclude.src.dirs=build dist webrev
 jprt.bundle.exclude.src.dirs=build webrev
 
+## Temporarily added for Modules Solaris 64bit only build
+# Do not overlay Solaris x86/x64 when building JDK for tests
+jprt.need.sibling.build=false
+
--- old/jdk/make/common/Program.gmk	Mon May 21 14:10:31 2012
+++ new/jdk/make/common/Program.gmk	Mon May 21 14:10:31 2012
@@ -99,13 +99,14 @@
   LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
   OTHER_LDLIBS += -ljli
   ifeq ($(PLATFORM), solaris)
-    ifeq ($(ARCH_DATA_MODEL), 32)
+    ## Temporarily remove for Modules Solaris 64bit only build
+    #ifeq ($(ARCH_DATA_MODEL), 32)
       LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli
       LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli
-    else
-      LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli
-      LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli
-    endif
+    #else
+    #  LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli
+    #  LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli
+    #endif
   endif
   ifeq ($(PLATFORM), linux)
     LDFLAGS += $(LDFLAG_Z_ORIGIN)
@@ -130,7 +131,7 @@
 #
 FILES_o = $(OBJDIR)/main.$(OBJECT_SUFFIX)
 
-$(ACTUAL_PROGRAM):: classes $(INIT) 
+$(ACTUAL_PROGRAM):: classes $(INIT)
 
 #
 # Windows only
@@ -149,12 +150,12 @@
 
   $(OBJDIR)/$(PROGRAM).lcf: $(OBJDIR)/$(PROGRAM).res $(FILES_o)
 	@$(prep-target)
-	@$(ECHO) $(FILES_o) > $@ 
+	@$(ECHO) $(FILES_o) > $@
   ifndef LOCAL_RESOURCE_FILE
 	@$(ECHO) $(OBJDIR)/$(PROGRAM).res >> $@
   endif
 	@$(ECHO) setargv.obj >> $@
-	@$(ECHO) Created $@ 
+	@$(ECHO) Created $@
 
 $(ACTUAL_PROGRAM):: $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX)
 	@$(install-cmd-file)
@@ -223,7 +224,7 @@
       INFO_PLIST_FILE = Info-cmdline.plist
     endif
     LDFLAGS += -sectcreate __TEXT __info_plist $(LAUNCHER_PLATFORM_SRC)/lib/$(INFO_PLIST_FILE)
-  else 
+  else
     INFO_PLIST_FILE=
   endif
 
@@ -281,7 +282,7 @@
 
 endif # PLATFORM
 
-clean:: 
+clean::
 ifeq ($(PLATFORM), windows)
 	$(RM) $(OBJDIR)/$(PROGRAM).rc
 	$(RM) $(OBJDIR)/$(PROGRAM).ico
@@ -299,7 +300,7 @@
 	$(RM) $(OBJDIR)/$(PROGRAM).diz
 
 
-clobber:: 
+clobber::
 	$(RM) $(ACTUAL_PROGRAM)
 
 #
--- old/jdk/make/common/shared/Defs-java.gmk	Mon May 21 14:10:32 2012
+++ new/jdk/make/common/shared/Defs-java.gmk	Mon May 21 14:10:32 2012
@@ -255,9 +255,10 @@
 # Since JDK_HOST_PATH defaults to OUTPUTDIR, need to add
 # ISA_DIR for sparv9 and amd64
 JDK_HOST_BINDIR=$(JDK_HOST_PATH)/bin
-ifndef ALT_JDK_HOST_PATH
-JDK_HOST_BINDIR=$(JDK_HOST_PATH)/bin$(ISA_DIR)
-endif
+## Temporarily remove for Modules Solaris 64bit only build
+#ifndef ALT_JDK_HOST_PATH
+#JDK_HOST_BINDIR=$(JDK_HOST_PATH)/bin$(ISA_DIR)
+#endif
 
 HOST_JAVA_CMD  = $(JDK_HOST_BINDIR)/java $(JAVA_TOOLS_FLAGS)
 HOST_JAVAC_CMD = $(JDK_HOST_BINDIR)/javac $(JAVAC_JVM_FLAGS) $(HOST_JAVACFLAGS)
--- old/jdk/make/common/shared/Defs.gmk	Mon May 21 14:10:33 2012
+++ new/jdk/make/common/shared/Defs.gmk	Mon May 21 14:10:33 2012
@@ -567,7 +567,9 @@
 
 # Bin directory
 #   NOTE: ISA_DIR is usually empty, on Solaris it might be /sparcv9 or /amd64
-BINDIR      = $(OUTPUTDIR)/bin$(ISA_DIR)
+## Temporarily remove for Modules Solaris 64bit only build
+#BINDIR      = $(OUTPUTDIR)/bin$(ISA_DIR)
+BINDIR      = $(OUTPUTDIR)/bin
 
 # JDK_HOST_PATH: the default location of the latest JDK that can run
 #   on the host system and supports the target class file version