/hg/icedtea7: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Aug 3 10:55:48 PDT 2011
changeset 3ac37175420b in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=3ac37175420b
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Aug 03 17:58:24 2011 +0100
Allow bootstrap build to work with current GNU Classpath CVS.
2011-08-03 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Apply explicit-inner-class-headers
patch as required.
* acinclude.m4: Test for PR classpath/45526 explicitly instead
of assuming it is present when the other bugs are (not true
with current Classpath CVS).
* patches/boot/explicit-inner-class-headers.patch: Split out
from javah.patch so as to apply when other bugs aren't
present.
* patches/boot/javah.patch: Remove above patch.
changeset a42d0626100f in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=a42d0626100f
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Aug 03 18:01:15 2011 +0100
Fix Pavel's ChangeLog entry.
changeset ae4845b32444 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=ae4845b32444
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Aug 03 18:19:34 2011 +0100
PR586: Add missing sources to src.zip. G356743: Support building
against libpng 1.5.
2011-08-03 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (JDK_CHANGESET): Updated to bring in
libpng 1.5 and src.zip fixes. (JDK_SHA256SUM): Likewise.
* NEWS: Updated.
changeset 39e5e6de461a in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=39e5e6de461a
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Aug 03 18:21:10 2011 +0100
Update NEWS with list of changes from Pavel's HotSpot update.
2011-08-03 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Updated with changes from Pavel's HotSpot
update.
diffstat:
ChangeLog | 37 ++++++++++++++++++++++--
Makefile.am | 8 ++++-
NEWS | 6 ++++
acinclude.m4 | 36 ++++++++++++++++++++++++
patches/boot/explicit-inner-class-headers.patch | 23 +++++++++++++++
patches/boot/javah.patch | 23 ---------------
6 files changed, 104 insertions(+), 29 deletions(-)
diffs (205 lines):
diff -r e29c130ded8b -r 39e5e6de461a ChangeLog
--- a/ChangeLog Wed Aug 03 11:09:45 2011 +0200
+++ b/ChangeLog Wed Aug 03 18:21:10 2011 +0100
@@ -1,9 +1,38 @@
-2011-08-03 Andrew Haley <aph at redhat.com>
-
- Fixed bug #7073913 in src/share/vm/runtime/os.cpp
+2011-08-03 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Updated with changes from
+ Pavel's HotSpot update.
+
+2011-08-03 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (JDK_CHANGESET): Updated to bring in
+ libpng 1.5 and src.zip fixes.
+ (JDK_SHA256SUM): Likewise.
+ * NEWS: Updated.
+
+2011-08-03 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Apply explicit-inner-class-headers patch as required.
+ * acinclude.m4: Test for PR classpath/45526
+ explicitly instead of assuming it is present
+ when the other bugs are (not true with current
+ Classpath CVS).
+ * patches/boot/explicit-inner-class-headers.patch:
+ Split out from javah.patch so as to apply when other
+ bugs aren't present.
+ * patches/boot/javah.patch:
+ Remove above patch.
+
+2011-08-03 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ Brought in fix #7073913 in src/share/vm/runtime/os.cpp
which caused random segfaults due to buffer
overflow and incorrect usage of int variable
- instead of char (byte) one.
+ instead of char (byte) one. Also brought in
+ 7068051, 7044738 and 7070134 fixes for HotSpot
+ loop bugs.
* Makefile.am:
(HOTSPOT_CHANGESET): Updated.
(HOTSPOT_SHA256SUM): Likewise.
diff -r e29c130ded8b -r 39e5e6de461a Makefile.am
--- a/Makefile.am Wed Aug 03 11:09:45 2011 +0200
+++ b/Makefile.am Wed Aug 03 18:21:10 2011 +0100
@@ -6,7 +6,7 @@
HOTSPOT_CHANGESET = 1dd9b3d73b22
JAXP_CHANGESET = c40983d6ae70
JAXWS_CHANGESET = 83db5e316798
-JDK_CHANGESET = ccf86bbc61fd
+JDK_CHANGESET = e46d527097f1
LANGTOOLS_CHANGESET = fb7fb3071b64
OPENJDK_CHANGESET = 3defd24c2671
@@ -14,7 +14,7 @@
HOTSPOT_SHA256SUM = ffb1831a63e950bb7ade46a5382cb71d2603e0f40b3f758eb346833e18fca150
JAXP_SHA256SUM = 6ab0cab1965edb28e4093b55436abd04fbffe0b0251016043c75246c4ee9dc2d
JAXWS_SHA256SUM = 5567c90ce2857016365b2e346783a3b16ec0e76b80586a0371f601b4fed01f21
-JDK_SHA256SUM = aedc601afad003ae30b9268cd47c229d00636c488ad921ce02883f68f35842e0
+JDK_SHA256SUM = 0cd074fb2400c95d013373847b5c52bb13997acbb6530507e384856583e1abd4
LANGTOOLS_SHA256SUM = 9ddc00ec50fd2f5e331dc2bc10da4e23b69bf644eb92d50b39a2003c18fb5aa1
OPENJDK_SHA256SUM = 4043a75c2c4385dd735f8dbbf2369311ce1b951217c9dbe9bba9609e24eb291e
@@ -374,6 +374,10 @@
patches/boot/javah.patch
endif
+if CP45526_JAVAH
+ICEDTEA_BOOT_PATCHES += patches/boot/explicit-inner-class-headers.patch
+endif
+
if CP40616
ICEDTEA_BOOT_PATCHES += patches/boot/pr40616.patch
endif
diff -r e29c130ded8b -r 39e5e6de461a NEWS
--- a/NEWS Wed Aug 03 11:09:45 2011 +0200
+++ b/NEWS Wed Aug 03 18:21:10 2011 +0100
@@ -15,6 +15,12 @@
- PR767: Annotation Processing Filer.getResource() always throws FileNotFoundException
- Allow the compiler used to be overridden by setting BUILD_GCC/BUILD_CPP.
- Fixed regression test runtime/7020373.
+ - PR586: Add missing sources to src.zip.
+ - G356743: Support building against libpng 1.5.
+ - S7070134: Hotspot crashes with sigsegv from PorterStemmer
+ - S7044738: Loop unroll optimization causes incorrect result
+ - S7068051: SIGSEGV in PhaseIdealLoop::build_loop_late_post
+ - S7073913: Avoid random segfaults.
* Zero/Shark
- PR757, 7066143: 7009309 regression: x86 stubRoutines
- PR753, 7066143: 7009923 regression
diff -r e29c130ded8b -r 39e5e6de461a acinclude.m4
--- a/acinclude.m4 Wed Aug 03 11:09:45 2011 +0200
+++ b/acinclude.m4 Wed Aug 03 18:21:10 2011 +0100
@@ -1277,10 +1277,46 @@
fi
])
rm -f $SUBCLASS $SUPERCLASS $SUBHEADER *.class
+AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 45526], it_cv_cp45526_javah, [
+SRC=Test.java
+CLASSFILE=$(echo $SRC|sed 's#\.java##')
+HEADER=$(echo $SRC|sed 's#\.java#.h#')
+cat << \EOF > $SRC
+/* [#]line __oline__ "configure" */
+public class Test
+{
+ public native void doStuff();
+
+ public class Inner
+ {
+ public native int doMoreStuff(long ptr);
+ }
+}
+EOF
+if $JAVAC -cp . $JAVACFLAGS $SRC >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVAH -classpath . $CLASSFILE >&AS_MESSAGE_LOG_FD 2>&1; then
+ if test -e Test_Inner.h ; then
+ it_cv_cp45526_javah=no;
+ else
+ it_cv_cp45526_javah=yes;
+ fi
+ else
+ AC_MSG_ERROR([The Java header generator $JAVAH failed])
+ echo "configure: failed program was:" >&AC_FD_CC
+ cat $SUBCLASS >&AC_FD_CC
+ fi
+else
+ AC_MSG_ERROR([The Java compiler $JAVAC failed])
+ echo "configure: failed program was:" >&AC_FD_CC
+ cat $SUBCLASS >&AC_FD_CC
+fi
+])
+rm -f $SRC *.class *.h
cd ..
rmdir tmp.$$
AM_CONDITIONAL([CP39408_JAVAH], test x"${it_cv_cp39408_javah}" = "xyes")
AM_CONDITIONAL([CP40188_JAVAH], test x"${it_cv_cp40188_javah}" = "xyes")
+AM_CONDITIONAL([CP45526_JAVAH], test x"${it_cv_cp45526_javah}" = "xyes")
AM_CONDITIONAL([JAVAH_SUPPORTS_X_OPTIONS], test x"${it_cv_javahx}" = "xyes")
AC_PROVIDE([$0])dnl
])
diff -r e29c130ded8b -r 39e5e6de461a patches/boot/explicit-inner-class-headers.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/explicit-inner-class-headers.patch Wed Aug 03 18:21:10 2011 +0100
@@ -0,0 +1,25 @@
+diff -Nru openjdk-boot.orig/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk
+--- openjdk-boot.orig/jdk/make/common/Rules.gmk 2009-12-13 20:37:41.000000000 +0000
++++ openjdk-boot/jdk/make/common/Rules.gmk 2009-12-13 21:11:04.000000000 +0000
+@@ -303,7 +303,11 @@
+ $(prep-target)
+ @$(ECHO) "# Running javah:"
+ $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
+- $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
++ $(CLASSES.export)
++ $(foreach innerclass,$(subst $$,\$$,$(EXPORTED_inner)), \
++ $(JAVAH_CMD) \
++ -o $(CLASSHDRDIR)/$(subst .,_,$(subst \$$,_,$(innerclass))).h \
++ $(innerclass))
+ @$(java-vm-cleanup)
+ @$(TOUCH) $@
+
+diff -Nru openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk
+--- openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-12-04 23:26:35.000000000 +0000
++++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk 2009-12-13 21:11:04.000000000 +0000
+@@ -189,3 +189,5 @@
+ java/awt/dnd/DnDConstants.java \
+ sun/awt/CausedFocusEvent.java
+
++EXPORTED_inner = \
++ sun.java2d.opengl.OGLContext$$OGLContextCaps
diff -r e29c130ded8b -r 39e5e6de461a patches/boot/javah.patch
--- a/patches/boot/javah.patch Wed Aug 03 11:09:45 2011 +0200
+++ b/patches/boot/javah.patch Wed Aug 03 18:21:10 2011 +0100
@@ -1,28 +1,3 @@
-diff -Nru openjdk-boot.orig/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk
---- openjdk-boot.orig/jdk/make/common/Rules.gmk 2009-12-13 20:37:41.000000000 +0000
-+++ openjdk-boot/jdk/make/common/Rules.gmk 2009-12-13 21:11:04.000000000 +0000
-@@ -303,7 +303,11 @@
- $(prep-target)
- @$(ECHO) "# Running javah:"
- $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
-- $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
-+ $(CLASSES.export)
-+ $(foreach innerclass,$(subst $$,\$$,$(EXPORTED_inner)), \
-+ $(JAVAH_CMD) \
-+ -o $(CLASSHDRDIR)/$(subst .,_,$(subst \$$,_,$(innerclass))).h \
-+ $(innerclass))
- @$(java-vm-cleanup)
- @$(TOUCH) $@
-
-diff -Nru openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk
---- openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-12-04 23:26:35.000000000 +0000
-+++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk 2009-12-13 21:11:04.000000000 +0000
-@@ -189,3 +189,5 @@
- java/awt/dnd/DnDConstants.java \
- sun/awt/CausedFocusEvent.java
-
-+EXPORTED_inner = \
-+ sun.java2d.opengl.OGLContext$$OGLContextCaps
diff -Nru openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
--- openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-12-04 23:33:16.000000000 +0000
+++ openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-12-13 21:11:04.000000000 +0000
More information about the distro-pkg-dev
mailing list