# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1458705750 0
# Node ID 9fd836c4922e44f2d75e3cbf0b202a33563215b8
# Parent  45205ca060d2c1cc66f9f71cf822ed191dac3050
PR2034: --enable-jamvm builds broken, missing JVM_GetTemporaryDirectory impl

2015-07-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR2034: --enable-jamvm builds broken, missing
	JVM_GetTemporaryDirectory impl
	* Makefile.am:
	(ICEDTEA_PATCHES): Add PR2034 patch.
	* NEWS: Updated.
	* patches/jamvm/pr2034-tempdir.patch:
	Implement JVM_GetTemporaryDirectory.

diff -r 45205ca060d2 -r 9fd836c4922e ChangeLog
--- a/ChangeLog	Mon Mar 21 18:43:10 2016 +0000
+++ b/ChangeLog	Wed Mar 23 04:02:30 2016 +0000
@@ -1,3 +1,13 @@
+2015-07-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2034: --enable-jamvm builds broken, missing
+	JVM_GetTemporaryDirectory impl
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add PR2034 patch.
+	* NEWS: Updated.
+	* patches/jamvm/pr2034-tempdir.patch:
+	Implement JVM_GetTemporaryDirectory.
+
 2016-03-21  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR1889: Allow tarball checksumming to be disabled
diff -r 45205ca060d2 -r 9fd836c4922e Makefile.am
--- a/Makefile.am	Mon Mar 21 18:43:10 2016 +0000
+++ b/Makefile.am	Wed Mar 23 04:02:30 2016 +0000
@@ -309,7 +309,8 @@
 
 if BUILD_JAMVM
 ICEDTEA_PATCHES += \
-	patches/jamvm/find_class_from_caller.patch
+	patches/jamvm/find_class_from_caller.patch \
+	patches/jamvm/pr2034-tempdir.patch
 endif
 
 if !ENABLE_SUNEC
diff -r 45205ca060d2 -r 9fd836c4922e NEWS
--- a/NEWS	Mon Mar 21 18:43:10 2016 +0000
+++ b/NEWS	Wed Mar 23 04:02:30 2016 +0000
@@ -182,6 +182,7 @@
   - JSR 292: correct intrinsic cache COMPARE function
   - Race condition in setting up imethod table
   - GC: Minor performance improvement
+  - PR2034: --enable-jamvm builds broken, missing JVM_GetTemporaryDirectory impl
   - PR2336: JamVM lacks JVM_FindClassFromCaller
 * CACAO
   - PR1277: Synchronise CACAO rules between IcedTea6/7/8 where possible
diff -r 45205ca060d2 -r 9fd836c4922e patches/jamvm/pr2034-tempdir.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jamvm/pr2034-tempdir.patch	Wed Mar 23 04:02:30 2016 +0000
@@ -0,0 +1,24 @@
+diff --git a/src/classlib/openjdk/jvm.c b/src/classlib/openjdk/jvm.c
+index 971ac75..b5f4cae 100644
+--- jamvm.old/jamvm/src/classlib/openjdk/jvm.c
++++ jamvm/jamvm/src/classlib/openjdk/jvm.c
+@@ -3038,3 +3038,19 @@ jint JVM_FindSignal(const char *name) {
+ 
+     return signals[i].number;
+ }
++
++/* JVM_GetTemporaryDirectory
++ * Return the temporary directory that the VM uses for the attach
++ * and perf data files.
++ *
++ * It is important that this directory is well-known and the
++ * same for all VM instances. It cannot be affected by configuration
++ * variables such as java.io.tmpdir.
++ */
++jstring JVM_GetTemporaryDirectory(JNIEnv *env) {
++    TRACE("JVM_GetTemporaryDirectory(env=%p)", env);
++
++// This must be hard coded because it's the system's temporary
++// directory not the java application's temp directory, ala java.io.tmpdir.
++    return createString("/tmp");
++}