/hg/release/icedtea6-1.10: 10 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri May 11 07:57:23 PDT 2012
changeset 8bcd76a839dd in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=8bcd76a839dd
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 11 10:52:57 2012 +0100
S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
2011-10-26 Omair Majid <omajid at redhat.com>
S7103224: collision between __LEAF define in interfaceSupport.hpp and
/usr/include/sys/cdefs.h with gcc
* NEWS: Update with fix.
* patches/openjdk/7103224-glibc_name_collision.patch: New file. Export of
OpenJDK changeset.
* Makefile.am (ICEDTEA_PATCHES): Add the above.
changeset bfdaab44fa5a in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=bfdaab44fa5a
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 11 11:00:19 2012 +0100
Fixed build with GCC 4.7
2012-05-11 Andrew John Hughes <ahughes at redhat.com>
* NEWS: List GCC 4.7 fixes.
2012-01-30 Deepak Bhole <dbhole at redhat.com>
Added patches to fix building with GCC 4.7
* patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch:
New patch. Makes methods return NULL instead of boolean when they return a
pointer.
* patches/openjdk/remove-mimpure-option-to-gcc.patch: New patch. Removes
the invalid -mimpure-text option to GCC.
changeset 1a5fc82ba3b8 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=1a5fc82ba3b8
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 11 12:32:19 2012 +0100
Specify both source and target arguments in dtdtype check.
2012-05-09 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
(IT_GET_DTDTYPE_CHECK): Set target to 5
as well to ensure 1.7 bytecode isn't built.
changeset 918dbc28bd12 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=918dbc28bd12
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 11 12:35:21 2012 +0100
Prepare for 1.10.7 release.
2012-05-11 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Set release date.
* configure.ac: Bump to 1.10.7 proper.
changeset c1b0864d4212 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=c1b0864d4212
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 11 12:48:26 2012 +0100
Regenerate jaxws-getdtdtype fix so it still applies.
2012-05-11 Andrew John Hughes <ahughes at redhat.com>
* patches/ecj/jaxws-getdtdtype.patch:
Regenerated.
changeset 7834454dcab9 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=7834454dcab9
author: Denis Lila <dlila at redhat.com>
date: Fri Jun 10 16:21:38 2011 -0400
Fix pulse audio header generation problem.
changeset b4f738cb0d59 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=b4f738cb0d59
author: Denis Lila <dlila at redhat.com>
date: Wed Jun 15 10:35:39 2011 -0400
Fix build regression.
changeset 1939ae55a211 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=1939ae55a211
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 11 15:55:05 2012 +0100
Mention all fixes in NEWS.
2012-05-11 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Mention all fixes in NEWS.
changeset 2491ffacf20e in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=2491ffacf20e
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 09 13:38:18 2012 +0100
Add nss.cfg to j2re-image as well.
2012-05-09 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
(add-nss): Copy nss.cfg to j2re-image as well.
(clean-add-nss): Remove nss.cfg from j2re-image.
(add-nss-debug): Same as for add-nss.
(clean-add-nss-debug): Same as for clean-add-nss.
(add-nss-ecj): Same as for add-nss.
(clean-add-nss-ecj): Same as for clean-add-nss.
changeset 78c05cb3e3c7 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=78c05cb3e3c7
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 11 15:57:07 2012 +0100
Mention nss.cfg fix in NEWS.
2012-05-11 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Add NEWS entry for nss.cfg fix.
diffstat:
ChangeLog | 70 ++
Makefile.am | 26 +-
NEWS | 9 +-
acinclude.m4 | 2 +-
configure.ac | 2 +-
patches/ecj/jaxws-getdtdtype.patch | 10 +-
patches/openjdk/7103224-glibc_name_collision.patch | 236 ++++++++++
patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch | 12 +
patches/openjdk/remove-mimpure-option-to-gcc.patch | 162 ++++++
9 files changed, 514 insertions(+), 15 deletions(-)
diffs (truncated from 656 to 500 lines):
diff -r 4515e31b48fa -r 78c05cb3e3c7 ChangeLog
--- a/ChangeLog Wed Apr 18 18:41:40 2012 +0200
+++ b/ChangeLog Fri May 11 15:57:07 2012 +0100
@@ -1,3 +1,73 @@
+2012-05-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Add NEWS entry for nss.cfg fix.
+
+2012-05-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (add-nss): Copy nss.cfg to j2re-image as well.
+ (clean-add-nss): Remove nss.cfg from j2re-image.
+ (add-nss-debug): Same as for add-nss.
+ (clean-add-nss-debug): Same as for clean-add-nss.
+ (add-nss-ecj): Same as for add-nss.
+ (clean-add-nss-ecj): Same as for clean-add-nss.
+
+2012-05-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Mention all fixes in NEWS.
+
+2011-06-15 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am: Add back the -classpath option to javah in
+ building the pulse audio header files. The bootstrap javah
+ doesn't recognize -J-Xbootclasspath/p: so it couldn't find
+ the classfiles.
+
+2011-06-10 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am
+ (stamps/pulse-java-headers.stamp): Prepend the java build directory
+ to the boot class path to avoid generating headers for the system
+ pulse-java classes.
+
+2012-05-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/ecj/jaxws-getdtdtype.patch:
+ Regenerated.
+
+2012-05-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Set release date.
+ * configure.ac: Bump to 1.10.7 proper.
+
+2012-05-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_GET_DTDTYPE_CHECK): Set target to 5
+ as well to ensure 1.7 bytecode isn't built.
+
+2012-05-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: List GCC 4.7 fixes.
+
+2012-01-30 Deepak Bhole <dbhole at redhat.com>
+
+ Added patches to fix building with GCC 4.7
+ * patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch:
+ New patch. Makes methods return NULL instead of boolean when they return a
+ pointer.
+ * patches/openjdk/remove-mimpure-option-to-gcc.patch: New patch. Removes
+ the invalid -mimpure-text option to GCC.
+
+2011-10-26 Omair Majid <omajid at redhat.com>
+
+ S7103224: collision between __LEAF define in interfaceSupport.hpp and
+ /usr/include/sys/cdefs.h with gcc
+ * NEWS: Update with fix.
+ * patches/openjdk/7103224-glibc_name_collision.patch: New file. Export of
+ OpenJDK changeset.
+ * Makefile.am (ICEDTEA_PATCHES): Add the above.
+
2012-04-18 Pavel Tisnovsky <ptisnovs at redhat.com>
* patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch:
diff -r 4515e31b48fa -r 78c05cb3e3c7 Makefile.am
--- a/Makefile.am Wed Apr 18 18:41:40 2012 +0200
+++ b/Makefile.am Fri May 11 15:57:07 2012 +0100
@@ -381,7 +381,10 @@
patches/openjdk/6851973-kerberos.patch \
patches/openjdk/7091528-javadoc_class_files.patch \
patches/idresolver_fix.patch \
- patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch
+ patches/openjdk/6792400-Avoid_loading_Normalizer_resources.patch \
+ patches/openjdk/7103224-glibc_name_collision.patch \
+ patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \
+ patches/openjdk/remove-mimpure-option-to-gcc.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
@@ -602,7 +605,7 @@
DISABLE_NIMBUS="true" \
NO_DOCS="true" \
XSLT="$(XSLTPROC)"
-
+
# Source files
# FIXME (distclean): Add generated file list
# FIXME (distclean): Add jtreg sources
@@ -1555,19 +1558,25 @@
stamps/add-nss.stamp: stamps/icedtea.stamp
cp $(abs_top_builddir)/nss.cfg \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security
+ cp $(abs_top_builddir)/nss.cfg \
+ $(BUILD_OUTPUT_DIR)/j2re-image/lib/security
touch stamps/add-nss.stamp
clean-add-nss:
rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+ rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
rm -f stamps/add-nss.stamp
stamps/add-nss-debug.stamp: stamps/icedtea-debug.stamp
cp $(abs_top_builddir)/nss.cfg \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+ cp $(abs_top_builddir)/nss.cfg \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security;
touch stamps/add-nss-debug.stamp
clean-add-nss-debug:
rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
rm -f stamps/add-nss-debug.stamp
stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
@@ -1672,10 +1681,13 @@
stamps/add-nss-ecj.stamp: stamps/icedtea-ecj.stamp
cp $(abs_top_builddir)/nss.cfg \
$(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+ cp $(abs_top_builddir)/nss.cfg \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/security;
touch stamps/add-nss-ecj.stamp
clean-add-nss-ecj:
rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg
+ rm -f $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/security/nss.cfg
rm -f stamps/add-nss-ecj.stamp
stamps/add-tzdata-support-ecj.stamp: stamps/icedtea-ecj.stamp
@@ -1762,15 +1774,15 @@
stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp
mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- org.classpath.icedtea.pulseaudio.EventLoop ; \
+ -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- org.classpath.icedtea.pulseaudio.Stream ; \
+ -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- org.classpath.icedtea.pulseaudio.Operation; \
+ -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
+ -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
$(BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
- org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
+ -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
mkdir -p stamps
touch stamps/pulse-java-headers.stamp
diff -r 4515e31b48fa -r 78c05cb3e3c7 NEWS
--- a/NEWS Wed Apr 18 18:41:40 2012 +0200
+++ b/NEWS Fri May 11 15:57:07 2012 +0100
@@ -9,12 +9,19 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.10.7 (2012-XX-XX):
+New in release 1.10.7 (2012-05-11):
+
+* Fixed build with GCC 4.7
* Bug fixes
- PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan
- PR881: Sign tests (wsse.policy.basic) failures with OpenJDK6
+ - Specify both source and target in IT_GET_DTDTYPE_CHECK.
+ - PR758: [regression] javah from 6hg/b23 generates `jlong' from `private int'
+ - Install nss.cfg into j2re-image too.
* Backports
- S6792400: Avoid loading of Normalizer resources for simple uses
+ - S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
+ - S7140882: Don't return booleans from methods returning pointers
New in release 1.10.6 (2012-02-14):
diff -r 4515e31b48fa -r 78c05cb3e3c7 acinclude.m4
--- a/acinclude.m4 Wed Apr 18 18:41:40 2012 +0200
+++ b/acinclude.m4 Fri May 11 15:57:07 2012 +0100
@@ -1349,7 +1349,7 @@
}
}]
EOF
- if $JAVAC -cp . $JAVACFLAGS -source 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
it_cv_dtdtype=no;
else
diff -r 4515e31b48fa -r 78c05cb3e3c7 configure.ac
--- a/configure.ac Wed Apr 18 18:41:40 2012 +0200
+++ b/configure.ac Fri May 11 15:57:07 2012 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.10.7pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.10.7],[distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r 4515e31b48fa -r 78c05cb3e3c7 patches/ecj/jaxws-getdtdtype.patch
--- a/patches/ecj/jaxws-getdtdtype.patch Wed Apr 18 18:41:40 2012 +0200
+++ b/patches/ecj/jaxws-getdtdtype.patch Fri May 11 15:57:07 2012 +0100
@@ -1,18 +1,18 @@
diff -Nru openjdk-ecj.orig/jaxws/build.properties openjdk-ecj/jaxws/build.properties
---- openjdk-ecj.orig/jaxws/build.properties 2010-03-01 15:13:38.000000000 +0000
-+++ openjdk-ecj/jaxws/build.properties 2010-03-01 15:14:30.000000000 +0000
+--- openjdk-ecj.orig/jaxws/build.properties 2012-05-11 12:44:08.656488929 +0100
++++ openjdk-ecj/jaxws/build.properties 2012-05-11 12:45:15.757587112 +0100
@@ -81,7 +81,7 @@
patches.dir=patches
# Patches to apply
--jaxws_src.patch.list=7013971.patch xjc.patch
-+jaxws_src.patch.list=7013971.patch xjc.patch getdtdtype.patch
+-jaxws_src.patch.list=7013971.patch 7046794.patch xjc.patch
++jaxws_src.patch.list=7013971.patch 7046794.patch xjc.patch getdtdtype.patch
# Sanity information
sanity.info= Sanity Settings:${line.separator}\
diff -Nru openjdk-ecj.orig/jaxws/patches/jaxws_src/getdtdtype.patch openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch
--- openjdk-ecj.orig/jaxws/patches/jaxws_src/getdtdtype.patch 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch 2010-03-01 15:15:10.000000000 +0000
++++ openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch 2012-05-11 12:45:00.601339059 +0100
@@ -0,0 +1,27 @@
+--- src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:37:06.000000000 +0000
++++ src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java 2009-11-17 16:38:00.000000000 +0000
diff -r 4515e31b48fa -r 78c05cb3e3c7 patches/openjdk/7103224-glibc_name_collision.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7103224-glibc_name_collision.patch Fri May 11 15:57:07 2012 +0100
@@ -0,0 +1,236 @@
+# HG changeset patch
+# User never
+# Date 1319555835 25200
+# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28
+# Parent 2ec638646e86e455978c31a9d47fc0ec271ed926
+7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
+Reviewed-by: never
+Contributed-by: Omair Majid <omajid at redhat.com>
+
+diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/opto/addnode.cpp
+--- openjdk/hotspot/src/share/vm/opto/addnode.cpp Tue Oct 25 04:07:20 2011 -0700
++++ openjdk/hotspot/src/share/vm/opto/addnode.cpp Tue Oct 25 08:17:15 2011 -0700
+@@ -34,8 +34,6 @@
+
+ // Portions of code courtesy of Clifford Click
+
+-#define MAXFLOAT ((float)3.40282346638528860e+38)
+-
+ // Classic Add functionality. This covers all the usual 'add' behaviors for
+ // an algebraic ring. Add-integer, add-float, add-double, and binary-or are
+ // all inherited from this class. The various identity values are supplied
+diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jniCheck.cpp
+--- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp Tue Oct 25 04:07:20 2011 -0700
++++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp Tue Oct 25 08:17:15 2011 -0700
+@@ -107,7 +107,7 @@
+ if (env != xenv) { \
+ NativeReportJNIFatalError(thr, warn_wrong_jnienv); \
+ } \
+- __ENTRY(result_type, header, thr)
++ VM_ENTRY_BASE(result_type, header, thr)
+
+
+ #define UNCHECKED() (unchecked_jni_NativeInterface)
+diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiEnter.xsl
+--- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl Tue Oct 25 04:07:20 2011 -0700
++++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl Tue Oct 25 08:17:15 2011 -0700
+@@ -426,7 +426,7 @@
+ <xsl:value-of select="$space"/>
+ <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text>
+ <xsl:value-of select="$space"/>
+- <xsl:text>__ENTRY(jvmtiError, </xsl:text>
++ <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text>
+ <xsl:apply-templates select="." mode="functionid"/>
+ <xsl:text> , current_thread)</xsl:text>
+ <xsl:value-of select="$space"/>
+diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiEnv.cpp
+--- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Oct 25 04:07:20 2011 -0700
++++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Oct 25 08:17:15 2011 -0700
+@@ -173,7 +173,7 @@
+ // from native so as to resolve the jthread.
+
+ ThreadInVMfromNative __tiv(current_thread);
+- __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
++ VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
+ debug_only(VMNativeEntryWrapper __vew;)
+
+ oop thread_oop = JNIHandles::resolve_external_guard(thread);
+diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/prims/jvmtiExport.cpp
+--- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Oct 25 04:07:20 2011 -0700
++++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Oct 25 08:17:15 2011 -0700
+@@ -373,7 +373,7 @@
+ JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread();
+ // transition code: native to VM
+ ThreadInVMfromNative __tiv(current_thread);
+- __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
++ VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
+ debug_only(VMNativeEntryWrapper __vew;)
+
+ JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
+diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/runtime/interfaceSupport.hpp
+--- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 04:07:20 2011 -0700
++++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 08:17:15 2011 -0700
+@@ -72,9 +72,9 @@
+ }
+ };
+
+-// InterfaceSupport provides functionality used by the __LEAF and __ENTRY
+-// macros. These macros are used to guard entry points into the VM and
+-// perform checks upon leave of the VM.
++// InterfaceSupport provides functionality used by the VM_LEAF_BASE and
++// VM_ENTRY_BASE macros. These macros are used to guard entry points into
++// the VM and perform checks upon leave of the VM.
+
+
+ class InterfaceSupport: AllStatic {
+@@ -433,7 +433,7 @@
+
+ // LEAF routines do not lock, GC or throw exceptions
+
+-#define __LEAF(result_type, header) \
++#define VM_LEAF_BASE(result_type, header) \
+ TRACE_CALL(result_type, header) \
+ debug_only(NoHandleMark __hm;) \
+ /* begin of body */
+@@ -441,7 +441,7 @@
+
+ // ENTRY routines may lock, GC and throw exceptions
+
+-#define __ENTRY(result_type, header, thread) \
++#define VM_ENTRY_BASE(result_type, header, thread) \
+ TRACE_CALL(result_type, header) \
+ HandleMarkCleaner __hm(thread); \
+ Thread* THREAD = thread; \
+@@ -450,7 +450,7 @@
+
+ // QUICK_ENTRY routines behave like ENTRY but without a handle mark
+
+-#define __QUICK_ENTRY(result_type, header, thread) \
++#define VM_QUICK_ENTRY_BASE(result_type, header, thread) \
+ TRACE_CALL(result_type, header) \
+ debug_only(NoHandleMark __hm;) \
+ Thread* THREAD = thread; \
+@@ -463,20 +463,20 @@
+ #define IRT_ENTRY(result_type, header) \
+ result_type header { \
+ ThreadInVMfromJava __tiv(thread); \
+- __ENTRY(result_type, header, thread) \
++ VM_ENTRY_BASE(result_type, header, thread) \
+ debug_only(VMEntryWrapper __vew;)
+
+
+ #define IRT_LEAF(result_type, header) \
+ result_type header { \
+- __LEAF(result_type, header) \
++ VM_LEAF_BASE(result_type, header) \
+ debug_only(No_Safepoint_Verifier __nspv(true);)
+
+
+ #define IRT_ENTRY_NO_ASYNC(result_type, header) \
+ result_type header { \
+ ThreadInVMfromJavaNoAsyncException __tiv(thread); \
+- __ENTRY(result_type, header, thread) \
++ VM_ENTRY_BASE(result_type, header, thread) \
+ debug_only(VMEntryWrapper __vew;)
+
+ // Another special case for nmethod_entry_point so the nmethod that the
+@@ -487,7 +487,7 @@
+ result_type header { \
+ nmethodLocker _nmlock(nm); \
+ ThreadInVMfromJavaNoAsyncException __tiv(thread); \
+- __ENTRY(result_type, header, thread)
++ VM_ENTRY_BASE(result_type, header, thread)
+
+ #define IRT_END }
+
+@@ -497,20 +497,20 @@
+ #define JRT_ENTRY(result_type, header) \
+ result_type header { \
+ ThreadInVMfromJava __tiv(thread); \
+- __ENTRY(result_type, header, thread) \
++ VM_ENTRY_BASE(result_type, header, thread) \
+ debug_only(VMEntryWrapper __vew;)
+
+
+ #define JRT_LEAF(result_type, header) \
+ result_type header { \
+- __LEAF(result_type, header) \
++ VM_LEAF_BASE(result_type, header) \
+ debug_only(JRT_Leaf_Verifier __jlv;)
+
+
+ #define JRT_ENTRY_NO_ASYNC(result_type, header) \
+ result_type header { \
+ ThreadInVMfromJavaNoAsyncException __tiv(thread); \
+- __ENTRY(result_type, header, thread) \
++ VM_ENTRY_BASE(result_type, header, thread) \
+ debug_only(VMEntryWrapper __vew;)
+
+ // Same as JRT Entry but allows for return value after the safepoint
+@@ -543,11 +543,11 @@
+ assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
+ ThreadInVMfromNative __tiv(thread); \
+ debug_only(VMNativeEntryWrapper __vew;) \
+- __ENTRY(result_type, header, thread)
++ VM_ENTRY_BASE(result_type, header, thread)
+
+
+ // Ensure that the VMNativeEntryWrapper constructor, which can cause
+-// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY).
++// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE).
+ #define JNI_QUICK_ENTRY(result_type, header) \
+ extern "C" { \
+ result_type JNICALL header { \
+@@ -555,7 +555,7 @@
+ assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
+ ThreadInVMfromNative __tiv(thread); \
+ debug_only(VMNativeEntryWrapper __vew;) \
+- __QUICK_ENTRY(result_type, header, thread)
++ VM_QUICK_ENTRY_BASE(result_type, header, thread)
+
+
+ #define JNI_LEAF(result_type, header) \
+@@ -563,7 +563,7 @@
+ result_type JNICALL header { \
+ JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
+ assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
+- __LEAF(result_type, header)
++ VM_LEAF_BASE(result_type, header)
+
+
+ // Close the routine and the extern "C"
+@@ -579,7 +579,7 @@
+ JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
+ ThreadInVMfromNative __tiv(thread); \
+ debug_only(VMNativeEntryWrapper __vew;) \
+- __ENTRY(result_type, header, thread)
++ VM_ENTRY_BASE(result_type, header, thread)
+
+
+ #define JVM_ENTRY_NO_ENV(result_type, header) \
+@@ -588,7 +588,7 @@
+ JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread(); \
+ ThreadInVMfromNative __tiv(thread); \
+ debug_only(VMNativeEntryWrapper __vew;) \
+- __ENTRY(result_type, header, thread)
++ VM_ENTRY_BASE(result_type, header, thread)
+
+
+ #define JVM_QUICK_ENTRY(result_type, header) \
+@@ -597,14 +597,14 @@
+ JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
+ ThreadInVMfromNative __tiv(thread); \
+ debug_only(VMNativeEntryWrapper __vew;) \
+- __QUICK_ENTRY(result_type, header, thread)
++ VM_QUICK_ENTRY_BASE(result_type, header, thread)
+
+
+ #define JVM_LEAF(result_type, header) \
+ extern "C" { \
+ result_type JNICALL header { \
+ VM_Exit::block_if_vm_exited(); \
+- __LEAF(result_type, header)
++ VM_LEAF_BASE(result_type, header)
+
+
+ #define JVM_END } }
diff -r 4515e31b48fa -r 78c05cb3e3c7 patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch Fri May 11 15:57:07 2012 +0100
@@ -0,0 +1,12 @@
+diff -ur openjdk.orig/hotspot/src/share/vm/opto/loopnode.cpp openjdk/hotspot/src/share/vm/opto/loopnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/loopnode.cpp 2011-11-14 17:07:36.000000000 -0500
++++ openjdk/hotspot/src/share/vm/opto/loopnode.cpp 2012-01-30 11:25:10.648080484 -0500
+@@ -546,7 +546,7 @@
+ Node* CountedLoopNode::match_incr_with_optional_truncation(
+ Node* expr, Node** trunc1, Node** trunc2, const TypeInt** trunc_type) {
+ // Quick cutouts:
+- if (expr == NULL || expr->req() != 3) return false;
++ if (expr == NULL || expr->req() != 3) return NULL;
+
+ Node *t1 = NULL;
+ Node *t2 = NULL;
diff -r 4515e31b48fa -r 78c05cb3e3c7 patches/openjdk/remove-mimpure-option-to-gcc.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/remove-mimpure-option-to-gcc.patch Fri May 11 15:57:07 2012 +0100
@@ -0,0 +1,162 @@
+diff -ur openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
+--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2011-11-14 17:11:39.000000000 -0500
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-01-30 11:27:47.181487274 -0500
+@@ -94,7 +94,7 @@
+ endif
+ endif
More information about the distro-pkg-dev
mailing list