diff options
Diffstat (limited to 'java/jmp/files')
-rw-r--r-- | java/jmp/files/patch-Makefile.am | 19 | ||||
-rw-r--r-- | java/jmp/files/patch-Makefile.in | 19 | ||||
-rw-r--r-- | java/jmp/files/patch-configure | 12 | ||||
-rw-r--r-- | java/jmp/files/patch-instance_owners.c | 15 | ||||
-rw-r--r-- | java/jmp/files/patch-jmp.c | 45 |
5 files changed, 110 insertions, 0 deletions
diff --git a/java/jmp/files/patch-Makefile.am b/java/jmp/files/patch-Makefile.am new file mode 100644 index 000000000000..9795b08b1c4e --- /dev/null +++ b/java/jmp/files/patch-Makefile.am @@ -0,0 +1,19 @@ +$FreeBSD$ + +--- Makefile.am Tue May 13 22:11:38 2003 ++++ Makefile.am Tue May 13 22:12:05 2003 +@@ -42,12 +42,12 @@ + gcc -shared -o $@ ${OBJECTS} -Wl,--kill-at + + jmp/JMPController.class : java/jmp/JMPController.java +- javac -sourcepath java -d . $< ++ ${JAVAC} -sourcepath java -d . $< + + # javah does not update file modification time, so touch it + # otherwise we will remake file every time + jmp_JMPController.h: jmp/JMPController.class +- javah jmp.JMPController ++ ${JAVAH} jmp.JMPController + @touch jmp_JMPController.h + + javadocs: diff --git a/java/jmp/files/patch-Makefile.in b/java/jmp/files/patch-Makefile.in new file mode 100644 index 000000000000..847866fdbb7f --- /dev/null +++ b/java/jmp/files/patch-Makefile.in @@ -0,0 +1,19 @@ +$FreeBSD$ + +--- Makefile.in Tue May 13 22:11:43 2003 ++++ Makefile.in Tue May 13 22:12:29 2003 +@@ -598,12 +598,12 @@ + gcc -shared -o $@ ${OBJECTS} -Wl,--kill-at + + jmp/JMPController.class : java/jmp/JMPController.java +- javac -sourcepath java -d . $< ++ ${JAVAC} -sourcepath java -d . $< + + # javah does not update file modification time, so touch it + # otherwise we will remake file every time + jmp_JMPController.h: jmp/JMPController.class +- javah jmp.JMPController ++ ${JAVAH} jmp.JMPController + @touch jmp_JMPController.h + + javadocs: diff --git a/java/jmp/files/patch-configure b/java/jmp/files/patch-configure new file mode 100644 index 000000000000..1e1a32c90f62 --- /dev/null +++ b/java/jmp/files/patch-configure @@ -0,0 +1,12 @@ +$FreeBSD$ + +--- configure.orig Fri Feb 28 08:28:00 2003 ++++ configure Fri Feb 28 08:28:31 2003 +@@ -11241,6 +11241,7 @@ + + + case $target_os in ++ freebsd*) java_os=freebsd;; + linux*) java_os=linux;; + solaris*) java_os=solaris;; + cygwin*) java_os=win32;; diff --git a/java/jmp/files/patch-instance_owners.c b/java/jmp/files/patch-instance_owners.c new file mode 100644 index 000000000000..23bff9b42dbb --- /dev/null +++ b/java/jmp/files/patch-instance_owners.c @@ -0,0 +1,15 @@ +$FreeBSD$ + +--- instance_owners.c Tue May 13 20:28:40 2003 ++++ instance_owners.c Tue May 13 20:28:11 2003 +@@ -11,6 +11,10 @@ + #include <jmp-config.h> + #include <inttypes.h> + ++#if __FreeBSD__ < 5 ++#define PRId32 "d" ++#endif ++ + enum { + INFO, + NUM_COLUMNS diff --git a/java/jmp/files/patch-jmp.c b/java/jmp/files/patch-jmp.c new file mode 100644 index 000000000000..888f0a5dfd48 --- /dev/null +++ b/java/jmp/files/patch-jmp.c @@ -0,0 +1,45 @@ +$FreeBSD$ + +--- jmp.c Tue May 13 23:17:03 2003 ++++ jmp.c Tue May 13 23:17:47 2003 +@@ -1548,10 +1548,11 @@ + free (cf); + } + +-void enable_method_events () { ++void enable_method_events_and_stacks (int get_stacks) { + /* Ok, the thread stacks are bogous, clear them all and try to get + * real stacks, timing will be a bit bogous, but not to much... + */ ++ if (get_stacks) { + jmphash_lock (threads); + jmphash_lock (methods); + jvmpi->DisableGC (); +@@ -1559,6 +1560,7 @@ + jvmpi->EnableGC (); + jmphash_unlock (methods); + jmphash_unlock (threads); ++ } + + method_profiling = 1; + /* +@@ -1572,6 +1574,10 @@ + jvmpi->EnableEvent (JVMPI_EVENT_METHOD_EXIT, NULL); + } + ++void enable_method_events () { ++ enable_method_events_and_stacks (1); ++} ++ + static void enable_dump_events () { + dump_enabled = 1; + jvmpi->EnableEvent (JVMPI_EVENT_DATA_DUMP_REQUEST, NULL); +@@ -1603,7 +1609,7 @@ + enable_object_events (); + enable_thread_events (); + if (method_profiling) +- enable_method_events (); ++ enable_method_events_and_stacks (0); + if (dump_enabled) + enable_dump_events (); + if (monitor_profiling) |