581   endif
 582 endif
 583 
 584 # TODO: 
 585 # On windows java-rmi.cgi shouldn't be bundled since Java 1.2, but has been built all
 586 # this time anyway. Since jdk6, it has been built from the wrong source and resulted
 587 # in a (almost) copy of the standard java launcher named "java-rmi.exe" ending up in 
 588 # the final images bin dir. This weird behavior is mimicked here in the converted 
 589 # makefiles for now. Should probably just be deleted.
 590 # http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6512052
 591 ifeq ($(OPENJDK_TARGET_OS),windows)
 592     $(eval $(call SetupLauncher,java-rmi,,\
 593         $(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/makefiles/java/main/java/mapfile-$(OPENJDK_TARGET_CPU))))
 594 else
 595     $(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh
 596         $(call install-file)
 597         $(CHMOD) a+x $@
 598 endif
 599 
 600 ##########################################################################################







































 601 # jabswitch
 602 
 603 ifndef OPENJDK
 604 ifeq ($(OPENJDK_TARGET_OS),windows)
 605 
 606     $(eval $(call SetupNativeCompilation,BUILD_JABSWITCH,\
 607                 SRC:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge,\
 608                 INCLUDE_FILES:=jabswitch.cpp,\
 609                 LANG:=C++,\
 610                 CFLAGS:=$(filter-out -Zc:wchar_t-,$(CFLAGS_JDKEXE)) -Zc:wchar_t \
 611                         -analyze- -Od -Gd -D_WINDOWS \
 612                         -D_UNICODE -DUNICODE -RTC1 -EHsc,\
 613                 LDFLAGS:=$(LDFLAGS_JDKEXE) \
 614                          Advapi32.lib Version.lib User32.lib,\
 615                 OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jabswitch,\
 616                 OUTPUT_DIR:=$(JDK_OUTPUTDIR)/bin,\
 617                 PROGRAM:=jabswitch,\
 618                 DEBUG_SYMBOLS:=true,\
 619                 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/AccessBridgeStatusWindow.rc,\
 620                 RC_FLAGS:=$(RC_FLAGS),\

 581   endif
 582 endif
 583 
 584 # TODO: 
 585 # On windows java-rmi.cgi shouldn't be bundled since Java 1.2, but has been built all
 586 # this time anyway. Since jdk6, it has been built from the wrong source and resulted
 587 # in a (almost) copy of the standard java launcher named "java-rmi.exe" ending up in 
 588 # the final images bin dir. This weird behavior is mimicked here in the converted 
 589 # makefiles for now. Should probably just be deleted.
 590 # http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6512052
 591 ifeq ($(OPENJDK_TARGET_OS),windows)
 592     $(eval $(call SetupLauncher,java-rmi,,\
 593         $(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/makefiles/java/main/java/mapfile-$(OPENJDK_TARGET_CPU))))
 594 else
 595     $(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh
 596         $(call install-file)
 597         $(CHMOD) a+x $@
 598 endif
 599 
 600 ##########################################################################################
 601  
 602 BUILD_JSPAWNHELPER := 
 603 BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/solaris/native/java/lang
 604 BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
 605 LINK_JSPAWNHELPER_OBJECTS := $(JDK_OUTPUTDIR)/objs/libjava/childproc.o
 606 LINK_JSPAWNHELPER_FLAGS :=
 607 
 608 #
 609 # jdk/make/java/java/Makefile
 610 #
 611 ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris),)
 612     BUILD_JSPAWNHELPER := 1
 613 endif
 614 
 615 ifeq ($(OPENJDK_TARGET_OS), macosx)
 616     BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib
 617 endif
 618 
 619 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
 620     LINK_JSPAWNHELPER_FLAGS += -m64
 621 endif
 622 
 623 ifeq ($(BUILD_JSPAWNHELPER), 1)
 624     $(eval $(call SetupNativeCompilation,BUILD_JSPAWNHELPER,\
 625         SRC:=$(BUILD_JSPAWNHELPER_SRC),\
 626         INCLUDE_FILES:=jspawnhelper.c,\
 627         LANG:=C,\
 628         OPTIMIZATION := LOW, \
 629         CFLAGS:=$(CFLAGS_JDKEXE), \
 630         LDFLAGS:=$(LDFLAGS_JDKEXE) $(LINK_JSPAWNHELPER_FLAGS), \
 631         LDFLAGS_SUFFIX:= $(LINK_JSPAWNHELPER_OBJECTS), \
 632         OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jspawnhelper,\
 633         OUTPUT_DIR:=$(BUILD_JSPAWNHELPER_DST_DIR),\
 634         PROGRAM:=jspawnhelper))
 635 
 636     BUILD_LAUNCHERS += $(BUILD_JSPAWNHELPER)
 637 endif
 638 
 639 ##########################################################################################
 640 # jabswitch
 641 
 642 ifndef OPENJDK
 643 ifeq ($(OPENJDK_TARGET_OS),windows)
 644 
 645     $(eval $(call SetupNativeCompilation,BUILD_JABSWITCH,\
 646                 SRC:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge,\
 647                 INCLUDE_FILES:=jabswitch.cpp,\
 648                 LANG:=C++,\
 649                 CFLAGS:=$(filter-out -Zc:wchar_t-,$(CFLAGS_JDKEXE)) -Zc:wchar_t \
 650                         -analyze- -Od -Gd -D_WINDOWS \
 651                         -D_UNICODE -DUNICODE -RTC1 -EHsc,\
 652                 LDFLAGS:=$(LDFLAGS_JDKEXE) \
 653                          Advapi32.lib Version.lib User32.lib,\
 654                 OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jabswitch,\
 655                 OUTPUT_DIR:=$(JDK_OUTPUTDIR)/bin,\
 656                 PROGRAM:=jabswitch,\
 657                 DEBUG_SYMBOLS:=true,\
 658                 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/AccessBridgeStatusWindow.rc,\
 659                 RC_FLAGS:=$(RC_FLAGS),\