--- old/makefiles/CompileLaunchers.gmk	Sat Dec 22 03:00:07 2012
+++ new/makefiles/CompileLaunchers.gmk	Sat Dec 22 03:00:06 2012
@@ -500,13 +500,13 @@
 # jdk/make/java/Makefile
 #
 ifeq ($(OPENJDK_TARGET_OS), solaris)
-	ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
-		BUILD_JEXEC := 1
-	endif
+    ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
+        BUILD_JEXEC := 1
+    endif
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), linux)
-	BUILD_JEXEC := 1
+    BUILD_JEXEC := 1
 endif # OPENJDK_TARGET_OS
 
 #
@@ -514,17 +514,17 @@
 #
 ifeq ($(BUILD_JEXEC), 1)
 
-	ifeq ($(OPENJDK_TARGET_OS),windows)
-	else ifeq ($(OPENJDK_TARGET_OS),macosx)
-		BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/macosx/bin
-	else
-		BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/solaris/bin
-	endif
+    ifeq ($(OPENJDK_TARGET_OS),windows)
+    else ifeq ($(OPENJDK_TARGET_OS),macosx)
+        BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/macosx/bin
+    else
+        BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/solaris/bin
+    endif
 
-	ifeq ($(OPENJDK_TARGET_OS), linux)
+    ifeq ($(OPENJDK_TARGET_OS), linux)
                 BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib
-		BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/share/bin
-	endif
+        BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/share/bin
+    endif
 endif
 
 #
@@ -533,21 +533,21 @@
 #
 ifneq ($(BUILD_JEXEC_SRC),)
         $(eval $(call SetupNativeCompilation,BUILD_JEXEC,\
-		SRC:=$(BUILD_JEXEC_SRC),\
-		INCLUDE_FILES:=jexec.c,\
-		LANG:=C,\
-		OPTIMIZATION := LOW, \
-		CFLAGS:=$(CFLAGS_JDKEXE)\
+        SRC:=$(BUILD_JEXEC_SRC),\
+        INCLUDE_FILES:=jexec.c,\
+        LANG:=C,\
+        OPTIMIZATION := LOW, \
+        CFLAGS:=$(CFLAGS_JDKEXE)\
                         $(BUILD_JEXEC_INC), \
-		CFLAGS_linux:=-fPIC,\
-		CFLAGS_solaris:=-KPIC,\
-		LDFLAGS:=$(LDFLAGS_JDKEXE) \
-			 $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
-		OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jexec_obj,\
-		OUTPUT_DIR:=$(BUILD_JEXEC_DST_DIR),\
-		PROGRAM:=jexec))
+        CFLAGS_linux:=-fPIC,\
+        CFLAGS_solaris:=-KPIC,\
+        LDFLAGS:=$(LDFLAGS_JDKEXE) \
+             $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
+        OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jexec_obj,\
+        OUTPUT_DIR:=$(BUILD_JEXEC_DST_DIR),\
+        PROGRAM:=jexec))
 
-	BUILD_LAUNCHERS += $(BUILD_JEXEC)
+    BUILD_LAUNCHERS += $(BUILD_JEXEC)
 endif
 
 ##########################################################################################
@@ -582,6 +582,41 @@
 	$(CHMOD) a+x $@
 endif
 
+##########################################################################################
+
+BUILD_JSPAWNHELPER := 
+BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/solaris/native/java/lang
+BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
+LINK_JSPAWNHELPER_OBJECTS := $(JDK_OUTPUTDIR)/objs/libjava/childproc.o
+
+#
+# jdk/make/java/java/Makefile
+#
+ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris),)
+    BUILD_JSPAWNHELPER := 1
+endif
+
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+    BUILD_JSPAWNHELPER := 1
+    BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib
+endif
+
+ifeq ($(BUILD_JSPAWNHELPER), 1)
+        $(eval $(call SetupNativeCompilation,BUILD_JSPAWNHELPER,\
+        SRC:=$(BUILD_JSPAWNHELPER_SRC),\
+        INCLUDE_FILES:=jspawnhelper.c,\
+        LANG:=C,\
+        OPTIMIZATION := LOW, \
+        CFLAGS:=$(CFLAGS_JDKEXE), \
+        LDFLAGS:=$(LDFLAGS_JDKEXE), \
+        LDFLAGS_SUFFIX:= $(LINK_JSPAWNHELPER_OBJECTS), \
+        OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jspawnhelper,\
+        OUTPUT_DIR:=$(BUILD_JSPAWNHELPER_DST_DIR),\
+        PROGRAM:=jspawnhelper))
+
+    BUILD_LAUNCHERS += $(BUILD_JSPAWNHELPER)
+endif
+
 ##########################################################################################
 
 $(BUILD_LAUNCHERS) : $(JDK_TOPDIR)/makefiles/CompileLaunchers.gmk