Changeset 40

Timestamp:

Jun 23, 2010, 10:48:53 PM (15 years ago)

Author:

dmik

Message:

hotspot/make: Adding O/2 support.

Location:

trunk/openjdk/hotspot/make

Files:

• Makefile (modified) (13 diffs)
• defs.make (modified) (6 diffs)
• os2 (added)
• os2/build.make (added)
• os2/makefiles (added)
• os2/makefiles/defs.make (added)
• os2/makefiles/generated.make (added)
• os2/makefiles/sanity.make (added)
• os2/makefiles/shared.make (added)
• os2/makefiles/top.make (added)

trunk/openjdk/hotspot/make/Makefile

@@ -20 +20 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
-#  
+#
 #
 
@@ -107 +107 @@
 # Build or export docs
 docs:
-ifeq ($(OSNAME),windows)
-        @$(ECHO) "No docs ($(VM_TARGET)) for windows"
+ifeq ($(filter-out windows os2,$(OSNAME)),)
+        @$(ECHO) "No docs ($(VM_TARGET)) for windows/os2"
 else
         $(CD) $(OUTPUTDIR); \
@@ -135 +135 @@
 generic_build1:
         $(MKDIR) -p $(OUTPUTDIR)
-ifeq ($(OSNAME),windows)
+ifeq ($(filter-out windows os2,$(OSNAME)),)
   ifeq ($(ARCH_DATA_MODEL), 32)
         $(CD) $(OUTPUTDIR); \
@@ -160 +160 @@
 generic_build2:
         $(MKDIR) -p $(OUTPUTDIR)
-ifeq ($(OSNAME),windows)
+ifeq ($(filter-out windows os2,$(OSNAME)),)
         $(CD) $(OUTPUTDIR); \
             $(NMAKE) -f $(ABS_OS_MAKEFILE) \
@@ -176 +176 @@
 generic_buildkernel:
         $(MKDIR) -p $(OUTPUTDIR)
-ifeq ($(OSNAME),windows)
+ifeq ($(filter-out windows os2,$(OSNAME)),)
   ifeq ($(ARCH_DATA_MODEL), 32)
         $(CD) $(OUTPUTDIR); \
@@ -248 +248 @@
 endif
 
-# Bin files (windows)
-ifeq ($(OSNAME),windows)
-
-# Get jvm.lib 
+# Bin files (windows, os2)
+ifeq ($(filter-out windows os2,$(OSNAME)),)
+
+# Get jvm.lib
 $(EXPORT_LIB_DIR)/%.lib:  $(MISC_DIR)/%.lib
         $(install-file)
@@ -258 +258 @@
 $(EXPORT_JRE_BIN_DIR)/%.dll: $(MISC_DIR)/%.dll
         $(install-file)
+  ifeq ($(OSNAME),os2)
 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(MISC_DIR)/%.pdb
         $(install-file)
+  endif
 $(EXPORT_JRE_BIN_DIR)/%.map: $(MISC_DIR)/%.map
         $(install-file)
@@ -266 +268 @@
 $(EXPORT_CLIENT_DIR)/%.dll:  $(C1_DIR)/%.dll
         $(install-file)
+  ifeq ($(OSNAME),os2)
 $(EXPORT_CLIENT_DIR)/%.pdb:  $(C1_DIR)/%.pdb
         $(install-file)
+  endif
 $(EXPORT_CLIENT_DIR)/%.map:  $(C1_DIR)/%.map
         $(install-file)
@@ -274 +278 @@
 $(EXPORT_SERVER_DIR)/%.dll:  $(C2_DIR)/%.dll
         $(install-file)
+  ifeq ($(OSNAME),os2)
 $(EXPORT_SERVER_DIR)/%.pdb:  $(C2_DIR)/%.pdb
         $(install-file)
+  endif
 $(EXPORT_SERVER_DIR)/%.map:  $(C2_DIR)/%.map
         $(install-file)
@@ -282 +288 @@
 $(EXPORT_KERNEL_DIR)/%.dll:  $(KERNEL_DIR)/%.dll
         $(install-file)
+  ifeq ($(OSNAME),os2)
 $(EXPORT_KERNEL_DIR)/%.pdb:  $(KERNEL_DIR)/%.pdb
         $(install-file)
+  endif
 $(EXPORT_KERNEL_DIR)/%.map:  $(KERNEL_DIR)/%.map
         $(install-file)
@@ -289 +297 @@
 
 # Shared Library
-ifneq ($(OSNAME),windows)
+ifneq ($(filter-out windows os2,$(OSNAME)),)
   ifeq ($(ZERO_BUILD), true)
 $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so
@@ -428 +436 @@
 intro_help:
         @$(ECHO) \
-"Makefile for the Hotspot workspace." 
+"Makefile for the Hotspot workspace."
         @$(ECHO) \
 "Default behavior is to build and create an export area for the j2se builds."
@@ -530 +538 @@
 "  $(MAKE) world"
         @$(ECHO) \
-"  $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(PREVIOUS_JDK_VERSION)" 
+"  $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(PREVIOUS_JDK_VERSION)"
         @$(ECHO) \
 "  $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(JDK_VERSION)"

trunk/openjdk/hotspot/make/defs.make

@@ -20 +20 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
-#  
+#
 #
 
@@ -117 +117 @@
 endif
 
+# On eComStation, OS is "ecs", ignore it to let uname be used
+ifeq ($(OS),ecs)
+  OS :=
+endif
+
 # Windows should have OS predefined
 ifeq ($(OS),)
@@ -123 +128 @@
 endif
 
-# If not SunOS and not Linux, assume Windows
+# If not SunOS and not Linux and not OS/2, assume Windows
 ifneq ($(OS), Linux)
   ifneq ($(OS), SunOS)
-    OSNAME=windows
+          ifneq ($(OS), OS/2)
+                OSNAME=windows
+          else
+                OSNAME=os2
+          endif
   else
     OSNAME=solaris
@@ -170 +179 @@
 endif
 
-# The platform dependent defs.make defines platform specific variable such 
+# The platform dependent defs.make defines platform specific variable such
 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.
 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make
@@ -178 +187 @@
 # some definitions are common for both linux and solaris,
 # so we put them here.
-ifneq ($(OSNAME),windows)
+ifneq ($(filter-out windows os2,$(OSNAME)),)
   ABS_OUTPUTDIR     := $(shell mkdir -p $(OUTPUTDIR); $(CD) $(OUTPUTDIR); $(PWD))
   ABS_BOOTDIR       := $(shell $(CD) $(BOOTDIR); $(PWD))
@@ -192 +201 @@
 
   # Use uname output for SRCARCH, but deal with platform differences. If ARCH
-  # is not explicitly listed below, it is treated as x86. 
+  # is not explicitly listed below, it is treated as x86.
   SRCARCH     = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 zero,$(ARCH)))
   ARCH/       = x86