Changeset 258

Timestamp:

Feb 16, 2011, 6:05:51 PM (15 years ago)

Author:

dmik

Message:

corba: Apply make system patches from jdk (I really wonder why they are not shared) to add support for the OS/2 platform.

Location:

trunk/openjdk/corba/make/common

Files:

• Defs-os2.gmk (added)
• Defs.gmk (modified) (3 diffs)
• Library.gmk (modified) (5 diffs)
• internal/NativeCompileRules.gmk (modified) (2 diffs)
• shared/Compiler-gcc.gmk (modified) (1 diff)
• shared/Compiler.gmk (modified) (1 diff)
• shared/Defs-java.gmk (modified) (1 diff)
• shared/Defs-os2.gmk (added)
• shared/Defs-utils.gmk (modified) (2 diffs)
• shared/Defs.gmk (modified) (1 diff)
• shared/Platform.gmk (modified) (2 diffs)

trunk/openjdk/corba/make/common/Defs.gmk

@@ -220 +220 @@
 INCLUDES = -I. -I$(CLASSHDRDIR) \
         $(patsubst %,-I%,$(subst $(CLASSPATH_SEPARATOR), ,$(VPATH.h))) $(OTHER_INCLUDES)
+ifneq ($(PLATFORM), os2)
 OTHER_CPPFLAGS = $(INCLUDES)
-
+endif
 
 #
@@ -292 +293 @@
 $(MKDIR) -p $(@D)
 $(RM) $@
+endef
+
+# Prepare $@ target directory, remove old one and making sure parent exists
+define prep-dir-target
+$(MKDIR) -p $(@D)
+$(RM) -r $@
 endef
 
@@ -447 +454 @@
 CFLAGS          = $(CFLAGS_$(VARIANT)/BYFILE)   $(CFLAGS_COMMON) $(OTHER_CFLAGS)
 CXXFLAGS        = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS)
+ifeq ($(PLATFORM), os2)
+CPPFLAGS        = $(INCLUDES) $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
+                  $(DEFINES) $(OPTIONS:%=-D%)
+else
 CPPFLAGS        = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
                   $(DEFINES) $(OPTIONS:%=-D%)
+endif
 LDFLAGS         = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS)
 LDLIBS          = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON)

trunk/openjdk/corba/make/common/Library.gmk

@@ -35 +35 @@
 #
 
-ACTUAL_LIBRARY_NAME = $(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
+ifneq ($(LIBRARY_SHORT),)
+LIBRARY_NAME = $(LIBRARY_SHORT)
+else
+LIBRARY_NAME = $(LIBRARY)
+endif
+
+ACTUAL_LIBRARY_NAME = $(LIB_PREFIX)$(LIBRARY_NAME).$(LIBRARY_SUFFIX)
 ACTUAL_LIBRARY_DIR = $(LIB_LOCATION)
 ACTUAL_LIBRARY = $(ACTUAL_LIBRARY_DIR)/$(ACTUAL_LIBRARY_NAME)
@@ -186 +192 @@
 endif # INSTALL_DOT_LIB
 
-else # PLATFORM
+else # PLATFORM == windows
+
+ifeq ($(PLATFORM), os2)
+
+#
+# Library building rules.
+#
+
+$(LIBRARY).lib:: $(OBJDIR)
+
+$(ACTUAL_LIBRARY):: $(COMPILE_FILES_o) $(FILES_m) $(FILES_reorder) $(DEF_FILE)
+        @$(prep-target)
+        @$(ECHO) "STATS: LIBRARY=$(LIBRARY), PRODUCT=$(PRODUCT), _OPT=$(_OPT)"
+        @$(ECHO) "Rebuilding $@ because of $?"
+        $(LINK) $(LDFLAGS) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS) $(DEF_FILE)
+        $(IMPLIB) -o $(OBJDIR)/$(LIBRARY).lib $@
+        cd $(@D) && $(MAPSYM) $(basename $(@F)).map
+
+#
+# Install a .lib file if required.
+#
+ifeq ($(INSTALL_DOT_LIB), true)
+
+$(ACTUAL_LIBRARY):: $(LIBDIR)/$(LIBRARY).lib
+
+clean::
+        -$(RM) $(LIBDIR)/$(LIBRARY).lib
+        -$(RM) $(LIBDIR)/$(LIBRARY).dll
+
+$(LIBDIR)/$(LIBRARY).lib:: $(OBJDIR)/$(LIBRARY).lib
+        $(install-file)
+
+$(LIBDIR)/$(LIBRARY).dll:: $(ACTUAL_LIBRARY)
+        $(install-file)
+
+endif # INSTALL_DOT_LIB
+
+else # PLATFORM == os2
 
 #
