diff -r 4623e6c3f435 -r df76d62dc5ff jdk/makefiles/CompileLaunchers.gmk
--- a/jdk/makefiles/CompileLaunchers.gmk	Tue Oct 22 13:56:19 2013 -0700
+++ b/jdk/makefiles/CompileLaunchers.gmk	Tue Oct 22 16:14:34 2013 -0700
@@ -574,9 +574,7 @@
   BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
 endif
 ifeq ($(OPENJDK_TARGET_OS), solaris)
-  ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
-    BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
-  endif
+  BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
 endif
 
 # TODO: