/hg/release/icedtea6-1.11: 10 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Sep 3 16:13:37 PDT 2013
changeset 2ef554b75510 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=2ef554b75510
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Sep 03 15:27:53 2013 +0100
Fix .hgignore not to hide patches and add missing ones.
2013-02-17 Andrew John Hughes <gnu.andrew at redhat.com>
* .hgignore: Fix so the cacao patches directory
isn't hidden.
changeset c8b86d52aabc in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=c8b86d52aabc
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Sep 03 15:52:04 2013 +0100
Add backport for HotSpot suggested by Xerxes.
2013-03-26 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new backport.
* patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch:
Backport suggested by Xerxes for hs20.
changeset ec88ef4eca25 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=ec88ef4eca25
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Sep 03 17:10:47 2013 +0100
S7022999: Can't build with FORCE_TIERED=0.
2013-04-26 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new backport.
* NEWS: Updated.
* patches/hotspot/original/7022999-fastlocking_compiler1_only.patch:
Backport fix to make Zero build work following
6840152.
changeset 1efdc95c9ae0 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=1efdc95c9ae0
author: Xerxes Ranby <xerxes at zafena.se>
date: Tue Sep 03 18:10:04 2013 +0100
PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel.
2013-05-28 Xerxes Ranby <xerxes at zafena.se>
PR1188: ASM Interpreter and Thumb2 JIT javac miscompile
modulo reminder on armel.
* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
(POPF1): The POPF1 macro used wrong destination register
r0 instead of r1 on ARM armel causing issues with the frem bytecode.
The frem bytecode was the only bytecode using the defect macro.
* NEWS: Updated.
changeset c93101925a2e in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=c93101925a2e
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Sep 03 18:35:49 2013 +0100
Add dependencies of 8013196 and remove SharedSecrets fragment of 8013196 which causes a TCK regression.
2013-08-05 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patches.
* patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch,
* patches/openjdk/6636370-appcontext_simplification.patch,
* patches/openjdk/7196533-timezone_bottleneck.patch:
Backport additional patches which relate to changes in 8013196.
* patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch:
Drop SharedSecrets changes which cause a TCK regression.
changeset 44c41a07b14d in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=44c41a07b14d
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Sep 03 18:37:53 2013 +0100
Fix naming of patch.
2013-08-06 Andrew John Hughes <gnu.andrew at redhat.com>
* 8013196-TimeZone_getDefault_throws_exception.patch:
Renamed to...
* 8013196-timezone_getdefault_throws_exception.patch:
...this.
* Makefile.am:
(ICEDTEA_PATCHES): Fix name of patch.
changeset ab73a2646f3c in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=ab73a2646f3c
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Sep 03 18:39:49 2013 +0100
Fix TCK regression caused by backport of 7162902.
2013-08-28 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new backport.
* patches/openjdk/6893617-cnctx_always_uses_default_orb.patch:
Fixes TCK regression caused by 7162902.
changeset 3c193afea5f3 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=3c193afea5f3
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Sep 03 18:43:01 2013 +0100
Add latest tzdata updates.
2013-08-29 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new timezone data patches.
* patches/openjdk/8014469-tzdata2013c.patch,
* patches/openjdk/8020054-tzdata2013d.patch:
Latest tzdata updates.
changeset 222321136c48 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=222321136c48
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Sep 03 20:08:26 2013 +0100
Backport a number of JPEG fixes from 7u.
S4893408: JPEGReader throws IllegalArgException when setting the destination to BYTE_GRAY
S6631559: Registration of ImageIO plugins should not cause loading of jpeg.dlli and cmm.dll
S6791502: IIOException "Invalid icc profile" on jpeg after update from JDK5 to JDK6
S6793818: JpegImageReader is too greedy creating color profiles
S6888215: memory leak in jpeg plugin
S6989760: cmm native compiler warnings
S6989774: imageio compiler warnings in native code
S7013519: [parfait] Integer overflows in 2D code
S7018912: [parfait] potential buffer overruns in imageio jpeg
S8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc()
S8020983, RH976897: OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances
2013-08-30 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patches.
* NEWS: Updated with new patches.
* patches/imageiojpeg_sync.patch:
Bring in changes to imageioJPEG.c made between
the start of OpenJDK 6 and the start of OpenJDK 7's
hg repositories.
* patches/libraries.patch: Updated against patches below.
* patches/openjdk/4893408-jpegreader_byte_gray.patch,
* patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch,
* patches/openjdk/6791502-invalid_icc_profile.patch,
* patches/openjdk/6793818-jpegimagereader_too_greedy.patch,
* patches/openjdk/6888215-jpeg_memory_leak.patch,
* patches/openjdk/6989760-native_warnings.patch,
* patches/openjdk/6989774-imageio_compiler_warnings.patch,
* patches/openjdk/7013519-integer_overflows.patch,
* patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch,
* patches/openjdk/8005194-scale_memory_leak.patch,
* patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch:
New backports from OpenJDK 7u.
changeset 88ad9f715193 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=88ad9f715193
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Sep 04 00:13:08 2013 +0100
Backport various Makefile changes so -Wno-clobbered is only used with GCC >= 4.3.
S6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
S6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
S6799141: Build with --hash-style=both so that binaries can work on SuSE 10
S6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
S6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches)
S6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build
S7000225: Sanity check on sane-alsa-headers is broken
S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber
2013-09-02 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new backports. Move
disable-cc-incompatible-sanity-checks and freetypeversion
to the end.
* patches/disable-cc-incompatible-sanity-checks.patch,
* patches/freetypeversion.patch:
Regenerated to work after new backports.
* patches/openjdk/6563752-ss12_support.patch,
* patches/openjdk/6729772-opt_cleanup.patch,
* patches/openjdk/6799141-split_out_versions.patch,
* patches/openjdk/6816311-compiler_name.patch,
* patches/openjdk/6974017-minorver_for_solaris.patch,
* patches/openjdk/6980281-majorver_for_solaris.patch,
* patches/openjdk/7000225-bad_tabs.patch,
* patches/openjdk/7038711-fix_no-clobber_usage.patch:
Backports from OpenJDK 7 to bring in latest Makefile
updates.
* NEWS: Update and order backports numerically.
diffstat:
.hgignore | 7 +-
ChangeLog | 110 +
Makefile.am | 38 +-
NEWS | 25 +
arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 2 +-
patches/disable-cc-incompatible-sanity-checks.patch | 54 +-
patches/freetypeversion.patch | 23 +-
patches/imageiojpeg_sync.patch | 217 ++
patches/libraries.patch | 176 +-
patches/openjdk/4893408-jpegreader_byte_gray.patch | 747 ++++++++
patches/openjdk/6563752-ss12_support.patch | 173 +
patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch | 562 ++++++
patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch | 24 +
patches/openjdk/6636370-appcontext_simplification.patch | 178 +
patches/openjdk/6729772-opt_cleanup.patch | 847 +++++++++
patches/openjdk/6791502-invalid_icc_profile.patch | 269 ++
patches/openjdk/6793818-jpegimagereader_too_greedy.patch | 228 ++
patches/openjdk/6799141-split_out_versions.patch | 915 ++++++++++
patches/openjdk/6816311-compiler_name.patch | 417 ++++
patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch | 32 +
patches/openjdk/6888215-jpeg_memory_leak.patch | 56 +
patches/openjdk/6893617-cnctx_always_uses_default_orb.patch | 234 ++
patches/openjdk/6974017-minorver_for_solaris.patch | 24 +
patches/openjdk/6980281-majorver_for_solaris.patch | 66 +
patches/openjdk/6989760-native_warnings.patch | 42 +
patches/openjdk/6989774-imageio_compiler_warnings.patch | 649 +++++++
patches/openjdk/7000225-bad_tabs.patch | 48 +
patches/openjdk/7013519-integer_overflows.patch | 17 +
patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch | 21 +
patches/openjdk/7022999-fastlocking_compiler1_only.patch | 25 +
patches/openjdk/7038711-fix_no-clobber_usage.patch | 125 +
patches/openjdk/7196533-timezone_bottleneck.patch | 66 +
patches/openjdk/8005194-scale_memory_leak.patch | 25 +
patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch | 58 -
patches/openjdk/8013196-timezone_getdefault_throws_exception.patch | 39 +
patches/openjdk/8014469-tzdata2013c.patch | 276 +++
patches/openjdk/8020054-tzdata2013d.patch | 314 +++
patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch | 320 +++
38 files changed, 7241 insertions(+), 208 deletions(-)
diffs (truncated from 8181 to 500 lines):
diff -r 898aa9174be7 -r 88ad9f715193 .hgignore
--- a/.hgignore Wed Jul 10 21:24:54 2013 +0100
+++ b/.hgignore Wed Sep 04 00:13:08 2013 +0100
@@ -4,10 +4,6 @@
missing
aclocal.m4
autom4te.cache
-cacao
-netbeans
-visualvm
-bootstrap
build
debian
lib
@@ -52,3 +48,6 @@
syntax: regexp
^openjdk
+^cacao
+^bootstrap
+^jamvm
diff -r 898aa9174be7 -r 88ad9f715193 ChangeLog
--- a/ChangeLog Wed Jul 10 21:24:54 2013 +0100
+++ b/ChangeLog Wed Sep 04 00:13:08 2013 +0100
@@ -1,3 +1,113 @@
+2013-09-02 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new backports. Move
+ disable-cc-incompatible-sanity-checks and freetypeversion
+ to the end.
+ * patches/disable-cc-incompatible-sanity-checks.patch,
+ * patches/freetypeversion.patch:
+ Regenerated to work after new backports.
+ * patches/openjdk/6563752-ss12_support.patch,
+ * patches/openjdk/6729772-opt_cleanup.patch,
+ * patches/openjdk/6799141-split_out_versions.patch,
+ * patches/openjdk/6816311-compiler_name.patch,
+ * patches/openjdk/6974017-minorver_for_solaris.patch,
+ * patches/openjdk/6980281-majorver_for_solaris.patch,
+ * patches/openjdk/7000225-bad_tabs.patch,
+ * patches/openjdk/7038711-fix_no-clobber_usage.patch:
+ Backports from OpenJDK 7 to bring in latest Makefile
+ updates.
+ * NEWS: Update and order backports numerically.
+
+2013-08-30 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patches.
+ * NEWS: Updated with new patches.
+ * patches/imageiojpeg_sync.patch:
+ Bring in changes to imageioJPEG.c made between
+ the start of OpenJDK 6 and the start of OpenJDK 7's
+ hg repositories.
+ * patches/libraries.patch: Updated against patches below.
+ * patches/openjdk/4893408-jpegreader_byte_gray.patch,
+ * patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch,
+ * patches/openjdk/6791502-invalid_icc_profile.patch,
+ * patches/openjdk/6793818-jpegimagereader_too_greedy.patch,
+ * patches/openjdk/6888215-jpeg_memory_leak.patch,
+ * patches/openjdk/6989760-native_warnings.patch,
+ * patches/openjdk/6989774-imageio_compiler_warnings.patch,
+ * patches/openjdk/7013519-integer_overflows.patch,
+ * patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch,
+ * patches/openjdk/8005194-scale_memory_leak.patch,
+ * patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch:
+ New backports from OpenJDK 7u.
+
+2013-08-29 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new timezone data patches.
+ * patches/openjdk/8014469-tzdata2013c.patch,
+ * patches/openjdk/8020054-tzdata2013d.patch:
+ Latest tzdata updates.
+
+2013-08-28 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new backport.
+ * patches/openjdk/6893617-cnctx_always_uses_default_orb.patch:
+ Fixes TCK regression caused by 7162902.
+
+2013-08-06 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * 8013196-TimeZone_getDefault_throws_exception.patch:
+ Renamed to...
+ * 8013196-timezone_getdefault_throws_exception.patch:
+ ...this.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Fix name of patch.
+
+2013-08-05 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patches.
+ * patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch,
+ * patches/openjdk/6636370-appcontext_simplification.patch,
+ * patches/openjdk/7196533-timezone_bottleneck.patch:
+ Backport additional patches which relate to changes in 8013196.
+ * patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch:
+ Drop SharedSecrets changes which cause a TCK regression.
+
+2013-05-28 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ PR1188: ASM Interpreter and Thumb2 JIT javac miscompile
+ modulo reminder on armel.
+ * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
+ (POPF1): The POPF1 macro used wrong destination register
+ r0 instead of r1 on ARM armel causing issues with the frem bytecode.
+ The frem bytecode was the only bytecode using the defect macro.
+ * NEWS: Updated.
+
+2013-04-26 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new backport.
+ * NEWS: Updated.
+ * patches/hotspot/original/7022999-fastlocking_compiler1_only.patch:
+ Backport fix to make Zero build work following
+ 6840152.
+
+2013-03-26 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new backport.
+ * patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch:
+ Backport suggested by Xerxes for hs20.
+
+2013-02-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * .hgignore: Fix so the cacao patches directory
+ isn't hidden.
+
2013-07-10 Andrew John Hughes <gnu.andrew at redhat.com>
* configure.ac: Set to 1.11.13pre.
diff -r 898aa9174be7 -r 88ad9f715193 Makefile.am
--- a/Makefile.am Wed Jul 10 21:24:54 2013 +0100
+++ b/Makefile.am Wed Sep 04 00:13:08 2013 +0100
@@ -424,6 +424,16 @@
patches/openjdk/6693253-security_warning.patch \
patches/openjdk/6444769-windowwithwarningtest.patch \
patches/openjdk/6656651-windows_lcd_glyphs.patch \
+ patches/openjdk/6791502-invalid_icc_profile.patch \
+ patches/openjdk/6793818-jpegimagereader_too_greedy.patch \
+ patches/openjdk/6631559-dont_load_libjpeg_to_register_imageio_plugins.patch \
+ patches/openjdk/4893408-jpegreader_byte_gray.patch \
+ patches/openjdk/6888215-jpeg_memory_leak.patch \
+ patches/openjdk/6989774-imageio_compiler_warnings.patch \
+ patches/openjdk/7018912-potential_buffer_overruns_in_jpeg.patch \
+ patches/openjdk/6989760-native_warnings.patch \
+ patches/openjdk/7013519-integer_overflows.patch \
+ patches/openjdk/8020983-outofmemoryerror_jpegimagewriter.patch \
patches/notice-safepoints.patch \
patches/parisc-opt.patch \
patches/lucene-crash.patch \
@@ -441,7 +451,6 @@
patches/lcms.patch \
patches/print_lsb_release.patch \
patches/uname.patch \
- patches/freetypeversion.patch \
patches/nomotif-6706121.patch \
patches/nomotif.patch \
patches/nomotif-mtoolkit.patch \
@@ -468,7 +477,6 @@
patches/jtreg-jrunscript.patch \
patches/network-unreachable.patch \
patches/dnd-filelists.patch \
- patches/disable-cc-incompatible-sanity-checks.patch \
patches/explicit-target-arch.patch \
patches/openjdk/7019808-stack_noexec.patch \
patches/parisc.patch \
@@ -630,7 +638,7 @@
patches/openjdk/8012112-MlibOpsTest_fails.patch \
patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \
patches/openjdk/8012933-appcontext_disposed_too_early.patch \
- patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch \
+ patches/openjdk/8013196-timezone_getdefault_throws_exception.patch \
patches/openjdk/8014427-raster_regression.patch \
patches/openjdk/8010727-empty_logger_name.patch \
patches/openjdk/8010939-logmanager_deadlock.patch \
@@ -651,8 +659,27 @@
patches/openjdk/7158483-tzdata2012c.patch \
patches/openjdk/7198570-tzdata2012f.patch \
patches/openjdk/8002225-tzdata2012i.patch \
- patches/openjdk/8009987-tzdata2013b.patch
-
+ patches/openjdk/8009987-tzdata2013b.patch \
+ patches/openjdk/8014469-tzdata2013c.patch \
+ patches/openjdk/8020054-tzdata2013d.patch \
+ patches/openjdk/6840152-jvm_crashes_with_heavyweight_monitors.patch \
+ patches/openjdk/7022999-fastlocking_compiler1_only.patch \
+ patches/openjdk/7196533-timezone_bottleneck.patch \
+ patches/openjdk/6636370-appcontext_simplification.patch \
+ patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \
+ patches/openjdk/6893617-cnctx_always_uses_default_orb.patch \
+ patches/imageiojpeg_sync.patch \
+ patches/openjdk/8005194-scale_memory_leak.patch \
+ patches/openjdk/6563752-ss12_support.patch \
+ patches/openjdk/6729772-opt_cleanup.patch \
+ patches/openjdk/6799141-split_out_versions.patch \
+ patches/freetypeversion.patch \
+ patches/openjdk/6816311-compiler_name.patch \
+ patches/openjdk/6974017-minorver_for_solaris.patch \
+ patches/openjdk/6980281-majorver_for_solaris.patch \
+ patches/openjdk/7000225-bad_tabs.patch \
+ patches/openjdk/7038711-fix_no-clobber_usage.patch \
+ patches/disable-cc-incompatible-sanity-checks.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -708,7 +735,6 @@
patches/ecj/spp.patch \
patches/ecj/jopt.patch \
patches/ecj/jaxp-dependency.patch \
- patches/ecj/bootver.patch \
patches/ecj/getannotation-cast.patch \
patches/ecj/override.patch \
patches/ecj/xsltproc.patch \
diff -r 898aa9174be7 -r 88ad9f715193 NEWS
--- a/NEWS Wed Jul 10 21:24:54 2013 +0100
+++ b/NEWS Wed Sep 04 00:13:08 2013 +0100
@@ -13,6 +13,31 @@
New in release 1.11.13 (2013-XX-XX):
+* Backports
+ - S4893408: JPEGReader throws IllegalArgException when setting the destination to BYTE_GRAY
+ - S6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
+ - S6631559: Registration of ImageIO plugins should not cause loading of jpeg.dlli and cmm.dll
+ - S6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
+ - S6791502: IIOException "Invalid icc profile" on jpeg after update from JDK5 to JDK6
+ - S6793818: JpegImageReader is too greedy creating color profiles
+ - S6799141: Build with --hash-style=both so that binaries can work on SuSE 10
+ - S6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
+ - S6840152: JVM crashes when heavyweight monitors are used
+ - S6888215: memory leak in jpeg plugin
+ - S6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches)
+ - S6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build
+ - S6989760: cmm native compiler warnings
+ - S6989774: imageio compiler warnings in native code
+ - S7000225: Sanity check on sane-alsa-headers is broken
+ - S7013519: [parfait] Integer overflows in 2D code
+ - S7018912: [parfait] potential buffer overruns in imageio jpeg
+ - S7022999: Can't build with FORCE_TIERED=0
+ - S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber
+ - S8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc()
+ - S8020983, RH976897: OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances
+* Bug fixes
+ - PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel.
+
New in release 1.11.12 (2013-07-10):
* Security fixes
diff -r 898aa9174be7 -r 88ad9f715193 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Wed Jul 10 21:24:54 2013 +0100
+++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Wed Sep 04 00:13:08 2013 +0100
@@ -345,7 +345,7 @@
flds s1, [stack, #4]
add stack, #4
#else
- POP r0
+ POP r1
#endif
.endm
diff -r 898aa9174be7 -r 88ad9f715193 patches/disable-cc-incompatible-sanity-checks.patch
--- a/patches/disable-cc-incompatible-sanity-checks.patch Wed Jul 10 21:24:54 2013 +0100
+++ b/patches/disable-cc-incompatible-sanity-checks.patch Wed Sep 04 00:13:08 2013 +0100
@@ -1,7 +1,7 @@
diff -Nru openjdk.orig/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk
---- openjdk.orig/jdk/make/common/Sanity.gmk 2009-10-01 18:31:50.000000000 +0100
-+++ openjdk/jdk/make/common/Sanity.gmk 2009-10-02 17:51:35.000000000 +0100
-@@ -92,8 +92,11 @@
+--- openjdk.orig/jdk/make/common/Sanity.gmk 2012-10-26 19:25:40.000000000 +0100
++++ openjdk/jdk/make/common/Sanity.gmk 2013-09-02 17:26:52.257169562 +0100
+@@ -91,8 +91,11 @@
sane-ld_options \
sane-ld_run_path \
sane-alt_bootdir \
@@ -15,7 +15,7 @@
ifdef OPENJDK
sanity-all:: sane-freetype
-@@ -109,17 +112,21 @@
+@@ -108,17 +111,21 @@
# (Which only happens with a full control build. The control makefiles are
# the files that set BUILD_MOTIF).
# We cannot sanity check something that has not been built yet.
@@ -42,64 +42,36 @@
# Always check hotspot binary paths even if we are building them from scratch
diff -Nru openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
---- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2009-10-02 17:36:09.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Sanity.gmk 2009-10-02 17:52:37.000000000 +0100
-@@ -75,9 +75,14 @@
- fi )
- endif
- ifneq ($(ARCH), ia64)
-- # dummy program that outputs ALSA's version (created in target sane-alsa-versioncheck)
-- ALSA_VERSION_CHECK = $(TEMPDIR)/alsaversioncheck
-- ALSA_VERSION = `if [ -f "$(ALSA_VERSION_CHECK)" ] ; then $(ALSA_VERSION_CHECK) ; fi`
-+ ifdef CROSS_COMPILATION
-+ # assume alsa version is correct and do not check it
-+ ALSA_VERSION = 1.0.0
-+ else
-+ # dummy program that outputs ALSA's version (created in target sane-alsa-versioncheck)
-+ ALSA_VERSION_CHECK = $(TEMPDIR)/alsaversioncheck
-+ ALSA_VERSION = `if [ -f "$(ALSA_VERSION_CHECK)" ] ; then $(ALSA_VERSION_CHECK) ; fi`
-+ endif
- endif
- endif
-
-@@ -120,6 +125,15 @@
+--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2013-09-02 17:03:28.039330395 +0100
++++ openjdk/jdk/make/common/shared/Sanity.gmk 2013-09-02 17:32:35.854512833 +0100
+@@ -159,6 +159,11 @@
# Get ALL_SETTINGS defined
include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk
+ifndef CROSS_COMPILATION
+MORE_PHONY_RULES = \
-+ sane-freetype \
-+ sane-cups \
-+ sane-motif \
-+ sane-alsa-versioncheck \
-+ sane-alsa-headers
++ sane-freetype
+endif
+
.PHONY: \
sane-copyrightyear\
sane-settings \
-@@ -149,8 +163,6 @@
+@@ -187,8 +192,7 @@
sane-outputdir \
sane-alt_bootdir \
sane-bootdir \
- sane-motif \
- sane-cups \
++ sane-cups \
sane-devtools_path \
sane-compiler_path \
sane-unixcommand_path \
-@@ -168,13 +180,11 @@
- sane-compiler \
- sane-link \
- sane-cacerts \
-- sane-alsa-versioncheck \
-- sane-alsa-headers \
- sane-ant_version \
+@@ -211,7 +215,7 @@
sane-zip_version \
sane-unzip_version \
-- sane-msvcrt_path \
+ sane-msvcrt_path \
- sane-freetype
-+ sane-msvcrt_path \
-+ $(MORE_PHONY_RULES)
++ $(MORE_PHONY_RULES)
######################################################
# check for COPYRIGHT_YEAR variable
diff -r 898aa9174be7 -r 88ad9f715193 patches/freetypeversion.patch
--- a/patches/freetypeversion.patch Wed Jul 10 21:24:54 2013 +0100
+++ b/patches/freetypeversion.patch Wed Sep 04 00:13:08 2013 +0100
@@ -1,11 +1,12 @@
---- openjdk/jdk/make/common/shared/Platform.gmk.orig
-+++ openjdk/jdk/make/common/shared/Platform.gmk
-@@ -94,7 +94,7 @@
- REQUIRED_BOOT_VER = 1.5
-
- # If we are using freetype, this is the required version
--REQUIRED_FREETYPE_VERSION=2.3.0
-+REQUIRED_FREETYPE_VERSION=2.2.1
-
- #
- # Prune out all known SCM (Source Code Management) directories
+diff -Nru openjdk.orig/jdk/make/common/shared/Defs-versions.gmk openjdk/jdk/make/common/shared/Defs-versions.gmk
+--- openjdk.orig/jdk/make/common/shared/Defs-versions.gmk 2013-09-02 15:32:33.490472903 +0100
++++ openjdk/jdk/make/common/shared/Defs-versions.gmk 2013-09-02 15:33:00.154887749 +0100
+@@ -176,7 +176,7 @@
+ # Generic
+ REQUIRED_ANT_VER = 1.6.3
+ REQUIRED_BOOT_VER = 1.5
+-REQUIRED_FREETYPE_VERSION = 2.3.0
++REQUIRED_FREETYPE_VERSION = 2.2.1
+ REQUIRED_MAKE_VER = 3.78
+ REQUIRED_UNZIP_VER = 5.12
+ REQUIRED_ZIP_VER = 2.2
diff -r 898aa9174be7 -r 88ad9f715193 patches/imageiojpeg_sync.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/imageiojpeg_sync.patch Wed Sep 04 00:13:08 2013 +0100
@@ -0,0 +1,217 @@
+diff -Nru openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
+--- openjdk.orig/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-08-30 18:50:38.238272213 +0100
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-08-30 18:57:43.240892673 +0100
+@@ -447,9 +447,6 @@
+ pixelBuffer pixelBuf; // Buffer for pixels
+
+ jboolean abortFlag; // Passed down from Java abort method
+-
+- UINT8 scale[MAX_BANDS][NUM_INPUT_VALUES];
+- int bandSizes[MAX_BANDS]; // For scaling to-from non-8-bit images
+ } imageIOData, *imageIODataPtr;
+
+ /*
+@@ -487,12 +484,6 @@
+
+ data->abortFlag = JNI_FALSE;
+
+- for (i = 0; i < MAX_BANDS; i ++) {
+- data->bandSizes[i] = 0;
+- for (j = 0; j < NUM_INPUT_VALUES; j++) {
+- data->scale[i][j] = 0;
+- }
+- }
+ return data;
+ }
+
+@@ -1978,34 +1969,6 @@
+
+ (*env)->ReleaseIntArrayElements(env, srcBands, body, JNI_ABORT);
+
+- bandSize = (*env)->GetIntArrayElements(env, bandSizes, NULL);
+-
+- for (i = 0; i < numBands; i++) {
+- if (bandSize[i] != JPEG_BAND_SIZE) {
+- mustScale = TRUE;
+- break;
+- }
+- }
+-
+- if (mustScale) {
+- // Build any scale tables that aren't already OK
+- for (i = 0; i < numBands; i++) {
+- if (data->bandSizes[i] != bandSize[i]) {
+- data->bandSizes[i] = bandSize[i];
+- maxBandValue = (1 << bandSize[i]) - 1;
+- halfMaxBandValue = maxBandValue >> 1;
+- for (j = 0; j <= maxBandValue; j++) {
+- data->scale[i][j] =
+- (UINT8)((j*MAX_JPEG_BAND_VALUE
+- + halfMaxBandValue)/maxBandValue);
+- }
+- }
+- }
+- }
+-
+- (*env)->ReleaseIntArrayElements(env, bandSizes,
+- bandSize, JNI_ABORT);
+-
+ #ifdef DEBUG_IIO_JPEG
+ printf("---- in reader.read ----\n");
+ printf("numBands is %d\n", numBands);
+@@ -2028,15 +1991,6 @@
+ return data->abortFlag; // We already threw an out of memory exception
+ }
+
+- // Allocate a 1-scanline buffer
+- if (cinfo->num_components <= 0 ||
+- cinfo->image_width > (UINT_MAX / (unsigned int)cinfo->num_components))
+- {
+- RELEASE_ARRAYS(env, data, src->next_input_byte);
+- JNU_ThrowByName(env, "javax/imageio/IIOException",
+- "Invalid number of color components");
+- return data->abortFlag;
+- }
+ /* Establish the setjmp return context for sun_jpeg_error_exit to use. */
+ jerr = (sun_jpeg_error_ptr) cinfo->err;
+
+@@ -2154,15 +2108,8 @@
+
+ // Now mangle it into our buffer
+ out = data->pixelBuf.buf.bp;
+- if (mustScale) {
+- for (in = scanLinePtr+sourceXStart*cinfo->num_components;
+- in < pixelLimit;
+- in += pixelStride) {
+- for (i = 0; i < numBands; i++) {
+- *out++ = data->scale[i][*(in+bands[i])];
+- }
+- }
+- } else if (orderedBands && (pixelStride == numBands)) {
++
++ if (orderedBands && (pixelStride == numBands)) {
+ // Optimization: The component bands are ordered sequentially,
+ // so we can simply use memcpy() to copy the intermediate
+ // scanline buffer into the raster.
+@@ -2177,7 +2124,7 @@
+ } else {
+ numBytes = numBands;
+ for (in = scanLinePtr+sourceXStart*cinfo->output_components;
+- in < pixelLimit &&
++ in < pixelLimit &&
+ numBytes <= data->pixelBuf.byteBufferLength;
+ in += pixelStride) {
+ for (i = 0; i < numBands; i++) {
More information about the distro-pkg-dev
mailing list