Changeset 107

Timestamp:

Aug 18, 2010, 12:55:11 AM (15 years ago)

Author:

dmik

Message:

jdk: Adopted instrument.dll for OS/2.

Location:

trunk/openjdk/jdk

Files:

• make/java/instrument/Makefile (modified) (2 diffs)
• src/windows/javavm/include/typedefs_md.h (modified) (1 diff)

trunk/openjdk/jdk/make/java/instrument/Makefile

@@ -103 +103 @@
   CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
 else
+ifeq ($(PLATFORM), os2)
+  OTHER_LDLIBS += -l$(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/jli.lib
+else
   LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
   OTHER_LDLIBS += -ljli
-  OTHER_LDLIBS += -ldl 
+  OTHER_LDLIBS += -ldl
   ifeq ($(PLATFORM), solaris)
     LDFLAGS += -R \$$ORIGIN/jli
@@ -114 +117 @@
     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
   endif
+endif
+endif
+
+ifeq ($(PLATFORM), os2)
+# exports live in .def file
+DEF_FILE = $(OBJDIR)/$(LIBRARY).def
+$(DEF_FILE): $(MAKEFILE)
+        @$(ECHO) 'EXPORTS \n \
+  Agent_OnAttach = "_Agent_OnAttach@12" \n \
+' > $@
+clean::
+        -$(RM) $(DEF_FILE)
 endif
 

trunk/openjdk/jdk/src/windows/javavm/include/typedefs_md.h

@@ -47 +47 @@
 typedef unsigned __int32 uint32_t;
 typedef unsigned __int64 uint64_t;
+
+#else /* EMX */
+
+#include <types.h>
 
 #endif /* EMX */