/hg/icedtea6-hg: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jul 24 03:58:00 PDT 2013
changeset 5cba6fc13701 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5cba6fc13701
author: Omair Majid <omajid at redhat.com>
date: Wed Jul 17 11:54:43 2013 -0400
Fix mistake in backport of S8010118
2013-07-17 Omair Majid <omajid at redhat.com>
* patches/openjdk/8010118-caller_sensitive.patch: Fix mistake in
backport.
changeset 8da02dd9a76d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8da02dd9a76d
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Jul 18 20:03:43 2013 +0100
Update to the version of hs23 which includes the ARM32 port.
2013-07-18 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/hotspot/hs23/arm-hsdis.patch:
Removed.
* Makefile.am:
(ICEDTEA_PATCHES): Only apply original
arm-hsdis patch.
* hotspot.map: Update to latest HotSpot
from 2.3.x forest, which contains the ARM32
port.
changeset 455071a8e0ec in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=455071a8e0ec
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 22 17:04:11 2013 +0100
Merge
diffstat:
ChangeLog | 111 +
Makefile.am | 53 +-
hotspot.map | 2 +-
patches/copy_memory.patch | 36 -
patches/ecj/override.patch | 51 +
patches/hotspot/hs23/arm-hsdis.patch | 72 -
patches/hotspot/original/7197906-handle_32_bit_shifts.patch | 33 -
patches/hotspot/original/fix_get_stack_bounds_leak.patch | 12 -
patches/openjdk/7036559-concurrenthashmap_improvements.patch | 1436 -
patches/openjdk/8004302-soap_test_failure.patch | 75 -
patches/openjdk/8004341-jck_dialog_failure.patch | 26 -
patches/openjdk/8005615-failure_to_load_logger_implementation.patch | 542 -
patches/openjdk/8007393.patch | 78 -
patches/openjdk/8007611.patch | 24 -
patches/openjdk/8009641-8007675_build_fix.patch | 49 -
patches/openjdk/8010118-caller_sensitive.patch | 26 +-
patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch | 449213 -------
patches/openjdk/jaxp144_05.patch | 595589 ----------
patches/security/20130201/6563318.patch | 36 -
patches/security/20130201/6664509.patch | 1322 -
patches/security/20130201/6776941.patch | 272 -
patches/security/20130201/7141694.patch | 87 -
patches/security/20130201/7173145.patch | 22 -
patches/security/20130201/7186945.patch | 10819 -
patches/security/20130201/7186948.patch | 20 -
patches/security/20130201/7186952.patch | 127 -
patches/security/20130201/7186954.patch | 81 -
patches/security/20130201/7192392.patch | 695 -
patches/security/20130201/7192393.patch | 60 -
patches/security/20130201/7192977.patch | 444 -
patches/security/20130201/7197546.patch | 479 -
patches/security/20130201/7200491.patch | 49 -
patches/security/20130201/7200500.patch | 60 -
patches/security/20130201/7201064.patch | 125 -
patches/security/20130201/7201066.patch | 66 -
patches/security/20130201/7201068.patch | 83 -
patches/security/20130201/7201070.patch | 31 -
patches/security/20130201/7201071.patch | 553 -
patches/security/20130201/8000210.patch | 104 -
patches/security/20130201/8000537.patch | 334 -
patches/security/20130201/8000540.patch | 187 -
patches/security/20130201/8000631.patch | 3964 -
patches/security/20130201/8001242.patch | 61 -
patches/security/20130201/8001307.patch | 27 -
patches/security/20130201/8001972.patch | 438 -
patches/security/20130201/8002325.patch | 59 -
patches/security/20130219/8006446.patch | 395 -
patches/security/20130219/8006777.patch | 1036 -
patches/security/20130219/8007688.patch | 130 -
patches/security/20130304/8007014.patch | 477 -
patches/security/20130304/8007675.patch | 416 -
patches/security/20130416/6657673.patch | 400 +-
patches/security/20130416/8005432.patch | 48 +-
53 files changed, 411 insertions(+), 1070524 deletions(-)
diffs (truncated from 1072130 to 500 lines):
diff -r 11f837636a0a -r 455071a8e0ec ChangeLog
--- a/ChangeLog Thu Jul 11 23:43:09 2013 +0100
+++ b/ChangeLog Mon Jul 22 17:04:11 2013 +0100
@@ -1,3 +1,26 @@
+2013-07-18 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/hotspot/hs23/arm-hsdis.patch:
+ Removed.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Only apply original
+ arm-hsdis patch.
+ * hotspot.map: Update to latest HotSpot
+ from 2.3.x forest, which contains the ARM32
+ port.
+
+2013-07-17 Omair Majid <omajid at redhat.com>
+
+ * patches/openjdk/8010118-caller_sensitive.patch: Fix mistake in
+ backport.
+
+2013-07-11 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/7036559-concurrenthashmap_improvements.patch:
+ Remove upstreamed patch.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Drop upstreamed patches.
+
2013-07-11 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS:
@@ -295,6 +318,15 @@
* patches/security/20130618/langtools_merge-03.patch:
2013/06/18 security patches.
+2013-05-31 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * patches/copy_memory.patch,
+ * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch:
+ Drop upstreamed patches.
+ * Makefile.am:
+ (DROP_PATCHES): Remove JAXP patch.
+ (ICEDTEA_PATCHES): Remove OpenJDK6-4 patch.
+
2013-05-28 Xerxes RÃ¥nby <xerxes at zafena.se>
PR1188: ASM Interpreter and Thumb2 JIT javac miscompile
@@ -360,6 +392,18 @@
* patches/jtreg-TextLayoutBoundsChecks.patch:
Fixed wrong JTreg test name in @run annotation.
+2013-05-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/hotspot/original/7197906-handle_32_bit_shifts.patch,
+ * patches/hotspot/original/fix_get_stack_bounds_leak.patch,
+ * patches/openjdk/8004302-soap_test_failure.patch,
+ * patches/openjdk/jaxp144_05.patch:
+ Removed as available upstream.
+ * Makefile.am: Remove patches.
+ * patches/security/20130416/6657673.patch,
+ * patches/security/20130416/8005432.patch:
+ Regenerated against upstream.
+
2013-05-17 Pavel Tisnovsky <ptisnovs at redhat.com>
* patches/componentOrientationTests.patch:
@@ -377,6 +421,12 @@
* Makefile.am:
Renamed three patches to be more consistent with other JTreg-related patches.
+2013-05-15 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove reference to removed
+ patch patches/openjdk/8009641-8007675_build_fix.patch.
+
2013-05-15 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am:
@@ -753,6 +803,62 @@
* patches/jvmtiEnv.patch: Moved to...
* patches/hotspot/original/jvmtiEnv.patch: here.
+2013-03-19 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/8004341-jck_dialog_failure.patch,
+ * patches/openjdk/8005615-failure_to_load_logger_implementation.patch,
+ * patches/openjdk/8007393.patch,
+ * patches/openjdk/8007611.patch,
+ * patches/openjdk/8009641-8007675_build_fix.patch,
+ * patches/security/20130201/6563318.patch,
+ * patches/security/20130201/6664509.patch,
+ * patches/security/20130201/6776941.patch,
+ * patches/security/20130201/7141694.patch,
+ * patches/security/20130201/7173145.patch,
+ * patches/security/20130201/7186945.patch,
+ * patches/security/20130201/7186948.patch,
+ * patches/security/20130201/7186952.patch,
+ * patches/security/20130201/7186954.patch,
+ * patches/security/20130201/7192392.patch,
+ * patches/security/20130201/7192393.patch,
+ * patches/security/20130201/7192977.patch,
+ * patches/security/20130201/7197546.patch,
+ * patches/security/20130201/7200491.patch,
+ * patches/security/20130201/7200500.patch,
+ * patches/security/20130201/7201064.patch,
+ * patches/security/20130201/7201066.patch,
+ * patches/security/20130201/7201068.patch,
+ * patches/security/20130201/7201070.patch,
+ * patches/security/20130201/7201071.patch,
+ * patches/security/20130201/8000210.patch,
+ * patches/security/20130201/8000537.patch,
+ * patches/security/20130201/8000540.patch,
+ * patches/security/20130201/8000631.patch,
+ * patches/security/20130201/8001235.patch,
+ * patches/security/20130201/8001242.patch,
+ * patches/security/20130201/8001307.patch,
+ * patches/security/20130201/8001972.patch,
+ * patches/security/20130201/8002325.patch,
+ * patches/security/20130219/8006446.patch,
+ * patches/security/20130219/8006777.patch,
+ * patches/security/20130219/8007688.patch,
+ * patches/security/20130304/8007014.patch,
+ * patches/security/20130304/8007675.patch:
+ Remove patches available upstream.
+ * Makefile.am:
+ (JAXP_DROP_ZIP): Update to jaxp144_05.zip
+ with latest security fix included.
+ (JAXP_DROP_SHA256SUM): Likewise.
+ (SECURITY_PATCHES): Remove ones available
+ upstream (all from 2013/02/01, 2013/02/19
+ and 2013/03/04).
+ (ICEDTEA_PATCHES): Remove patches for
+ 8005615, 8004341, 8007393 & 8007611
+ available upstream.
+ * patches/ecj/override.patch:
+ Add new case introduced by upstream version
+ of security patches (sigh...)
+
2013-03-18 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
@@ -1354,6 +1460,11 @@
2012-10-31 Andrew John Hughes <gnu.andrew at redhat.com>
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to next release, b28.
+
+2012-10-31 Andrew John Hughes <gnu.andrew at redhat.com>
+
* generated/com/sun/corba/se/impl/logging/ActivationSystemException.java,
* generated/com/sun/corba/se/impl/logging/IORSystemException.java,
* generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java,
diff -r 11f837636a0a -r 455071a8e0ec Makefile.am
--- a/Makefile.am Thu Jul 11 23:43:09 2013 +0100
+++ b/Makefile.am Mon Jul 22 17:04:11 2013 +0100
@@ -2,7 +2,7 @@
OPENJDK_DATE = 26_oct_2012
OPENJDK_SHA256SUM = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0
-OPENJDK_VERSION = b27
+OPENJDK_VERSION = b28
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
CACAO_VERSION = 68fe50ac34ec
@@ -278,48 +278,11 @@
ICEDTEA_FSG_PATCHES =
-DROP_PATCHES = \
- patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch \
- patches/openjdk/jaxp144_05.patch
+DROP_PATCHES =
SECURITY_PATCHES = \
patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \
- patches/security/20130201/7201068.patch \
- patches/security/20130201/6563318.patch \
- patches/security/20130201/6664509.patch \
- patches/security/20130201/6776941.patch \
- patches/security/20130201/7141694.patch \
- patches/security/20130201/7173145.patch \
- patches/security/20130201/7186945.patch \
- patches/security/20130201/7186948.patch \
- patches/security/20130201/7186952.patch \
- patches/security/20130201/7186954.patch \
- patches/security/20130201/7192392.patch \
- patches/security/20130201/7192393.patch \
- patches/security/20130201/7192977.patch \
- patches/security/20130201/7197546.patch \
- patches/security/20130201/7200491.patch \
- patches/security/20130201/7200500.patch \
- patches/security/20130201/7201064.patch \
- patches/security/20130201/7201066.patch \
- patches/security/20130201/7201070.patch \
- patches/security/20130201/7201071.patch \
- patches/security/20130201/8000210.patch \
- patches/security/20130201/8000537.patch \
- patches/security/20130201/8000540.patch \
- patches/security/20130201/8000631.patch \
- patches/security/20130201/8001242.patch \
- patches/security/20130201/8001972.patch \
- patches/security/20130201/8002325.patch \
- patches/security/20130219/8006446.patch \
- patches/security/20130219/8006777.patch \
- patches/security/20130219/8007688.patch \
- patches/security/20130304/8007014.patch \
- patches/security/20130304/8007675.patch \
- patches/openjdk/8009641-8007675_build_fix.patch \
- patches/openjdk/7036559-concurrenthashmap_improvements.patch \
patches/security/20130416/8009063.patch \
- patches/openjdk/8004302-soap_test_failure.patch \
patches/security/20130416/6657673.patch \
patches/security/20130416/6657673-fixup.patch \
patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch \
@@ -371,9 +334,6 @@
patches/security/20130618/8001318-6_fixup.patch \
patches/security/20130618/8001330-improve_checking_order.patch \
patches/security/20130618/8003703-update_rmi_connection_dialog.patch \
- patches/openjdk/8005615-failure_to_load_logger_implementation.patch \
- patches/openjdk/8007393.patch \
- patches/openjdk/8007611.patch \
patches/security/20130618/8004584-augment_applet_contextualization.patch \
patches/security/20130618/8005007-better_glyph_processing.patch \
patches/security/20130618/8006328-sound_class_robustness.patch \
@@ -435,7 +395,6 @@
if !WITH_ALT_HSBUILD
SECURITY_PATCHES += \
- patches/security/20130201/8001307.patch \
patches/security/20130416/8004336.patch \
patches/security/20130416/8006309.patch \
patches/security/20130416/8009699.patch \
@@ -603,7 +562,6 @@
patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \
patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \
patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \
- patches/hotspot/$(HSBUILD)/arm-hsdis.patch \
patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \
patches/openjdk/6706974-krb5_test_infrastructure.patch \
patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \
@@ -631,9 +589,7 @@
patches/openjdk/6980681-corba_deadlock.patch \
patches/openjdk/7162902-corba_fixes.patch \
patches/traceable.patch \
- patches/openjdk/8004341-jck_dialog_failure.patch \
patches/pr1319-support_giflib_5.patch \
- patches/copy_memory.patch \
patches/openjdk/6718364-inference_failure.patch \
patches/openjdk/6682380-foreach_crash.patch \
patches/openjdk/7046929-fix_t6397104_test_failure.patch \
@@ -746,12 +702,11 @@
patches/pr696-zero-fast_aldc-hs20.patch \
patches/arm-debug.patch \
patches/openjdk/7010849-modernise_sa.patch \
- patches/hotspot/original/7197906-handle_32_bit_shifts.patch \
- patches/hotspot/original/fix_get_stack_bounds_leak.patch \
patches/hotspot/original/jvmtiEnv.patch \
patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch \
patches/hotspot/original/aarch64.patch \
- patches/hotspot/original/7022999-fastlocking_compiler1_only.patch
+ patches/hotspot/original/7022999-fastlocking_compiler1_only.patch \
+ patches/hotspot/original/arm-hsdis.patch
endif
if WITH_RHINO
diff -r 11f837636a0a -r 455071a8e0ec hotspot.map
--- a/hotspot.map Thu Jul 11 23:43:09 2013 +0100
+++ b/hotspot.map Mon Jul 22 17:04:11 2013 +0100
@@ -1,2 +1,2 @@
# version url changeset sha256sum
-hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4e374ade4066 86c8ef401af20352c934a5a6330f41dc65e59b05e3d7875ff9a3476ad1a996a0
+hs23 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4413a836dcc7 f04724b1a971ea9fd12a57ecc0670d88e6f43af8024655173a6df38b8de17305
diff -r 11f837636a0a -r 455071a8e0ec patches/copy_memory.patch
--- a/patches/copy_memory.patch Thu Jul 11 23:43:09 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-diff --git a/src/share/classes/sun/misc/Unsafe.java b/src/share/classes/sun/misc/Unsafe.java
---- openjdk/jdk/src/share/classes/sun/misc/Unsafe.java
-+++ openjdk/jdk/src/share/classes/sun/misc/Unsafe.java
-@@ -504,9 +504,31 @@
- /**
- * Sets all bytes in a given block of memory to a copy of another
- * block.
-+ *
-+ * <p>This method determines each block's base address by means of two parameters,
-+ * and so it provides (in effect) a <em>double-register</em> addressing mode,
-+ * as discussed in {@link #getInt(Object,long)}. When the object reference is null,
-+ * the offset supplies an absolute base address.
-+ *
-+ * <p>The transfers are in coherent (atomic) units of a size determined
-+ * by the address and length parameters. If the effective addresses and
-+ * length are all even modulo 8, the transfer takes place in 'long' units.
-+ * If the effective addresses and length are (resp.) even modulo 4 or 2,
-+ * the transfer takes place in units of 'int' or 'short'.
- */
-- public native void copyMemory(long srcAddress, long destAddress,
-+ public native void copyMemory(Object srcBase, long srcOffset,
-+ Object destBase, long destOffset,
- long bytes);
-+ /**
-+ * Sets all bytes in a given block of memory to a copy of another
-+ * block. This provides a <em>single-register</em> addressing mode,
-+ * as discussed in {@link #getInt(Object,long)}.
-+ *
-+ * Equivalent to <code>copyMemory(null, srcAddress, null, destAddress, bytes)</code>.
-+ */
-+ public void copyMemory(long srcAddress, long destAddress, long bytes) {
-+ copyMemory(null, srcAddress, null, destAddress, bytes);
-+ }
-
- /**
- * Disposes of a block of native memory, as obtained from {@link
diff -r 11f837636a0a -r 455071a8e0ec patches/ecj/override.patch
--- a/patches/ecj/override.patch Thu Jul 11 23:43:09 2013 +0100
+++ b/patches/ecj/override.patch Mon Jul 22 17:04:11 2013 +0100
@@ -311,3 +311,54 @@
public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
Component c = delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+diff -Nru openjdk.orig/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java openjdk/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2013-03-19 13:40:24.027496931 +0000
++++ openjdk-ecj/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2013-03-19 13:40:56.968026902 +0000
+@@ -1040,7 +1040,6 @@
+
+ targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+- @Override
+ public Class<?> run() {
+ try {
+ ReflectUtil.checkPackageAccess(className);
+@@ -1114,7 +1113,6 @@
+
+ javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Void>() {
+
+- @Override
+ public Void run() {
+ for (int i = 0; i < sig.length; i++) {
+ if (tracing) {
+@@ -1203,7 +1201,6 @@
+ final String className = opClassName;
+ targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+- @Override
+ public Class<?> run() {
+ try {
+ ReflectUtil.checkPackageAccess(className);
+@@ -1239,7 +1236,6 @@
+ AccessControlContext stack = AccessController.getContext();
+ Object rslt = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Object>() {
+
+- @Override
+ public Object run() {
+ try {
+ ReflectUtil.checkPackageAccess(method.getDeclaringClass());
+@@ -1676,7 +1672,6 @@
+
+ Class c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+- @Override
+ public Class<?> run() {
+ try {
+ ReflectUtil.checkPackageAccess(respType);
+@@ -2854,7 +2849,6 @@
+
+ Class c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+- @Override
+ public Class<?> run() {
+ try {
+ ReflectUtil.checkPackageAccess(className);
diff -r 11f837636a0a -r 455071a8e0ec patches/hotspot/hs23/arm-hsdis.patch
--- a/patches/hotspot/hs23/arm-hsdis.patch Thu Jul 11 23:43:09 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c
---- openjdk.orig/hotspot/src/share/tools/hsdis/hsdis.c 2013-02-11 23:08:47.000000000 +0000
-+++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c 2013-02-14 18:06:25.372022803 +0000
-@@ -35,6 +35,8 @@
- #include <dis-asm.h>
- #include <inttypes.h>
-
-+#include <string.h>
-+
- #ifndef bool
- #define bool int
- #define true 1
-@@ -356,7 +358,7 @@
- if (plen > mach_size) plen = mach_size;
- strncpy(mach_option, p, plen);
- mach_option[plen] = '\0';
-- } else if (plen > 6 && strncmp(p, "hsdis-", 6) == 0) {
-+ } else if (plen > 6 && !strncmp(p, "hsdis-", 6)) {
- // do not pass these to the next level
- } else {
- /* just copy it; {i386,sparc}-dis.c might like to see it */
-@@ -418,6 +420,9 @@
- #ifdef LIBARCH_sparcv9
- res = "sparc:v9b";
- #endif
-+#ifdef LIBARCH_arm
-+ res = "arm";
-+#endif
- if (res == NULL)
- res = "architecture not set in Makefile!";
- return res;
-diff -Nru openjdk.orig/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile
---- openjdk.orig/hotspot/src/share/tools/hsdis/Makefile 2013-02-11 23:08:47.000000000 +0000
-+++ openjdk/hotspot/src/share/tools/hsdis/Makefile 2013-02-14 18:05:21.514998150 +0000
-@@ -68,14 +68,18 @@
- CONFIGURE_ARGS= --host=$(MINGW) --target=$(MINGW)
- else
- CPU = $(shell uname -m)
-+ifneq ($(findstring arm,$(CPU)),)
-+ARCH=arm
-+else
- ARCH1=$(CPU:x86_64=amd64)
- ARCH=$(ARCH1:i686=i386)
- CFLAGS/i386 += -m32
- CFLAGS/sparc += -m32
- CFLAGS/sparcv9 += -m64
- CFLAGS/amd64 += -m64
-+endif
- CFLAGS += $(CFLAGS/$(ARCH))
--CFLAGS += -fPIC
-+CFLAGS += -fPIC -g
- OS = linux
- LIB_EXT = .so
- CC = gcc
-@@ -118,7 +122,7 @@
- BINUTILSDIR = $(shell cd $(BINUTILS);pwd)
- endif
-
--CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILS)/bfd -I$(TARGET_DIR)/bfd
-+CPPFLAGS += -I$(BINUTILSDIR)/include -I$(BINUTILSDIR)/bfd -I$(TARGET_DIR)/bfd
- CPPFLAGS += -DLIBARCH_$(LIBARCH) -DLIBARCH=\"$(LIBARCH)\" -DLIB_EXT=\"$(LIB_EXT)\"
-
- TARGET_DIR = build/$(OS)-$(JDKARCH)
-@@ -145,7 +149,7 @@
- demo: $(TARGET) $(DEMO_TARGET)
-
- $(LIBRARIES): $(TARGET_DIR) $(TARGET_DIR)/Makefile
-- if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes; fi
-+ if [ ! -f $@ ]; then cd $(TARGET_DIR); make all-opcodes "CFLAGS=$(CFLAGS)"; fi
-
- $(TARGET_DIR)/Makefile:
- (cd $(TARGET_DIR); CC=$(CC) CFLAGS="$(CFLAGS)" $(BINUTILSDIR)/configure --disable-nls $(CONFIGURE_ARGS))
diff -r 11f837636a0a -r 455071a8e0ec patches/hotspot/original/7197906-handle_32_bit_shifts.patch
--- a/patches/hotspot/original/7197906-handle_32_bit_shifts.patch Thu Jul 11 23:43:09 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
---- openjdk/hotspot/src/share/vm/memory/blockOffsetTable.hpp 2012-09-13 21:22:37.897456500 +0200
-+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.hpp 2012-09-13 21:22:34.345253300 +0200
-@@ -285,7 +285,7 @@
- };
-
- static size_t power_to_cards_back(uint i) {
-- return (size_t)(1 << (LogBase * i));
-+ return (size_t)1 << (LogBase * i);
- }
- static size_t power_to_words_back(uint i) {
- return power_to_cards_back(i) * N_words;
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2012-09-13 21:22:37.901456800 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2012-09-13 21:22:34.354253900 +0200
-@@ -110,7 +110,7 @@
- #ifndef PRODUCT
- bool CMBitMapRO::covers(ReservedSpace rs) const {
- // assert(_bm.map() == _virtual_space.low(), "map inconsistency");
-- assert(((size_t)_bm.size() * (size_t)(1 << _shifter)) == _bmWordSize,
-+ assert(((size_t)_bm.size() * ((size_t)1 << _shifter)) == _bmWordSize,
- "size inconsistency");
- return _bmStartWord == (HeapWord*)(rs.base()) &&
- _bmWordSize == rs.size()>>LogHeapWordSize;
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2012-09-13 21:22:37.898456600 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2012-09-13 21:22:34.346253400 +0200
-@@ -273,7 +273,7 @@
- if (_max_fine_entries == 0) {
- assert(_mod_max_fine_entries_mask == 0, "Both or none.");
- size_t max_entries_log = (size_t)log2_long((jlong)G1RSetRegionEntries);
-- _max_fine_entries = (size_t)(1 << max_entries_log);
-+ _max_fine_entries = (size_t)1 << max_entries_log;
- _mod_max_fine_entries_mask = _max_fine_entries - 1;
-
- assert(_fine_eviction_sample_size == 0
diff -r 11f837636a0a -r 455071a8e0ec patches/hotspot/original/fix_get_stack_bounds_leak.patch
--- a/patches/hotspot/original/fix_get_stack_bounds_leak.patch Thu Jul 11 23:43:09 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp
---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -2650,6 +2650,8 @@
- ssize_t len = getline(&str, &dummy, f);
- if (len == -1) {
- fclose(f);
-+ if (str != NULL)
-+ free(str);
- return false;
- }
-
More information about the distro-pkg-dev
mailing list