Changeset 89

Timestamp:

Aug 5, 2010, 12:46:56 AM (15 years ago)

Author:

dmik

Message:

jdk/make: Added support for building .EXEs on OS/2 using GCC.

Location:

trunk/openjdk/jdk/make/common

Files:

• Program.gmk (modified) (10 diffs)
• shared/Compiler-gcc.gmk (modified) (1 diff)

trunk/openjdk/jdk/make/common/Program.gmk

@@ -100 +100 @@
         OTHER_LDLIBS += jli.lib
 endif
+ifeq ($(PLATFORM), os2)
+        ifdef STATIC_JLI
+            LDFLAGS += -L$(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static
+        else
+            LDFLAGS += -L$(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)
+        endif
+        OTHER_LDLIBS += -ljli.lib
+endif
 
 #
@@ -138 +146 @@
 $(OBJDIR)/$(PROGRAM).lcf: $(OBJDIR)/$(PROGRAM).res $(FILES_o)
         @$(prep-target)
-        @$(ECHO) $(FILES_o) > $@ 
+        @$(ECHO) $(FILES_o) > $@
   ifndef LOCAL_RESOURCE_FILE
         @$(ECHO) $(OBJDIR)/$(PROGRAM).res >> $@
   endif
         @$(ECHO) setargv.obj >> $@
-        @$(ECHO) Created $@ 
+        @$(ECHO) Created $@
 
 $(ACTUAL_PROGRAM):: $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX)
@@ -163 +171 @@
             @$(OBJDIR)/$(PROGRAM).lcf $(LDLIBS)
 
-else # PLATFORM
+else # PLATFORM == windows
+
+ifeq ($(PLATFORM), os2)
+
+$(ACTUAL_PROGRAM):: $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX)
+        @$(install-file)
+
+$(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX):: $(FILES_o)
+        @$(prep-target)
+        @set -- $?; \
+            $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
+        $(LINK) $(LDFLAGS) -Zstack 0x2000 -o $@ $(FILES_o) $(LDLIBS)
+
+else # PLATFORM == os2
 
 #
@@ -187 +208 @@
             $(FILES_o) $(THREADLIBS) $(LDLIBS)
 
-endif # PLATFORM
+endif # PLATFORM == os2
+
+endif # PLATFORM == windows
 
 else  # COMPILE_IT
@@ -202 +225 @@
 
 
-clean:: 
+clean::
 ifeq ($(PLATFORM), windows)
         $(RM) $(OBJDIR)/$(PROGRAM).rc
@@ -214 +237 @@
         $(RM) *.pdb
 endif
-
-
-clobber:: 
+ifeq ($(PLATFORM), os2)
+        $(RM) $(OBJDIR)/$(PROGRAM).rc
+        $(RM) $(OBJDIR)/$(PROGRAM).ico
+        $(RM) $(OBJDIR)/$(PROGRAM).map
+        $(RM) $(OBJDIR)/$(PROGRAM).lib
+        $(RM) $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX)
+        $(RM) *.sym
+endif
+
+
+clobber::
         $(RM) $(ACTUAL_PROGRAM)
 
@@ -236 +267 @@
 endif
 
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows os2, $(PLATFORM)),)
 ifdef RELEASE
 OTHER_CPPFLAGS += -DVERSION='"$(RELEASE)"'
@@ -243 +274 @@
 
 
-ifneq ($(PLATFORM), windows)
+ifneq ($(filter-out windows os2, $(PLATFORM)),)
 HAVE_GETHRTIME=true
 endif
@@ -281 +312 @@
 
 #
-# How to install jvm.cfg. 
+# How to install jvm.cfg.
 #
 ifeq ($(ZERO_BUILD), true)
@@ -289 +320 @@
 endif
 
-$(JVMCFG): $(LAUNCHER_PLATFORM_SRC)/bin/$(JVMCFG_ARCH)/jvm.cfg 
+$(JVMCFG): $(LAUNCHER_PLATFORM_SRC)/bin/$(JVMCFG_ARCH)/jvm.cfg
         $(install-file)
 

trunk/openjdk/jdk/make/common/shared/Compiler-gcc.gmk

@@ -63 +63 @@
   CXX          = $(COMPILER_PATH)g++
   REQUIRED_CC_VER = 3.2
-  
-  AR           = emxomfar
-  IMPLIB       = emximp
+
+  LINK         = $(COMPILER_PATH)gcc
+  AR           = $(COMPILER_PATH)emxomfar
+  IMPLIB       = $(COMPILER_PATH)emximp
 
   # Option used to create a shared library
   SHARED_LIBRARY_FLAG = -Zdll
-  
+
   # current makefile reference (assumes GNU make)
   MAKEFILE = $(word 1,$(MAKEFILE_LIST))
-  
+
 endif