/hg/release/icedtea6-1.13: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Mar 26 12:54:22 UTC 2014
changeset fad7f1e7be70 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=fad7f1e7be70
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Mar 26 05:05:39 2014 +0000
PR1714: Update PaX support to detect running PaX kernel and use newer tools
2014-03-25 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1714: Update PaX support to detect running PaX
kernel and use newer tools
* Makefile.am:
(add-archive): Depend on pax-mark-vm as the target executes java.
(add-archive-debug): Likewise with pax-mark-vm-debug.
(check-crypto): Depend on pax-mark-vm as the target executes java.
(check-crypto-debug): Likewise with pax-mark-vm-debug.
(add-archive-ecj): Depend on pax-mark-vm-ecj as the target executes java.
(check-crypto-boot): Likewise.
* NEWS: Updated.
* acinclude.m4:
(IT_HAS_PAX): New macro to detect whether the running
kernel uses PaX.
(IT_WITH_PAX): Rewritten to search for PaX tools -
currently paxmark.sh, paxctl-ng, chpax and paxctl -
and fail if a tool isn't found and a PaX kernel is
being used.
changeset aea5755bef42 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=aea5755bef42
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Mar 20 02:06:20 2014 +0000
PR1712: Allow -Werror to be turned off in the HotSpot build
2012-08-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR1712: Allow -Werror to be turned off in the
HotSpot build
* Makefile.am:
(WERROR_STATUS): Set to true or false
depending on if ENABLE_WERROR is set or not.
(ICEDTEA_ENV): Use WERROR_STATUS to set
COMPILER_WARNINGS_FATAL.
* acinclude.m4:
(IT_ENABLE_WERROR): New macro to enable -Werror.
This is disabled by default.
* configure.ac: Call IT_ENABLE_WERROR.
* NEWS: Updated.
changeset 9408a82b3d19 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=9408a82b3d19
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Mar 26 06:34:03 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.
2014-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/linker-libs-order.patch:
Regenerate, removing upstreamed fragment.
diffstat:
ChangeLog | 51 ++++++
Makefile.am | 27 ++-
NEWS | 8 +
acinclude.m4 | 117 ++++++++++----
configure.ac | 1 +
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 ++
9 files changed, 245 insertions(+), 67 deletions(-)
diffs (455 lines):
diff -r 8796f8cdd621 -r 9408a82b3d19 ChangeLog
--- a/ChangeLog Thu Jan 23 18:56:55 2014 +0000
+++ b/ChangeLog Wed Mar 26 06:34:03 2014 +0000
@@ -1,3 +1,54 @@
+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.
+
+2012-08-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR1712: Allow -Werror to be turned off in the
+ HotSpot build
+ * Makefile.am:
+ (WERROR_STATUS): Set to true or false
+ depending on if ENABLE_WERROR is set or not.
+ (ICEDTEA_ENV): Use WERROR_STATUS to set
+ COMPILER_WARNINGS_FATAL.
+ * acinclude.m4:
+ (IT_ENABLE_WERROR): New macro to enable -Werror.
+ This is disabled by default.
+ * configure.ac: Call IT_ENABLE_WERROR.
+ * NEWS: Updated.
+
+2014-03-25 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1714: Update PaX support to detect running PaX
+ kernel and use newer tools
+ * Makefile.am:
+ (add-archive): Depend on pax-mark-vm as the target executes java.
+ (add-archive-debug): Likewise with pax-mark-vm-debug.
+ (check-crypto): Depend on pax-mark-vm as the target executes java.
+ (check-crypto-debug): Likewise with pax-mark-vm-debug.
+ (add-archive-ecj): Depend on pax-mark-vm-ecj as the target executes java.
+ (check-crypto-boot): Likewise.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_HAS_PAX): New macro to detect whether the running
+ kernel uses PaX.
+ (IT_WITH_PAX): Rewritten to search for PaX tools -
+ currently paxmark.sh, paxctl-ng, chpax and paxctl -
+ and fail if a tool isn't found and a PaX kernel is
+ being used.
+
2014-01-23 Andrew John Hughes <gnu.andrew at redhat.com>
* acinclude.m4:
diff -r 8796f8cdd621 -r 9408a82b3d19 Makefile.am
--- a/Makefile.am Thu Jan 23 18:56:55 2014 +0000
+++ b/Makefile.am Wed Mar 26 06:34:03 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 \
@@ -775,6 +781,12 @@
ICEDTEA_PKG = $(EMPTY) (${PKGVERSION})
endif
+if ENABLE_WERROR
+WERROR_STATUS=true
+else
+WERROR_STATUS=false
+endif
+
ICEDTEA_ENV = \
ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \
ANT="$(ANT)" \
@@ -817,7 +829,8 @@
ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \
STATIC_CXX="false" \
BUILD_GCC=gcc$(GCC_SUFFIX) \
- BUILD_CXX=g++$(GCC_SUFFIX)
+ BUILD_CXX=g++$(GCC_SUFFIX) \
+ COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)"
if ENABLE_CACAO
ICEDTEA_ENV += \
@@ -1986,7 +1999,7 @@
fi
rm -f stamps/add-tzdata-support-debug.stamp
-stamps/add-archive.stamp: stamps/icedtea.stamp
+stamps/add-archive.stamp: stamps/pax-mark-vm.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
if !ZERO_BUILD
@@ -2002,7 +2015,7 @@
rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
rm -f stamps/add-archive.stamp
-stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
+stamps/add-archive-debug.stamp: stamps/pax-mark-vm-debug.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
if !ZERO_BUILD
@@ -2036,7 +2049,7 @@
clean-pax-mark-vm-debug:
rm -f stamps/pax-mark-vm-debug.stamp
-stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp
+stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm.stamp
if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
$(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
fi
@@ -2046,7 +2059,7 @@
clean-check-crypto:
rm -f stamps/check-crypto.stamp
-stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp
+stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm-debug.stamp
if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
fi
@@ -2205,7 +2218,7 @@
fi
rm -f stamps/add-tzdata-support-ecj.stamp
-stamps/add-archive-ecj.stamp: stamps/icedtea-ecj.stamp
+stamps/add-archive-ecj.stamp: stamps/pax-mark-vm-ecj.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
if !ZERO_BUILD
@@ -2230,7 +2243,7 @@
clean-pax-mark-vm-ecj:
rm -f stamps/pax-mark-vm-ecj.stamp
-stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-ecj.stamp
+stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm-ecj.stamp
if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
$(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
fi
diff -r 8796f8cdd621 -r 9408a82b3d19 NEWS
--- a/NEWS Thu Jan 23 18:56:55 2014 +0000
+++ b/NEWS Wed Mar 26 06:34:03 2014 +0000
@@ -14,6 +14,14 @@
New in release 1.13.2 (2014-04-XX):
+* Backports
+ - S7110396: Sound code fails to build with gcc 4.6 on multiarch Linux systems
+ - 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
+
New in release 1.13.1 (2014-01-22):
* Security fixes
diff -r 8796f8cdd621 -r 9408a82b3d19 acinclude.m4
--- a/acinclude.m4 Thu Jan 23 18:56:55 2014 +0000
+++ b/acinclude.m4 Wed Mar 26 06:34:03 2014 +0000
@@ -2139,48 +2139,79 @@
AM_CONDITIONAL([VM_SUPPORTS_XBOOTCLASSPATH], test x"${it_cv_xbootclasspath_works}" = "xyes")
])
+AC_DEFUN_ONCE([IT_HAS_PAX],
+[
+ AC_MSG_CHECKING([if a PaX kernel is in use])
+ if cat /proc/self/status | grep '^PaX' >&AS_MESSAGE_LOG_FD 2>&1; then
+ pax_active=yes;
+ else
+ pax_active=no;
+ fi
+ AC_MSG_RESULT([${pax_active}])
+ AM_CONDITIONAL([USING_PAX], test x"${pax_active}" = "xyes")
+])
+
AC_DEFUN_ONCE([IT_WITH_PAX],
[
- AC_MSG_CHECKING([for pax utility to use])
+ AC_REQUIRE([IT_HAS_PAX])
+ PAX_DEFAULT=/usr/sbin/paxmark.sh
+ AC_MSG_CHECKING([if a PaX utility was specified])
AC_ARG_WITH([pax],
[AS_HELP_STRING(--with-pax=COMMAND,the command used for pax marking)],
[
- PAX_COMMAND=${withval}
- if test "x${PAX_COMMAND}" = "xno"; then
- PAX_COMMAND="not specified"
+ if test "x${withval}" = "xyes"; then
+ PAX_COMMAND=no
+ else
+ PAX_COMMAND="${withval}"
fi
],
[
+ PAX_COMMAND=no
+ ])
+ AC_MSG_RESULT(${PAX_COMMAND})
+ if test "x${PAX_COMMAND}" == "xno"; then
+ PAX_COMMAND=${PAX_DEFAULT}
+ fi
+ AC_MSG_CHECKING([if $PAX_COMMAND is a valid executable file])
+ if test -x "${PAX_COMMAND}" && test -f "${PAX_COMMAND}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PAX_COMMAND=""
+ AC_PATH_PROG(PAX_COMMAND, "paxmark.sh")
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "paxctl-ng")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "chpax")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "paxctl")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ if test "x${pax_active}" = "xyes"; then
+ AC_MSG_ERROR("No PaX utility found and running on a PaX kernel.")
+ else
+ AC_MSG_WARN("No PaX utility found.")
+ fi
+ fi
+ fi
+ if test -z "${PAX_COMMAND}"; then
PAX_COMMAND="not specified"
- ])
- case "x${PAX_COMMAND}" in
- xchpax)
- case "${host_cpu}" in
- i?86)
- PAX_COMMAND_ARGS="-msp"
- ;;
- *)
- PAX_COMMAND_ARGS="-m"
- ;;
- esac
- ;;
- xpaxctl)
- case "${host_cpu}" in
- i?86)
- PAX_COMMAND_ARGS="-msp"
- ;;
- *)
- PAX_COMMAND_ARGS="-m"
- ;;
- esac
- ;;
- *)
- PAX_COMMAND="not specified"
- PAX_COMMAND_ARGS="not specified"
- ;;
- esac
+ PAX_COMMAND_ARGS="not specified"
+ else
+ AC_MSG_CHECKING([which options to pass to ${PAX_COMMAND}])
+ case "${host_cpu}" in
+ i?86)
+ PAX_COMMAND_ARGS="-msp"
+ ;;
+ *)
+ PAX_COMMAND_ARGS="-m"
+ ;;
+ esac
+ AC_MSG_RESULT(${PAX_COMMAND_ARGS})
+ fi
AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "xnot specified")
- AC_MSG_RESULT(${PAX_COMMAND})
AC_SUBST(PAX_COMMAND)
AC_SUBST(PAX_COMMAND_ARGS)
])
@@ -2264,3 +2295,25 @@
AC_MSG_RESULT([$enable_jar_compression])
AM_CONDITIONAL([ENABLE_JAR_COMPRESSION], test x"${enable_jar_compression}" = "xyes")
])
+
+AC_DEFUN([IT_ENABLE_WERROR],
+[
+ AC_MSG_CHECKING([whether to enable -Werror])
+ AC_ARG_ENABLE([Werror],
+ [AS_HELP_STRING(--enable-Werror,build with -Werror [[default=no]])],
+ [
+ case "${enableval}" in
+ yes)
+ enable_werror=yes
+ ;;
+ *)
+ enable_werror=no
+ ;;
+ esac
+ ],
+ [
+ enable_werror=no
+ ])
+ AC_MSG_RESULT([$enable_werror])
+ AM_CONDITIONAL([ENABLE_WERROR], test x"${enable_werror}" = "xyes")
+])
diff -r 8796f8cdd621 -r 9408a82b3d19 configure.ac
--- a/configure.ac Thu Jan 23 18:56:55 2014 +0000
+++ b/configure.ac Wed Mar 26 06:34:03 2014 +0000
@@ -283,6 +283,7 @@
IT_WITH_JAMVM_SRC_ZIP
IT_DISABLE_OPTIMIZATIONS
+IT_ENABLE_WERROR
IT_ENABLE_JAR_COMPRESSION
IT_SET_SHARK_BUILD
IT_ENABLE_ZERO_BUILD
diff -r 8796f8cdd621 -r 9408a82b3d19 patches/linker-libs-order.patch
--- a/patches/linker-libs-order.patch Thu Jan 23 18:56:55 2014 +0000
+++ b/patches/linker-libs-order.patch Wed Mar 26 06:34:03 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 8796f8cdd621 -r 9408a82b3d19 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 Wed Mar 26 06:34:03 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 8796f8cdd621 -r 9408a82b3d19 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 Wed Mar 26 06:34:03 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 8796f8cdd621 -r 9408a82b3d19 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 Wed Mar 26 06:34:03 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