@@ -202 +245 @@
 endif # WRITE_LIBVERSION
 
-endif # PLATFORM
+endif # PLATFORM == os2
+
+endif # PLATFORM == windows
 
 #
@@ -216 +261 @@
 #
 ifdef PACKAGE
+
+ifeq ($(PLATFORM), os2)
+# OS/2 specific vpath should come first
+vpath %.c $(PLATFORM_SRC_OS2)/native/$(PKGDIR)
+OTHER_INCLUDES += -I$(PLATFORM_SRC_OS2)/native/common
+OTHER_INCLUDES += -I$(PLATFORM_SRC_OS2)/native/$(PKGDIR)
+endif
+
 vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)
 vpath %.c $(SHARE_SRC)/native/$(PKGDIR)
@@ -221 +274 @@
 OTHER_INCLUDES += -I$(SHARE_SRC)/native/$(PKGDIR) \
                   -I$(PLATFORM_SRC)/native/$(PKGDIR)
+
 endif
 

trunk/openjdk/corba/make/common/internal/NativeCompileRules.gmk

@@ -47 +47 @@
         @$(ECHO) "Creating $@"
         @$(RM) $@.temp
-        @$(CC) $(CC_DEPEND) $(CPPFLAGS) $< 2> $(DEV_NULL) | \
-            $(CC_DEPEND_FILTER) > $@.temp
+        @$(CC) $(CC_DEPEND) $(CPPFLAGS) $< \
+            $(if $(CC_DEPEND_FILTER), | $(CC_DEPEND_FILTER)) \
+            > $@.temp
         @$(MV) $@.temp $@
 
@@ -55 +56 @@
         @$(ECHO) "Creating $@"
         @$(RM) $@.temp
-        @$(CXX) $(CC_DEPEND) $(CPPFLAGS) $(CXXFLAGS) $< 2> $(DEV_NULL) | \
-            $(CC_DEPEND_FILTER) > $@.temp
+        @$(CXX) $(CC_DEPEND) $(CPPFLAGS) $(CXXFLAGS) $< \
+            $(if $(CC_DEPEND_FILTER), | $(CC_DEPEND_FILTER)) \
+            > $@.temp
         @$(MV) $@.temp $@
 

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

@@ -53 +53 @@
   _LINK_VER :=$(shell $(LINK) 2>&1 | $(HEAD) -n 1)
   LINK_VER  :=$(call GetVersion,"$(_LINK_VER)")
+
+endif
+
+ifeq ($(PLATFORM), os2)
+
+  ifeq ($(EMXOMFLD_TYPE), WLINK)
+    $(error WLINK is not currently supported due to fixup-related bugs when building awt.dll. \
+            Use VAC308 ILINK instead)
+  endif
+
+  # Settings specific to OS/2
+  CC           = $(COMPILER_PATH)gcc
+  CPP          = $(COMPILER_PATH)gcc -E
+  CXX          = $(COMPILER_PATH)g++
+  REQUIRED_CC_VER = 3.2
+
+  LINK         = $(COMPILER_PATH)gcc
+  AR           = $(COMPILER_PATH)emxomfar
+  IMPLIB       = $(COMPILER_PATH)emximp
+  MAPSYM       = mapsym.exe
+
+  # Option used to create a shared library
+  SHARED_LIBRARY_FLAG = -Zdll
+  ifeq ($(EMXOMFLD_TYPE), VAC308)
+    # (for some reason -Zdll is not always converted to /DLL by emxomfld)
+    SHARED_LIBRARY_FLAG += -Zlinker /DLL
+  endif
 
 endif

trunk/openjdk/corba/make/common/shared/Compiler.gmk

