/hg/release/icedtea7-2.3: Remove alternate HotSpot for Zero and ...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jul 17 13:22:08 PDT 2013
changeset 4c7988ed06f8 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=4c7988ed06f8
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jul 17 21:21:52 2013 +0100
Remove alternate HotSpot for Zero and update default to latest 2.3 HEAD.
2013-07-17 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/boot/ecj-opts.patch,
* patches/boot/hotspot/zero/jdk-dependency.patch,
* patches/cacao/arm-arch-defines.patch,
* patches/hotspot/zero/6924259-string_offset.patch,
* patches/hotspot/zero/7089790-bsd_port.patch,
* patches/hotspot/zero/7098194-macosx_port.patch,
* patches/hotspot/zero/7116189-setnativethreadname.patch,
* patches/hotspot/zero/7175133-string_offset.patch,
* patches/hotspot/zero/revert-7017193.patch,
* patches/hotspot/zero/revert_arm_debug.patch:
Removed unused patches.
* patches/boot/hotspot-jdk-dependency.patch: Renamed from
patches/boot/hotspot/default/jdk-dependency.patch
* patches/revert-7017193.patch: Renamed from
patches/hotspot/default/revert-7017193.patch
* Makefile.am:
(CORBA_CHANGESET): Update to IcedTea 2.3 HEAD.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
(ICEDTEA_PATCHES): Remove Zero-specific patches
and use of $(HSBUILD).
* acinclude.m4:
(IT_WITH_HOTSPOT_BUILD): No longer default to "zero"
HotSpot if Zero is requested.
* hotspot.map: Update default to IcedTea 2.3 HotSpot
HEAD. Remove zero.
diffstat:
ChangeLog | 38 +
Makefile.am | 37 +-
acinclude.m4 | 6 +-
hotspot.map | 3 +-
patches/boot/ecj-opts.patch | 12 -
patches/boot/hotspot-jdk-dependency.patch | 23 +
patches/boot/hotspot/default/jdk-dependency.patch | 23 -
patches/boot/hotspot/zero/jdk-dependency.patch | 25 -
patches/cacao/arm-arch-defines.patch | 18 -
patches/hotspot/default/revert-7017193.patch | 138 -
patches/hotspot/zero/6924259-string_offset.patch | 916 -
patches/hotspot/zero/7089790-bsd_port.patch | 28881 ---------------
patches/hotspot/zero/7098194-macosx_port.patch | 11389 -----
patches/hotspot/zero/7116189-setnativethreadname.patch | 67 -
patches/hotspot/zero/7175133-string_offset.patch | 48 -
patches/hotspot/zero/revert-7017193.patch | 136 -
patches/hotspot/zero/revert_arm_debug.patch | 55 -
patches/revert-7017193.patch | 138 +
18 files changed, 215 insertions(+), 41738 deletions(-)
diffs (truncated from 42059 to 500 lines):
diff -r 046c72402c91 -r 4c7988ed06f8 ChangeLog
--- a/ChangeLog Fri Jun 28 14:16:59 2013 +0100
+++ b/ChangeLog Wed Jul 17 21:21:52 2013 +0100
@@ -1,3 +1,41 @@
+2013-07-17 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * patches/boot/ecj-opts.patch,
+ * patches/boot/hotspot/zero/jdk-dependency.patch,
+ * patches/cacao/arm-arch-defines.patch,
+ * patches/hotspot/zero/6924259-string_offset.patch,
+ * patches/hotspot/zero/7089790-bsd_port.patch,
+ * patches/hotspot/zero/7098194-macosx_port.patch,
+ * patches/hotspot/zero/7116189-setnativethreadname.patch,
+ * patches/hotspot/zero/7175133-string_offset.patch,
+ * patches/hotspot/zero/revert-7017193.patch,
+ * patches/hotspot/zero/revert_arm_debug.patch:
+ Removed unused patches.
+ * patches/boot/hotspot-jdk-dependency.patch: Renamed from
+ patches/boot/hotspot/default/jdk-dependency.patch
+ * patches/revert-7017193.patch: Renamed from
+ patches/hotspot/default/revert-7017193.patch
+ * Makefile.am:
+ (CORBA_CHANGESET): Update to IcedTea 2.3 HEAD.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Remove Zero-specific patches
+ and use of $(HSBUILD).
+ * acinclude.m4:
+ (IT_WITH_HOTSPOT_BUILD): No longer default to "zero"
+ HotSpot if Zero is requested.
+ * hotspot.map: Update default to IcedTea 2.3 HotSpot
+ HEAD. Remove zero.
+
2013-06-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
* configure.ac: Bump to 2.3.11pre.
diff -r 046c72402c91 -r 4c7988ed06f8 Makefile.am
--- a/Makefile.am Fri Jun 28 14:16:59 2013 +0100
+++ b/Makefile.am Wed Jul 17 21:21:52 2013 +0100
@@ -4,19 +4,19 @@
JDK_UPDATE_VERSION = 25
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 8e581b671511
-JAXP_CHANGESET = 1a02956fcfaf
-JAXWS_CHANGESET = c0e829bfbf62
-JDK_CHANGESET = bd392c168d5c
-LANGTOOLS_CHANGESET = 8cf15d334ad3
-OPENJDK_CHANGESET = fb1ac57ada6c
+CORBA_CHANGESET = eda3895cb67e
+JAXP_CHANGESET = 181faea8867b
+JAXWS_CHANGESET = 5dc89903bfc7
+JDK_CHANGESET = 0a482b2f7c35
+LANGTOOLS_CHANGESET = e2c5f493844a
+OPENJDK_CHANGESET = f143f229bd12
-CORBA_SHA256SUM = 510ca43bc0d208f4cbbe716a1652871f63491f37b3e3902610a42d2e1870fd6c
-JAXP_SHA256SUM = acfd7789f0745a79306d339bbc55ad9d05c08b49b5058e7a804323cdced258fe
-JAXWS_SHA256SUM = 014d6f206b628d3d532c98420b8ebc6434c446497a55037aae6bc3535a858892
-JDK_SHA256SUM = f6c7d86b1b3cebb1f26f3d2735a3b7466b31d9c9e56950e4f24c6c1da436247c
-LANGTOOLS_SHA256SUM = e28ff622e407a915c31ba90d8056b3e08d051c9cd6c107c52b0ef4e246adcd23
-OPENJDK_SHA256SUM = 09fd1d517ed890924e580dd50af7d41e2f137668120e24eca4a7d887648f2335
+CORBA_SHA256SUM = 7e1201261a38b588c1e87224c3480602b5eedd5d821d7c6cb41fdcf1271c2201
+JAXP_SHA256SUM = 71309e488b91266008c8573a32933f66502ddc10e31f808cb8f5fc04caa30f84
+JAXWS_SHA256SUM = 6fac4c4f6afd4ea61d2926987f24f0661f34c71e8947dd86340a0081c2988703
+JDK_SHA256SUM = c24a265ca703e32e742496447f95a49648f49a5577b0fb097865bed32a698032
+LANGTOOLS_SHA256SUM = e964e25b137d5c8a145df60b7cfee67538417191f9f6dd3c59dfe388a40c3b6f
+OPENJDK_SHA256SUM = 80b1aba00ebd6ea0abc0b857ec7fc86c99a7b476d93c78dd35518034ce85956f
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
@@ -265,19 +265,10 @@
# Patch list
ICEDTEA_PATCHES = \
- patches/hotspot/$(HSBUILD)/revert-7017193.patch
+ patches/revert-7017193.patch
# Conditional patches
-if WITH_ALT_HSBUILD
-ICEDTEA_PATCHES += \
- patches/hotspot/$(HSBUILD)/7089790-bsd_port.patch \
- patches/hotspot/$(HSBUILD)/7098194-macosx_port.patch \
- patches/hotspot/$(HSBUILD)/7116189-setnativethreadname.patch \
- patches/hotspot/$(HSBUILD)/6924259-string_offset.patch \
- patches/hotspot/$(HSBUILD)/revert_arm_debug.patch
-endif
-
if WITH_RHINO
ICEDTEA_PATCHES += \
patches/rhino.patch
@@ -358,7 +349,7 @@
patches/boot/corba-dependencies.patch \
patches/boot/jaxws-langtools-dependency.patch \
patches/boot/jaxws-jdk-dependency.patch \
- patches/boot/hotspot/${HSBUILD}/jdk-dependency.patch \
+ patches/boot/hotspot-jdk-dependency.patch \
patches/boot/ecj-multicatch.patch \
patches/boot/ecj-trywithresources.patch \
patches/boot/ecj-autoboxing.patch \
diff -r 046c72402c91 -r 4c7988ed06f8 acinclude.m4
--- a/acinclude.m4 Fri Jun 28 14:16:59 2013 +0100
+++ b/acinclude.m4 Wed Jul 17 21:21:52 2013 +0100
@@ -924,11 +924,7 @@
AC_DEFUN_ONCE([IT_WITH_HOTSPOT_BUILD],
[
AC_REQUIRE([IT_ENABLE_ZERO_BUILD])
- if test "x${use_zero}" = "xyes"; then
- DEFAULT_BUILD="zero"
- else
- DEFAULT_BUILD="default"
- fi
+ DEFAULT_BUILD="default"
AC_MSG_CHECKING([which HotSpot build to use])
AC_ARG_WITH([hotspot-build],
[AS_HELP_STRING(--with-hotspot-build=BUILD,the HotSpot build to use [[BUILD=default]])],
diff -r 046c72402c91 -r 4c7988ed06f8 hotspot.map
--- a/hotspot.map Fri Jun 28 14:16:59 2013 +0100
+++ b/hotspot.map Wed Jul 17 21:21:52 2013 +0100
@@ -1,3 +1,2 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4e374ade4066 86c8ef401af20352c934a5a6330f41dc65e59b05e3d7875ff9a3476ad1a996a0
-zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot 0d81d5904952 a5a609a3600f474a2333b3f3c3dda735d18f8b8d67e8bdeb33f70d14abc0cdfc
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot 4413a836dcc7 f04724b1a971ea9fd12a57ecc0670d88e6f43af8024655173a6df38b8de17305
diff -r 046c72402c91 -r 4c7988ed06f8 patches/boot/ecj-opts.patch
--- a/patches/boot/ecj-opts.patch Fri Jun 28 14:16:59 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -Nru openjdk-boot.orig/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/java/nio/Makefile
---- openjdk-boot.orig/jdk/make/java/nio/Makefile 2009-12-13 18:43:31.000000000 +0000
-+++ openjdk-boot/jdk/make/java/nio/Makefile 2009-12-13 19:03:31.000000000 +0000
-@@ -31,7 +31,7 @@
- PACKAGE = java.nio
- LIBRARY = nio
- PRODUCT = java
--OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
-+OTHER_JAVACFLAGS += -Xlint:serial -Werror
- include $(BUILDDIR)/common/Defs.gmk
-
- NIO_SRC = $(SHARE_SRC)/classes/java/nio
diff -r 046c72402c91 -r 4c7988ed06f8 patches/boot/hotspot-jdk-dependency.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/hotspot-jdk-dependency.patch Wed Jul 17 21:21:52 2013 +0100
@@ -0,0 +1,23 @@
+diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
+--- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make 2012-05-23 22:15:04.747642641 +0100
++++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2012-05-23 22:16:32.825095823 +0100
+@@ -91,7 +91,7 @@
+ # are in AGENT_FILES, so use the shell to expand them.
+ # Be extra carefull to not produce too long command lines in the shell!
+ $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST)))
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
+ $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+ $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
+diff -Nru openjdk-boot.orig/make/hotspot-rules.gmk openjdk-boot/make/hotspot-rules.gmk
+--- openjdk-boot.orig/make/hotspot-rules.gmk 2012-05-23 20:37:39.000000000 +0100
++++ openjdk-boot/make/hotspot-rules.gmk 2012-05-23 22:16:52.425419199 +0100
+@@ -85,6 +85,7 @@
+ HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
+ HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
+ HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR)
++HOTSPOT_BUILD_ARGUMENTS += GENSRCDIR=$(GENSRCDIR)
+
+ # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=?
+ # Or is there something wrong with hotspot/make/Makefile?
diff -r 046c72402c91 -r 4c7988ed06f8 patches/boot/hotspot/default/jdk-dependency.patch
--- a/patches/boot/hotspot/default/jdk-dependency.patch Fri Jun 28 14:16:59 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
---- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make 2012-05-23 22:15:04.747642641 +0100
-+++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2012-05-23 22:16:32.825095823 +0100
-@@ -91,7 +91,7 @@
- # are in AGENT_FILES, so use the shell to expand them.
- # Be extra carefull to not produce too long command lines in the shell!
- $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST)))
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
- $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
- $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
- $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
-diff -Nru openjdk-boot.orig/make/hotspot-rules.gmk openjdk-boot/make/hotspot-rules.gmk
---- openjdk-boot.orig/make/hotspot-rules.gmk 2012-05-23 20:37:39.000000000 +0100
-+++ openjdk-boot/make/hotspot-rules.gmk 2012-05-23 22:16:52.425419199 +0100
-@@ -85,6 +85,7 @@
- HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
- HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
- HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR)
-+HOTSPOT_BUILD_ARGUMENTS += GENSRCDIR=$(GENSRCDIR)
-
- # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=?
- # Or is there something wrong with hotspot/make/Makefile?
diff -r 046c72402c91 -r 4c7988ed06f8 patches/boot/hotspot/zero/jdk-dependency.patch
--- a/patches/boot/hotspot/zero/jdk-dependency.patch Fri Jun 28 14:16:59 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
---- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make 2012-07-20 18:05:26.733484117 +0100
-+++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2012-07-20 18:10:11.384736044 +0100
-@@ -97,8 +97,8 @@
- $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
- $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
-
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR):$(JDK_TOPDIR)/src/share/classes:$(JDK_TOPDIR)/src/solaris/classes:$(GENSRCDIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
-
- $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
- $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
-diff -Nru openjdk-boot.orig/make/hotspot-rules.gmk openjdk-boot/make/hotspot-rules.gmk
---- openjdk-boot.orig/make/hotspot-rules.gmk 2012-06-29 15:19:51.000000000 +0100
-+++ openjdk-boot/make/hotspot-rules.gmk 2012-07-20 18:10:28.277161702 +0100
-@@ -85,6 +85,7 @@
- HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
- HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
- HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR)
-+HOTSPOT_BUILD_ARGUMENTS += GENSRCDIR=$(GENSRCDIR)
-
- # Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=?
- # Or is there something wrong with hotspot/make/Makefile?
diff -r 046c72402c91 -r 4c7988ed06f8 patches/cacao/arm-arch-defines.patch
--- a/patches/cacao/arm-arch-defines.patch Fri Jun 28 14:16:59 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-diff -Nru cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h
---- cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-05-19 12:14:46.000000000 +0100
-+++ cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-06-21 18:35:53.000000000 +0100
-@@ -33,7 +33,13 @@
-
- /* NEC LE-IT: gcc has no way to easily check the arm architecture
- * but defines only one of __ARM_ARCH_x__ to be true */
--#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_7__)
-+#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
-+ || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \
-+ || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \
-+ || defined(__ARM_ARCH_6M__) \
-+ || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
-+ || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__)
-+
- AO_INLINE void
- AO_nop_full()
- {
diff -r 046c72402c91 -r 4c7988ed06f8 patches/hotspot/default/revert-7017193.patch
--- a/patches/hotspot/default/revert-7017193.patch Fri Jun 28 14:16:59 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +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
-@@ -2763,39 +2763,47 @@
- // writing thread stacks don't use growable mappings (i.e. those
- // creeated with MAP_GROWSDOWN), and aren't marked "[stack]", so this
- // only applies to the main thread.
--
--static
--bool get_stack_bounds(uintptr_t *bottom, uintptr_t *top) {
--
-- char buf[128];
-- int fd, sz;
--
-- if ((fd = ::open("/proc/self/maps", O_RDONLY)) < 0) {
-+static bool
-+get_stack_bounds(uintptr_t *bottom, uintptr_t *top)
-+{
-+ FILE *f = fopen("/proc/self/maps", "r");
-+ if (f == NULL)
- return false;
-- }
--
-- const char kw[] = "[stack]";
-- const int kwlen = sizeof(kw)-1;
--
-- // Address part of /proc/self/maps couldn't be more than 128 bytes
-- while ((sz = os::get_line_chars(fd, buf, sizeof(buf))) > 0) {
-- if (sz > kwlen && ::memcmp(buf+sz-kwlen, kw, kwlen) == 0) {
-- // Extract addresses
-- if (sscanf(buf, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) {
-- uintptr_t sp = (uintptr_t) __builtin_frame_address(0);
-- if (sp >= *bottom && sp <= *top) {
-- ::close(fd);
-- return true;
-- }
-+
-+ while (!feof(f)) {
-+ size_t dummy;
-+ char *str = NULL;
-+ ssize_t len = getline(&str, &dummy, f);
-+ if (len == -1) {
-+ fclose(f);
-+ if (str != NULL)
-+ free(str);
-+ return false;
-+ }
-+
-+ if (len > 0 && str[len-1] == '\n') {
-+ str[len-1] = 0;
-+ len--;
-+ }
-+
-+ static const char *stack_str = "[stack]";
-+ if (len > (ssize_t)strlen(stack_str)
-+ && (strcmp(str + len - strlen(stack_str), stack_str) == 0)) {
-+ if (sscanf(str, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) {
-+ uintptr_t sp = (uintptr_t)__builtin_frame_address(0);
-+ if (sp >= *bottom && sp <= *top) {
-+ free(str);
-+ fclose(f);
-+ return true;
- }
-- }
-- }
--
-- ::close(fd);
-+ }
-+ }
-+ free(str);
-+ }
-+ fclose(f);
- return false;
- }
-
--
- // If the (growable) stack mapping already extends beyond the point
- // where we're going to put our guard pages, truncate the mapping at
- // that point by munmap()ping it. This ensures that when we later
-diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp
---- openjdk/hotspot/src/share/vm/runtime/os.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/os.cpp
-@@ -1331,41 +1331,3 @@
- }
- return result;
- }
--
--// Read file line by line, if line is longer than bsize,
--// skip rest of line.
--int os::get_line_chars(int fd, char* buf, const size_t bsize){
-- size_t sz, i = 0;
--
-- // read until EOF, EOL or buf is full
-- while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') {
-- ++i;
-- }
--
-- if (buf[i] == '\n') {
-- // EOL reached so ignore EOL character and return
--
-- buf[i] = 0;
-- return (int) i;
-- }
--
-- buf[i+1] = 0;
--
-- if (sz != 1) {
-- // EOF reached. if we read chars before EOF return them and
-- // return EOF on next call otherwise return EOF
--
-- return (i == 0) ? -1 : (int) i;
-- }
--
-- // line is longer than size of buf, skip to EOL
-- char ch;
-- while (read(fd, &ch, 1) == 1 && ch != '\n') {
-- // Do nothing
-- }
--
-- // return initial part of line that fits in buf.
-- // If we reached EOF, it will be returned on next call.
--
-- return (int) i;
--}
-diff --git a/src/share/vm/runtime/os.hpp b/src/share/vm/runtime/os.hpp
---- openjdk/hotspot/src/share/vm/runtime/os.hpp
-+++ openjdk/hotspot/src/share/vm/runtime/os.hpp
-@@ -672,10 +672,6 @@
- // Hook for os specific jvm options that we don't want to abort on seeing
- static bool obsolete_option(const JavaVMOption *option);
-
-- // Read file line by line. If line is longer than bsize,
-- // rest of line is skipped. Returns number of bytes read or -1 on EOF
-- static int get_line_chars(int fd, char *buf, const size_t bsize);
--
- // Extensions
- #include "runtime/os_ext.hpp"
-
diff -r 046c72402c91 -r 4c7988ed06f8 patches/hotspot/zero/6924259-string_offset.patch
--- a/patches/hotspot/zero/6924259-string_offset.patch Fri Jun 28 14:16:59 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,916 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp openjdk/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
---- openjdk.orig/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp 2012-10-17 08:52:30.000000000 +0100
-+++ openjdk/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp 2013-01-16 00:42:59.059088003 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -238,9 +238,12 @@
-
- Register result = dst->as_register();
- {
-- // Get a pointer to the first character of string0 in tmp0 and get string0.count in str0
-- // Get a pointer to the first character of string1 in tmp1 and get string1.count in str1
-- // Also, get string0.count-string1.count in o7 and get the condition code set
-+ // Get a pointer to the first character of string0 in tmp0
-+ // and get string0.length() in str0
-+ // Get a pointer to the first character of string1 in tmp1
-+ // and get string1.length() in str1
-+ // Also, get string0.length()-string1.length() in
-+ // o7 and get the condition code set
- // Note: some instructions have been hoisted for better instruction scheduling
-
- Register tmp0 = L0;
-@@ -248,27 +251,40 @@
- Register tmp2 = L2;
-
- int value_offset = java_lang_String:: value_offset_in_bytes(); // char array
-- int offset_offset = java_lang_String::offset_offset_in_bytes(); // first character position
-- int count_offset = java_lang_String:: count_offset_in_bytes();
--
-- __ load_heap_oop(str0, value_offset, tmp0);
-- __ ld(str0, offset_offset, tmp2);
-- __ add(tmp0, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp0);
-- __ ld(str0, count_offset, str0);
-- __ sll(tmp2, exact_log2(sizeof(jchar)), tmp2);
-+ if (java_lang_String::has_offset_field()) {
-+ int offset_offset = java_lang_String::offset_offset_in_bytes(); // first character position
-+ int count_offset = java_lang_String:: count_offset_in_bytes();
-+ __ load_heap_oop(str0, value_offset, tmp0);
-+ __ ld(str0, offset_offset, tmp2);
-+ __ add(tmp0, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp0);
-+ __ ld(str0, count_offset, str0);
-+ __ sll(tmp2, exact_log2(sizeof(jchar)), tmp2);
-+ } else {
-+ __ load_heap_oop(str0, value_offset, tmp1);
-+ __ add(tmp1, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp0);
-+ __ ld(tmp1, arrayOopDesc::length_offset_in_bytes(), str0);
-+ }
-
- // str1 may be null
- add_debug_info_for_null_check_here(info);
-
-- __ load_heap_oop(str1, value_offset, tmp1);
-- __ add(tmp0, tmp2, tmp0);
--
-- __ ld(str1, offset_offset, tmp2);
-- __ add(tmp1, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp1);
-- __ ld(str1, count_offset, str1);
-- __ sll(tmp2, exact_log2(sizeof(jchar)), tmp2);
-+ if (java_lang_String::has_offset_field()) {
-+ int offset_offset = java_lang_String::offset_offset_in_bytes(); // first character position
-+ int count_offset = java_lang_String:: count_offset_in_bytes();
-+ __ load_heap_oop(str1, value_offset, tmp1);
-+ __ add(tmp0, tmp2, tmp0);
-+
-+ __ ld(str1, offset_offset, tmp2);
-+ __ add(tmp1, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp1);
-+ __ ld(str1, count_offset, str1);
-+ __ sll(tmp2, exact_log2(sizeof(jchar)), tmp2);
-+ __ add(tmp1, tmp2, tmp1);
-+ } else {
-+ __ load_heap_oop(str1, value_offset, tmp2);
-+ __ add(tmp2, arrayOopDesc::base_offset_in_bytes(T_CHAR), tmp1);
-+ __ ld(tmp2, arrayOopDesc::length_offset_in_bytes(), str1);
-+ }
- __ subcc(str0, str1, O7);
-- __ add(tmp1, tmp2, tmp1);
- }
-
- {
-@@ -302,7 +318,7 @@
- // Shift base0 and base1 to the end of the arrays, negate limit
- __ add(base0, limit, base0);
- __ add(base1, limit, base1);
-- __ neg(limit); // limit = -min{string0.count, strin1.count}
-+ __ neg(limit); // limit = -min{string0.length(), string1.length()}
-
- __ lduh(base0, limit, chr0);
- __ bind(Lloop);
-diff -Nru openjdk.orig/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp openjdk/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
---- openjdk.orig/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2013-01-16 00:41:43.257866830 +0000
-+++ openjdk/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2013-01-16 00:42:59.059088003 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
More information about the distro-pkg-dev
mailing list