Changeset 40 for trunk/openjdk/hotspot/make/defs.make

Timestamp:

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

Author:

dmik

Message:

hotspot/make: Adding O/2 support.

File:

• trunk/openjdk/hotspot/make/defs.make (modified) (6 diffs)

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