@@ -33 +33 @@
 endif
 
+# OS/2 uses GNU compilers by default
+ifeq ($(PLATFORM), os2)
+  override CC_VERSION = gcc
+endif
+
 # Solaris uses Sun Studio compilers by default
 ifeq ($(PLATFORM), solaris)

trunk/openjdk/corba/make/common/shared/Defs-java.gmk

@@ -118 +118 @@
 
 # Needed for javah
-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
+JAVAHFLAGS += -bootclasspath $(if $(filter $(CLASSBINDIR),$(CLASSDESTDIR)),\
+        $(CLASSBINDIR),$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR))
 
 # Langtools

trunk/openjdk/corba/make/common/shared/Defs-utils.gmk

@@ -61 +61 @@
 endif
 
-ifeq ($(PLATFORM),windows)
+ifeq ($(filter-out windows os2,$(PLATFORM)),)
   UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
   UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
@@ -158 +158 @@
 endif
 
+# OS/2 specific
+ifeq ($(PLATFORM),os2)
+  ECHO   = $(UNIXCOMMAND_PATH)echo -e
+  NAWK   = $(UNIXCOMMAND_PATH)awk
+endif
+
 # Linux specific
 ifeq ($(PLATFORM),linux)

trunk/openjdk/corba/make/common/shared/Defs.gmk

@@ -116 +116 @@
 # Given a line of text, get the major.minor version number from it
 define GetVersion
-$(shell echo $1 | sed -e 's@[^1-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*@\1@' )
+$(shell echo $1 | sed -ne 's@[^1-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*@\1@p')
 endef
 

trunk/openjdk/corba/make/common/shared/Platform.gmk

@@ -373 +373 @@
 endif
 
+# Platform settings specific to OS/2
+ifeq ($(SYSTEM_UNAME), OS/2)
+  PLATFORM = os2
+  OS_NAME = os2
+  OS_VERSION := $(shell uname -r)
+  OS_VENDOR = IBM
+  TEMP_DISK = $(subst \,/,$(TEMP))
+  ARCH_DATA_MODEL = 32
+  ARCH = i586
+  # LIBARCH is used to preserve the jre/lib/i386 directory name for 32-bit intel
+  LIBARCH = i386
+  # Value of Java os.arch property
+  ARCHPROP = x86
+  ARCH_FAMILY = $(ARCH)
+  # Where is unwanted output to be delivered?
+  DEV_NULL = nul
+  # Classpath separator
+  CLASSPATH_SEPARATOR = \;
+  # The suffix used for object file (.o for unix .obj for windows)
+  OBJECT_SUFFIX = obj
+  # The suffix applied to executables (.exe for windows, nothing for solaris)
+  EXE_SUFFIX = .exe
+  # The prefix applied to library files (lib for solaris, nothing for windows)
+  LIB_PREFIX =
+  LIBRARY_SUFFIX = dll
+  LIB_SUFFIX = lib
+  # User name determination (set _USER)
+  ifndef USER
+    ifdef USERNAME
+      _USER := $(USERNAME)
+    else
+      ifdef LOGNAME
+        _USER := $(LOGNAME)
+      else
+        _USER := $(shell id -un)
+      endif
+    endif
+  else
+    _USER:=$(USER)
+  endif
+  # Location of client/server directories
+  ARCH_VM_SUBDIR=jre/bin
+  # Suffix for file bundles used in previous release
+  BUNDLE_FILE_SUFFIX=.tar
+  # Minimum disk space needed as determined by running 'du -sk' on
+  #    a fully built workspace.
+  REQUIRED_FREE_SPACE=500000
+  # How much RAM does this machine have:
+  # @todo
+  # @todo We don't have JDK 1.6 yet so require 1.5
+  REQUIRED_BOOT_VER = 1.5
+endif
+
 # Machines with 512Mb or less of real memory are considered low memory
 #    build machines and adjustments will be made to prevent excessing
@@ -409 +462 @@
 
 # Unix type settings (same for all unix platforms)
-ifneq ($(PLATFORM), windows)
+ifneq ($(filter-out windows os2, $(PLATFORM)),)
   # Temporary disk area
   TEMP_DISK=/tmp