/hg/icedtea6: Add unreleased upstream patches.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Mar 25 23:25:02 UTC 2014
changeset 03d11116ab06 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=03d11116ab06
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Mar 25 23:24:47 2014 +0000
Add unreleased upstream patches.
2014-03-25 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(UPSTREAMED_PATCHES): Add patches from unreleased upstream.
(ICEDTEA_PATCHES): Include UPSTREAMED_PATCHES.
* NEWS: Updated.
* patches/openjdk/7110396-sound_code_build_fix.patch,
* patches/openjdk/8035893-jvm_getversioninfo_zeroing.patch,
* patches/openjdk/oj6-29-jdk_version_info_zeroing.patch:
Add new patches from upstream.
diffstat:
ChangeLog | 16 +++++
Makefile.am | 6 ++
NEWS | 3 +
patches/linker-libs-order.patch | 44 +++++----------
patches/openjdk/7110396-sound_code_build_fix.patch | 22 ++++++++
patches/openjdk/8035893-jvm_getversioninfo_zeroing.patch | 21 +++++++
patches/openjdk/oj6-29-jdk_version_info_zeroing.patch | 21 +++++++
7 files changed, 105 insertions(+), 28 deletions(-)
diffs (189 lines):
diff -r 0ef5e61b1b00 -r 03d11116ab06 ChangeLog
--- a/ChangeLog Mon Mar 24 16:53:24 2014 -0400
+++ b/ChangeLog Tue Mar 25 23:24:47 2014 +0000
@@ -1,3 +1,19 @@
+2014-03-25 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (UPSTREAMED_PATCHES): Add patches from unreleased upstream.
+ (ICEDTEA_PATCHES): Include UPSTREAMED_PATCHES.
+ * NEWS: Updated.
+ * patches/openjdk/7110396-sound_code_build_fix.patch,
+ * patches/openjdk/8035893-jvm_getversioninfo_zeroing.patch,
+ * patches/openjdk/oj6-29-jdk_version_info_zeroing.patch:
+ Add new patches from upstream.
+
+2014-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/linker-libs-order.patch:
+ Regenerate, removing upstreamed fragment.
+
2014-03-24 Pavel Tisnovsky <ptisnovs at redhat.com>
* contrib/jck/compile-native-code.sh:
diff -r 0ef5e61b1b00 -r 03d11116ab06 Makefile.am
--- a/Makefile.am Mon Mar 24 16:53:24 2014 -0400
+++ b/Makefile.am Tue Mar 25 23:24:47 2014 +0000
@@ -313,9 +313,15 @@
patches/lcms.patch
endif
+UPSTREAMED_PATCHES = \
+ patches/openjdk/7110396-sound_code_build_fix.patch \
+ patches/openjdk/8035893-jvm_getversioninfo_zeroing.patch \
+ patches/openjdk/oj6-29-jdk_version_info_zeroing.patch
+
ICEDTEA_PATCHES = \
$(DROP_PATCHES) \
$(SECURITY_PATCHES) \
+ $(UPSTREAMED_PATCHES) \
patches/openjdk/6733501-icedtea_lcms_test.patch \
$(LCMS_PATCHES) \
patches/openjdk/4993545-nativeinlightfixer.patch \
diff -r 0ef5e61b1b00 -r 03d11116ab06 NEWS
--- a/NEWS Mon Mar 24 16:53:24 2014 -0400
+++ b/NEWS Tue Mar 25 23:24:47 2014 +0000
@@ -15,9 +15,12 @@
New in release 1.14.0 (201X-XX-XX):
* Backports
+ - S7110396: Sound code fails to build with gcc 4.6 on multiarch Linux systems
- S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
- S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory()
- S8026887: Make issues due to failed large pages allocations easier to debug
+ - S8035893: JVM_GetVersionInfo fails to zero structure
+ - OPENJDK6-29: JDK fails to zero jdk_version_info correctly
* Bug fixes
- PR1714: Update PaX support to detect running PaX kernel and use newer tools
- PR1712, G455426: Allow -Werror to be turned off in the HotSpot build
diff -r 0ef5e61b1b00 -r 03d11116ab06 patches/linker-libs-order.patch
--- a/patches/linker-libs-order.patch Mon Mar 24 16:53:24 2014 -0400
+++ b/patches/linker-libs-order.patch Tue Mar 25 23:24:47 2014 +0000
@@ -1,7 +1,19 @@
-diff -durN openjdk-orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
---- openjdk-orig/jdk/make/common/shared/Sanity.gmk 2008-10-27 00:25:33.000000000 +0000
-+++ openjdk/jdk/make/common/shared/Sanity.gmk 2008-10-28 21:42:16.000000000 +0000
-@@ -1397,7 +1397,7 @@
+diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
+--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2013-08-21 20:32:57.128216515 +0100
++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2014-02-01 15:58:10.921834941 +0000
+@@ -144,7 +144,7 @@
+
+ $(UNPACK_EXE): $(UNPACK_EXE_FILES_o) winres
+ $(prep-target)
+- $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
++ $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
+ $(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
+
+
+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 2014-02-01 15:43:22.344232267 +0000
++++ openjdk/jdk/make/common/shared/Sanity.gmk 2014-02-01 15:58:10.921834941 +0000
+@@ -1344,7 +1344,7 @@
ifdef ALSA_VERSION_CHECK
$(ALSA_VERSION_CHECK): $(ALSA_VERSION_CHECK).c
@$(prep-target)
@@ -10,27 +22,3 @@
$(ALSA_VERSION_CHECK).c:
@$(prep-target)
-diff -durN openjdk-orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk/jdk/make/javax/sound/jsoundalsa/Makefile
---- openjdk-orig/jdk/make/javax/sound/jsoundalsa/Makefile 2008-08-28 09:10:50.000000000 +0100
-+++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2008-10-28 21:55:27.000000000 +0000
-@@ -65,7 +65,7 @@
- $(MIDIFILES_export) \
- $(PORTFILES_export)
-
--LDFLAGS += -lasound
-+OTHER_LDLIBS += -lasound
-
- CPPFLAGS += \
- -DUSE_DAUDIO=TRUE \
-diff -durN openjdk-orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
---- openjdk-orig/jdk/make/com/sun/java/pack/Makefile 2008-10-27 00:25:30.000000000 +0000
-+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2008-10-28 23:27:55.000000000 +0000
-@@ -142,7 +141,7 @@
-
- $(UNPACK_EXE): $(UNPACK_EXE_FILES_o) winres
- $(prep-target)
-- $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
-+ $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
- $(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
-
-
diff -r 0ef5e61b1b00 -r 03d11116ab06 patches/openjdk/7110396-sound_code_build_fix.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7110396-sound_code_build_fix.patch Tue Mar 25 23:24:47 2014 +0000
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User mr
+# Date 1327351181 28800
+# Mon Jan 23 12:39:41 2012 -0800
+# Node ID b49e33de40eafc113d3ca822f4abe2fde31d2cc2
+# Parent 07a296eb4c9cb88d2d84561ecfe70e10b167a2ac
+7110396: Sound code fails to build with gcc 4.6 on multiarch Linux systems
+Reviewed-by: ohair
+Contributed-by: edvard.wendelin at oracle.com
+
+diff -r 07a296eb4c9c -r b49e33de40ea make/javax/sound/jsoundalsa/Makefile
+--- openjdk/jdk/make/javax/sound/jsoundalsa/Makefile Tue Jan 21 13:39:13 2014 -0500
++++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile Mon Jan 23 12:39:41 2012 -0800
+@@ -65,7 +65,7 @@
+ $(MIDIFILES_export) \
+ $(PORTFILES_export)
+
+-LDFLAGS += -lasound
++OTHER_LDLIBS += -lasound
+
+ CPPFLAGS += \
+ -DUSE_DAUDIO=TRUE \
diff -r 0ef5e61b1b00 -r 03d11116ab06 patches/openjdk/8035893-jvm_getversioninfo_zeroing.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/8035893-jvm_getversioninfo_zeroing.patch Tue Mar 25 23:24:47 2014 +0000
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User igerasim
+# Date 1393588840 -14400
+# Fri Feb 28 16:00:40 2014 +0400
+# Node ID 72a544aeb89217020b60c10fe167e2567fea3460
+# Parent 9747f83d7a38205a4a26008ee767fd161e1856c2
+8035893: JVM_GetVersionInfo fails to zero structure
+Reviewed-by: sla, zgu
+
+diff -r 9747f83d7a38 -r 72a544aeb892 src/share/vm/prims/jvm.cpp
+--- openjdk/hotspot/src/share/vm/prims/jvm.cpp Fri Mar 21 20:57:28 2014 +0000
++++ openjdk/hotspot/src/share/vm/prims/jvm.cpp Fri Feb 28 16:00:40 2014 +0400
+@@ -4534,7 +4534,7 @@
+
+ JVM_ENTRY(void, JVM_GetVersionInfo(JNIEnv* env, jvm_version_info* info, size_t info_size))
+ {
+- memset(info, 0, sizeof(info_size));
++ memset(info, 0, info_size);
+
+ info->jvm_version = Abstract_VM_Version::jvm_version();
+ info->update_version = 0; /* 0 in HotSpot Express VM */
diff -r 0ef5e61b1b00 -r 03d11116ab06 patches/openjdk/oj6-29-jdk_version_info_zeroing.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/oj6-29-jdk_version_info_zeroing.patch Tue Mar 25 23:24:47 2014 +0000
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User aph
+# Date 1393513709 0
+# Thu Feb 27 15:08:29 2014 +0000
+# Node ID 04e4c3ec6516727f01f91a9ce8cb72586a3bc502
+# Parent 942d4ba93be74b1c401d6532f116da80f5466303
+OPENJDK6-29: JDK fails to zero jdk_version_info correctly
+Reviewed-by: andrew
+
+diff -r 942d4ba93be7 -r 04e4c3ec6516 src/share/native/common/jdk_util.c
+--- openjdk/jdk/src/share/native/common/jdk_util.c Wed Feb 26 18:06:02 2014 +0000
++++ openjdk/jdk/src/share/native/common/jdk_util.c Thu Feb 27 15:08:29 2014 +0000
+@@ -76,7 +76,7 @@
+ }
+
+
+- memset(info, 0, sizeof(info_size));
++ memset(info, 0, info_size);
+ info->jdk_version = ((jdk_major_version & 0xFF) << 24) |
+ ((jdk_minor_version & 0xFF) << 16) |
+ ((jdk_micro_version & 0xFF) << 8) |
More information about the distro-pkg-dev
mailing list