Changeset 59

Timestamp:

Jul 15, 2010, 2:48:48 PM (15 years ago)

Author:

dmik

Message:

hotspot/src: Another big bunch of patches to make the windows code build with Odin32/GCC on OS/2 (makefiles).

Location:

trunk/openjdk/hotspot/make/os2/makefiles

Files:

• product.make (modified) (1 diff)
• vm.make (modified) (2 diffs)

trunk/openjdk/hotspot/make/os2/makefiles/product.make

@@ -42 +42 @@
 include $(GENERATED)/Dependencies
 
+# _Copy functions, assembled from .s file
+# Not included in includeDB because it has no dependencies
+Obj_Files += os2_x86_32.obj
+
 HS_BUILD_ID = $(HS_BUILD_VER)
 
-# Kernel doesn't need exported vtbl symbols.
-ifeq ($(Variant), kernel)
 $(AOUT): $(Res_Files) $(Obj_Files) $(Def_File)
-        $(LINK) -o $@ $(Obj_Files) $(Res_Files)
+        $(LINK) $(LINK_FLAGS) -o $@ $(Obj_Files) $(Res_Files)
         $(IMPLIB) -o $(basaename $@).lib $@
-else
-$(AOUT): $(Res_Files) $(Obj_Files)
-        sh $(WorkSpace)/make/os2/build_vm_def.sh
-        $(LINK) -o $@ vm.def $(Obj_Files) $(Res_Files)
-        $(IMPLIB) -o $(basename $@).lib $@
-endif
 
 include $(WorkSpace)/make/os2/makefiles/shared.make

trunk/openjdk/hotspot/make/os2/makefiles/vm.make

@@ -129 +129 @@
   $(WorkSpace)/src/os/windows/vm          \
   $(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm \
+  $(WorkSpace)/src/os_cpu/os2_$(Platform_arch)/vm \
   $(WorkSpace)/src/cpu/$(Platform_arch)/vm \
   $(WorkSpace)/src/share/vm/opto
@@ -157 +158 @@
         $(CXX) $(CXX_FLAGS) -c $< -o $@
 
+%.obj: %.s
+        $(CXX) $(CXX_FLAGS) -c $< -o $@
+
 default::