Changeset 70

Timestamp:

Jul 19, 2010, 10:58:29 PM (15 years ago)

Author:

dmik

Message:

jdk/make: Build an import library on OS/2 when linking a .DLL and accept a .DEF file when specified in $(DEF_FILE).

Location:

trunk/openjdk/jdk/make/common

Files:

• Library.gmk (modified) (2 diffs)
• shared/Compiler-gcc.gmk (modified) (1 diff)

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

@@ -230 +230 @@
 endif # INSTALL_DOT_LIB
 
-else # PLATFORM
+else # PLATFORM == windows
+
+ifeq ($(PLATFORM), os2)
+
+$(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 $?"
+ifeq ($(LIBRARY), fdlibm)
+        $(AR) -r $@ $(FILES_o)
+else # LIBRARY
+        $(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS) $(DEF_FILE)
+        $(IMPLIB) -o $(OBJDIR)/$(LIBRARY).lib $@
+endif # LIBRARY
+
+#
+# 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
 
 #
@@ -250 +284 @@
 endif # LIBRARY
 
-endif # PLATFORM
+endif # PLATFORM == os2
+
+endif # PLATFORM == windows
 
 #

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

@@ -64 +64 @@
   REQUIRED_CC_VER = 3.2
   
+  AR           = emxomfar
+  IMPLIB       = emximp
+
   # Option used to create a shared library
   SHARED_LIBRARY_FLAG = -Zdll
-
+  
+  # current makefile reference (assumes GNU make)
+  MAKEFILE = $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
+  
 endif