Changeset 45

Timestamp:

Jun 28, 2010, 11:24:46 PM (15 years ago)

Author:

dmik

Message:

hotspot/make: Adding OS/2 support.

Location:

trunk/openjdk/hotspot/make/os2/makefiles

Files:

• adlc.make (modified) (2 diffs)
• compile.make (modified) (2 diffs)
• product.make (added)
• shared.make (modified) (1 diff)
• vm.make (added)

trunk/openjdk/hotspot/make/os2/makefiles/adlc.make ¶

@@ -33 +33 @@
 endif
 
-CXX_INCLUDE_DIRS=\
-  -I "../generated"                          \
-  -I "$(WorkSpace)/src/share/vm/compiler"    \
-  -I "$(WorkSpace)/src/share/vm/code"        \
-  -I "$(WorkSpace)/src/share/vm/interpreter" \
-  -I "$(WorkSpace)/src/share/vm/classfile"   \
-  -I "$(WorkSpace)/src/share/vm/asm"         \
-  -I "$(WorkSpace)/src/share/vm/memory"      \
-  -I "$(WorkSpace)/src/share/vm/oops"        \
-  -I "$(WorkSpace)/src/share/vm/prims"       \
-  -I "$(WorkSpace)/src/share/vm/runtime"     \
-  -I "$(WorkSpace)/src/share/vm/utilities"   \
-  -I "$(WorkSpace)/src/share/vm/libadt"      \
-  -I "$(WorkSpace)/src/share/vm/opto"        \
-  -I "$(WorkSpace)/src/os/windows/vm"          \
-  -I "$(WorkSpace)/src/cpu/$(Platform_arch)/vm"
+CPP_INCLUDE_DIRS=\
+  -I'../generated'                          \
+  -I'$(WorkSpace)/src/share/vm/compiler'    \
+  -I'$(WorkSpace)/src/share/vm/code'        \
+  -I'$(WorkSpace)/src/share/vm/interpreter' \
+  -I'$(WorkSpace)/src/share/vm/classfile'   \
+  -I'$(WorkSpace)/src/share/vm/asm'         \
+  -I'$(WorkSpace)/src/share/vm/memory'      \
+  -I'$(WorkSpace)/src/share/vm/oops'        \
+  -I'$(WorkSpace)/src/share/vm/prims'       \
+  -I'$(WorkSpace)/src/share/vm/runtime'     \
+  -I'$(WorkSpace)/src/share/vm/utilities'   \
+  -I'$(WorkSpace)/src/share/vm/libadt'      \
+  -I'$(WorkSpace)/src/share/vm/opto'        \
+  -I'$(WorkSpace)/src/os/windows/vm'          \
+  -I'$(WorkSpace)/src/cpu/$(Platform_arch)/vm'
 
 # NOTE! If you add any files here, you must also update GENERATED_NAMES_IN_INCL
@@ -71 +71 @@
 
 %.obj: %.cpp
-        $(CXX) $(CXX_FLAGS) $(CXX_INCLUDE_DIRS) -c $< -o $@
+        $(CXX) $(CPP_INCLUDE_DIRS) $(CXX_FLAGS) -c $< -o $@
 
 adlc.exe: main.obj adlparse.obj archDesc.obj arena.obj dfa.obj dict2.obj filebuff.obj \

trunk/openjdk/hotspot/make/os2/makefiles/compile.make ¶

@@ -26 +26 @@
 CXX = g++
 
-CXX_FLAGS = -Zomf -march=i486 -mtune=generic
+CXX_FLAGS = $(CPP_FLAGS) -Zomf -march=i486 -mtune=generic
 
 # Based on BUILDARCH we add some flags and select the default compiler name
 ifeq ($(BUILDARCH),i486)
-CXX_FLAGS += -DIA32
+CPP_FLAGS += -DIA32
 endif
 
@@ -59 +59 @@
  #comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
  #uuid.lib Wsock32.lib winmm.lib
+
+IMPLIB = emximp
+
+# Odin SDK
+
+CPP_FLAGS += -D__WIN32OS2__ -D__i386__ -DSTRICT
+CPP_FLAGS += -I$(ALT_ODINSDK_PATH)/include/Win -I$(ALT_ODINSDK_PATH)/include
+
+LINK_FLAGS  += -L$(ALT_ODINSDK_PATH)/lib -L$(ALT_ODINSDK_PATH)/lib/Release \
+                           -lkernel32.lib -luser32.lib

trunk/openjdk/hotspot/make/os2/makefiles/shared.make ¶

@@ -61 +61 @@
 endif
 
+MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
+
 FORCE: