/hg/icedtea6-hg: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue May 31 18:35:52 PDT 2011
changeset cb5177de9f0b in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cb5177de9f0b
author: ptisnovs
date: Thu May 19 12:39:01 2011 +0200
Test enhancement - make the test compatible with OpenJDK7/IcedTea7,
disabling printing unnecessary information to error output.
changeset 0224254fcf75 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0224254fcf75
author: Denis Lila <dlila at redhat.com>
date: Fri May 20 08:55:31 2011 -0400
No focus to disabled components.
changeset fc898988b053 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fc898988b053
author: Xerxes R?nby <xerxes at zafena.se>
date: Fri May 27 16:55:49 2011 +0200
JamVM: Updated to 2011-04-28 revision, implemented remaining OpenJDK
Array reflection interface.
2011-05-27 Xerxes R?nby <xranby at zafena.se>
JamVM
- Fix leak of native thread structure.
- Consistent naming for classlib functions.
- Add extra includes to get rid off compiler warning.
- Rework OpenJDK storage of native thread structure.
- Implement remaining OpenJDK Array reflection interface.
* NEWS: Updated.
* Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-04-28
revision. (JAMVM_SHA256SUM): Updated.
changeset 0034f5cfd96a in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0034f5cfd96a
author: doko at ubuntu.com
date: Sat May 28 12:37:23 2011 +0200
Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Filter-out --with-javac.
duplicate the pattern to keep syntax highlighting happy.
2011-05-28 Matthias Klose <doko at ubuntu.com>
* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Filter-out --with-
javac.
changeset e191909a7c6e in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e191909a7c6e
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon May 30 19:21:44 2011 +0100
Fix build failure caused by hs20 only LLVM 2.9 fix.
2011-05-30 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/7036220-shark_llvm_29_headers.patch:
Moved to...
* Makefile.am: Only apply 7036220 to hs20.
* patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch:
...here.
changeset b1123c5a67f7 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b1123c5a67f7
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 01 02:35:43 2011 +0100
Merge
diffstat:
ChangeLog | 104 ++
INSTALL | 16 +-
Makefile.am | 53 +-
NEWS | 6 +
acinclude.m4 | 4 +-
hotspot.map | 1 -
patches/arm.patch | 56 +
patches/gcc-suffix.patch | 29 +
patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch | 173 ----
patches/hotspot/hs20/arm.patch | 56 -
patches/hotspot/hs20/gcc-suffix.patch | 29 -
patches/hotspot/hs20/ia64-fix.patch | 14 -
patches/hotspot/hs20/params-cast-size_t.patch | 259 ------
patches/hotspot/hs20/powerpc-stacksize.patch | 39 -
patches/hotspot/hs20/sparc-buildfixes.patch | 24 -
patches/hotspot/hs20/systemtap.patch | 99 --
patches/hotspot/hs20/text-relocations.patch | 60 -
patches/hotspot/original/7032388-work_without_cmov_instruction.patch | 152 ---
patches/hotspot/original/arm.patch | 54 -
patches/hotspot/original/gcc-suffix.patch | 29 -
patches/hotspot/original/ia64-fix.patch | 28 -
patches/hotspot/original/no-precompiled-headers.patch | 33 -
patches/hotspot/original/params-cast-size_t.patch | 284 -------
patches/hotspot/original/sparc-buildfixes.patch | 32 -
patches/hotspot/original/systemtap.patch | 97 --
patches/hotspot/original/text-relocations.patch | 58 -
patches/hotspot/original/too-many-args.patch | 45 -
patches/ia64-fix.patch | 14 +
patches/jaxp-serial-version-uid.patch | 51 -
patches/jtreg-6929067-fix.patch | 2 +-
patches/openjdk/4685768-focus.patch | 390 ++++++++++
patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch | 21 -
patches/openjdk/6633275-shaped_translucent_windows.patch | 117 +-
patches/openjdk/6768387-jtable_not_serializable.patch | 104 --
patches/openjdk/6997495-test_correction_6857159.patch | 20 -
patches/openjdk/7029905-demo_applet_html_files.patch | 52 -
patches/openjdk/7032388-work_without_cmov_instruction.patch | 173 ++++
patches/openjdk/7042040-no_disk_space_check.patch | 112 --
patches/params-cast-size_t.patch | 259 ++++++
patches/powerpc-stacksize.patch | 39 +
patches/sparc-buildfixes.patch | 24 +
patches/systemtap.patch | 99 ++
patches/text-relocations.patch | 60 +
43 files changed, 1330 insertions(+), 2041 deletions(-)
diffs (truncated from 4326 to 500 lines):
diff -r 9cd3b8769614 -r b1123c5a67f7 ChangeLog
--- a/ChangeLog Wed May 18 09:04:01 2011 -0400
+++ b/ChangeLog Wed Jun 01 02:35:43 2011 +0100
@@ -1,3 +1,89 @@
+2011-05-30 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/7036220-shark_llvm_29_headers.patch:
+ Moved to...
+ * Makefile.am: Only apply 7036220 to hs20.
+ * patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch:
+ ...here.
+
+2011-05-28 Matthias Klose <doko at ubuntu.com>
+
+ * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Filter-out --with-javac.
+
+2011-05-27 Xerxes RÃ¥nby <xranby at zafena.se>
+
+ JamVM
+ - Fix leak of native thread structure.
+ - Consistent naming for classlib functions.
+ - Add extra includes to get rid off compiler warning.
+ - Rework OpenJDK storage of native thread structure.
+ - Implement remaining OpenJDK Array reflection interface.
+ * NEWS: Updated.
+ * Makefile.am
+ (JAMVM_VERSION): Updated JamVM to 2011-04-28 revision.
+ (JAMVM_SHA256SUM): Updated.
+
+2011-05-19 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am: Apply patch.
+ * NEWS: Update with backport.
+ * patches/openjdk/4685768-focus.patchpatch: The restore focus
+ procedure now skips disabled components.
+
+2011-05-19 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * patches/jtreg-6929067-fix.patch: Test enhancement -
+ make the test compatible with OpenJDK7/IcedTea7, disabling printing
+ unnecessary information to error output.
+
+2011-05-18 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch,
+ * patches/hotspot/hs20/arm.patch,
+ * patches/hotspot/hs20/gcc-suffix.patch,
+ * patches/hotspot/hs20/ia64-fix.patch,
+ * patches/hotspot/hs20/params-cast-size_t.patch,
+ * patches/hotspot/hs20/powerpc-stacksize.patch,
+ * patches/hotspot/hs20/sparc-buildfixes.patch,
+ * patches/hotspot/hs20/systemtap.patch,
+ * patches/hotspot/hs20/text-relocations.patch:
+ Moved to main tree.
+ * patches/hotspot/original/7032388-work_without_cmov_instruction.patch,
+ * patches/hotspot/original/arm.patch,
+ * patches/hotspot/original/gcc-suffix.patch,
+ * patches/hotspot/original/ia64-fix.patch,
+ * patches/hotspot/original/no-precompiled-headers.patch,
+ * patches/hotspot/original/params-cast-size_t.patch,
+ * patches/hotspot/original/sparc-buildfixes.patch,
+ * patches/hotspot/original/systemtap.patch,
+ * patches/hotspot/original/text-relocations.patch,
+ * patches/hotspot/original/too-many-args.patch:
+ Dropped; hs19 no longer supported.
+ * patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch,
+ * patches/openjdk/6997495-test_correction_6857159.patch,
+ * patches/openjdk/7029905-demo_applet_html_files.patch,
+ * patches/openjdk/7042040-no_disk_space_check.patch:
+ Removed; upstream in OpenJDK6.
+ * INSTALL: Update HotSpot documentation.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Updated.
+ * acinclude.m4:
+ (IT_WITH_HOTSPOT_BUILD): Set default back to original.
+ * hotspot.map: Remove hs19.
+ * patches/arm.patch,
+ * patches/gcc-suffix.patch,
+ * patches/ia64-fix.patch:
+ Extended with HotSpot segments from hotspot/hs20.
+ * patches/openjdk/6633275-shaped_translucent_windows.patch:
+ Recreated due to copyright header change in Component.java.
+ * patches/openjdk/7032388-work_without_cmov_instruction.patch,
+ * patches/params-cast-size_t.patch,
+ * patches/powerpc-stacksize.patch,
+ * patches/sparc-buildfixes.patch,
+ * patches/systemtap.patch,
+ * patches/text-relocations.patch:
+ Moved from hotspot/hs20.
+
2011-05-17 Denis Lila <dlila at redhat.com>
* Makefile.am: Apply patch.
@@ -302,6 +388,12 @@
2011-03-31 Andrew John Hughes <ahughes at redhat.com>
+ * patches/jaxp-serial-version-uid.patch,
+ * patches/openjdk/6768387-jtable_not_serializable.patch:
+ Dropped, upstream.
+
+2011-03-31 Andrew John Hughes <ahughes at redhat.com>
+
S7032388, PR682: Make HotSpot work on machines without
cmov instruction again
* Makefile.am: Add new patch.
@@ -321,6 +413,13 @@
2011-03-31 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
+ (JAXP_DROP_ZIP): Update.
+ (JAXP_DROP_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Drop above.
+
+2011-03-31 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
Revert broken changes in
478d3f5f6a59409078b1adcfba24150158b92695
(.PHONY): Remove jtregcheck-summary.
@@ -559,6 +658,11 @@
2011-03-03 Andrew John Hughes <ahughes at redhat.com>
+ * Makefile.am:
+ Bump to b23.
+
+2011-03-03 Andrew John Hughes <ahughes at redhat.com>
+
* INSTALL: Update documentation
to match current settings.
* NEWS: Mention change to hs20.
diff -r 9cd3b8769614 -r b1123c5a67f7 INSTALL
--- a/INSTALL Wed May 18 09:04:01 2011 -0400
+++ b/INSTALL Wed Jun 01 02:35:43 2011 +0100
@@ -318,16 +318,13 @@
download stage and just verifies that the zip's MD5 sum matches that
of the requested build.
-At present, IcedTea6 supports the 'original' HotSpot 19 provided as
-part of the upstream tarball and HotSpot 20 ('hs20') from the stable
-hs20 tree at http://hg.openjdk.java.net/hsx/hsx20/master. The default
-is 'hs20' which will use the version of hs20 specified in hotspot.map.
-Note that the norm. is for up to one alternate (non-default) build to
-be supported and just passing --with-hotspot-build (equivalent to
---with-hotspot-build=yes) will always provide the alternate build
-(currently hs20). Conversely, passing --without-hotspot-build
-(equivalent to --with-hotspot-build=no) provides the original build
-from the OpenJDK tarball (currently hs19).
+At present, IcedTea6 supports the 'original' HotSpot 20 provided as
+part of the upstream tarball. Note that the norm. is for up to one
+alternate (non-default) build to be supported and just passing
+--with-hotspot-build (equivalent to --with-hotspot-build=yes) will
+always provide the alternate build. Conversely, passing
+--without-hotspot-build (equivalent to --with-hotspot-build=no)
+provides the original build from the OpenJDK tarball.
Javascript Support
==================
diff -r 9cd3b8769614 -r b1123c5a67f7 Makefile.am
--- a/Makefile.am Wed May 18 09:04:01 2011 -0400
+++ b/Makefile.am Wed Jun 01 02:35:43 2011 +0100
@@ -2,7 +2,7 @@
OPENJDK_DATE = 28_feb_2011
OPENJDK_MD5SUM = 2d2bbbb0f9b81f1fec41ec730da8a933
-OPENJDK_VERSION = b22
+OPENJDK_VERSION = b23
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
CACAO_VERSION = d6264eb66506
@@ -11,8 +11,8 @@
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
-JAMVM_VERSION = a95ca049d3bb257d730535a5d5ec3f73a943d0aa
-JAMVM_SHA256SUM = 18bb5c97c03fb73f70b481440e3e11803448d327c024d4570a338b899693fefd
+JAMVM_VERSION = 2e52a601883dda84c824b43363c02881def3e06d
+JAMVM_SHA256SUM = b26bc67ddfb50c98761aa4939254470ec9a8f88e9a22628b858603099a784af8
JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm
JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
@@ -24,9 +24,8 @@
JAF_DROP_ZIP = jdk6-jaf-b20.zip
JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXP_DROP_ZIP = jaxp144_01.zip
-JAXP_DROP_SHA256SUM = d72c2e27a479e7e78e0141cfcf3a9c5dbc5677495bd21b2d52dce85d21322186
-
+JAXP_DROP_ZIP = jaxp144_02.zip
+JAXP_DROP_SHA256SUM = 29edfda4b7e5e2f87da5a172b4d3e3cf05b1c1ec60e5ebb0144470edcb2a9c1d
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
HOTSPOT_SRC_ZIP = hotspot.tar.gz
@@ -188,11 +187,6 @@
SECURITY_PATCHES =
-if WITH_ALT_HSBUILD
-SECURITY_PATCHES += \
- patches/security/20110215/6878713.patch
-endif
-
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
patches/stdc-limit-macros.patch \
@@ -200,6 +194,7 @@
patches/openjdk/6637796-set_bounds.patch \
patches/openjdk/6607660-treelock.patch \
patches/openjdk/6607170-request_focus.patch \
+ patches/openjdk/4685768-focus.patch \
patches/openjdk/6616323-component_array.patch \
patches/openjdk/6682046-shape_calculation.patch \
patches/openjdk/6797195-hw_lw_mixing.patch \
@@ -216,12 +211,11 @@
patches/lucene-crash.patch \
patches/version.patch \
patches/version-hotspot.patch \
- patches/hotspot/$(HSBUILD)/text-relocations.patch \
+ patches/text-relocations.patch \
patches/openjdk/7043921-java_rmi_cgi.patch \
patches/use-system-tzdata.patch \
patches/headers.patch \
patches/gcc-suffix.patch \
- patches/hotspot/$(HSBUILD)/gcc-suffix.patch \
patches/memory-limits.patch \
patches/libraries.patch \
patches/jvmtiEnv.patch \
@@ -236,7 +230,7 @@
patches/alt-jar.patch \
patches/jdk-use-ssize_t.patch \
patches/use-idx_t.patch \
- patches/hotspot/$(HSBUILD)/params-cast-size_t.patch \
+ patches/params-cast-size_t.patch \
patches/clean-crypto.patch \
patches/arch.patch \
patches/lc_ctype.patch \
@@ -245,11 +239,10 @@
patches/testenv.patch \
patches/samejvm-safe.patch \
patches/pr261.patch \
- patches/hotspot/$(HSBUILD)/sparc-buildfixes.patch \
+ patches/sparc-buildfixes.patch \
patches/sparc64-linux.patch \
patches/sparc-ptracefix.patch \
patches/sparc-trapsfix.patch \
- patches/openjdk/7029905-demo_applet_html_files.patch \
patches/jtreg-6592792.patch \
patches/s390-noinline.patch \
patches/jtreg-dnd.patch \
@@ -267,9 +260,7 @@
patches/applet_hole.patch \
patches/jtreg-httpTest.patch \
patches/arm.patch \
- patches/hotspot/$(HSBUILD)/arm.patch \
patches/debug-dir.patch \
- patches/openjdk/7042040-no_disk_space_check.patch \
patches/override-redirect-metacity.patch \
patches/openjdk/6967533-pre_epoch.patch \
patches/fonts-rhel.patch \
@@ -290,7 +281,7 @@
patches/openjdk/6800846-printing-quality.patch \
patches/rh661505-jpeg.patch \
patches/6703377-freetypescaler.patch \
- patches/hotspot/$(HSBUILD)/ia64-fix.patch \
+ patches/ia64-fix.patch \
patches/openjdk/6642612-filechooser_button_sizes.patch \
patches/jtreg-international-fonts-styles.patch \
patches/openjdk/6736649-text_bearings.patch \
@@ -320,39 +311,27 @@
patches/openjdk/6766342-AA-simple-shape-performance.patch \
patches/openjdk/7016856-pisces-performance.patch \
patches/openjdk/6934977-MappedByteBuffer.load.patch \
- patches/jaxp-serial-version-uid.patch \
patches/jtreg-hotspot-bug-6196102.patch \
patches/jtreg-double-to-string.patch \
patches/openjdk/7023591-AAShapePipe.patch \
patches/openjdk/7027667-AAShapePipeRegTest.patch \
patches/openjdk/7019861-AA-regression-fix.patch \
- patches/openjdk/6768387-jtable_not_serializable.patch \
- patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch \
patches/g356743-libpng-1.5.patch \
patches/revert-6885123.patch \
- patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \
+ patches/openjdk/7032388-work_without_cmov_instruction.patch \
patches/openjdk/7031385-gcc-register-allocation-fix.patch \
- patches/openjdk/7036220-shark_llvm_29_headers.patch \
patches/openjdk/6986968-crash_on_xim_restart.patch \
patches/openjdk/7036754-stroker-nan.patch \
patches/openjdk/pgram-pipe-regression.patch \
patches/openjdk/7034464-hugepage.patch \
patches/openjdk/7037939-hugepage.patch \
patches/openjdk/7043564-hugepage.patch \
- patches/openjdk/mutter.patch
-
-if WITH_ALT_HSBUILD
-ICEDTEA_PATCHES += \
+ patches/openjdk/mutter.patch \
patches/pr639-broken_shark_build.patch \
- patches/hotspot/$(HSBUILD)/powerpc-stacksize.patch \
+ patches/powerpc-stacksize.patch \
patches/jtreg-remove-test-6987555.patch \
- patches/jtreg-remove-test-6991596.patch
-else
-ICEDTEA_PATCHES += \
- patches/hotspot/$(HSBUILD)/no-precompiled-headers.patch \
- patches/hotspot/$(HSBUILD)/too-many-args.patch \
- patches/openjdk/6997495-test_correction_6857159.patch
-endif
+ patches/jtreg-remove-test-6991596.patch \
+ patches/openjdk/7036220-shark_llvm_29_headers.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -394,7 +373,6 @@
if ENABLE_SYSTEMTAP
ICEDTEA_PATCHES += patches/systemtap.patch \
- patches/hotspot/$(HSBUILD)/systemtap.patch \
patches/systemtap-gcc-4.5.patch \
patches/systemtap-alloc-size-workaround.patch
endif
@@ -1951,6 +1929,7 @@
--disable-docs \
$(filter-out '--with-jdk-home=% '--with-ecj=% \
'--with-java=% '--with-javah=% \
+ '--with-javac=% '--with-javac=% \
'--with-rmic=% '--with-additional-vms=% \
'--with-openjdk '--with-openjdk=% , \
$(CONFIGURE_ARGS)) \
diff -r 9cd3b8769614 -r b1123c5a67f7 NEWS
--- a/NEWS Wed May 18 09:04:01 2011 -0400
+++ b/NEWS Wed Jun 01 02:35:43 2011 +0100
@@ -29,6 +29,7 @@
- S7042040: Remove disk space sanity check
- S7043054: REGRESSION - wrong userBounds in Paint.createContext()
- S7043963, RH698295: Window manager workaround in AWT was not applied to mutter. Now it is.
+ - S4685768: Focus set to disabled component, can't Tab/Shift-Tab
* Bug fixes
- PR637: make check should exit with an error code if any regression test failed.
- G356743: Support libpng 1.5.
@@ -46,6 +47,11 @@
- CA156: uncaughtExceptionHandler doesn't work with OpenJDK 6 b21.
- CA157: ARM SMP Assertion thinlock failed.
* JamVM
+ - Fix leak of native thread structure.
+ - Consistent naming for classlib functions.
+ - Add extra includes to get rid off compiler warning.
+ - Rework OpenJDK storage of native thread structure.
+ - Implement remaining OpenJDK Array reflection interface.
- Ignore all unknown options.
- Handle overflow in getPhysicalMemory().
- Base default min and max heap size on physical memory.
diff -r 9cd3b8769614 -r b1123c5a67f7 acinclude.m4
--- a/acinclude.m4 Wed May 18 09:04:01 2011 -0400
+++ b/acinclude.m4 Wed Jun 01 02:35:43 2011 +0100
@@ -1044,8 +1044,8 @@
AC_DEFUN([IT_WITH_HOTSPOT_BUILD],
[
ORIGINAL_BUILD="original"
- ALTERNATE_BUILD="hs20"
- DEFAULT_BUILD=${ALTERNATE_BUILD}
+ ALTERNATE_BUILD="original"
+ DEFAULT_BUILD=${ORIGINAL_BUILD}
AC_MSG_CHECKING([which HotSpot build to use])
AC_ARG_WITH([hotspot-build],
[AS_HELP_STRING(--with-hotspot-build,the HotSpot build to use (see hotspot.map))],
diff -r 9cd3b8769614 -r b1123c5a67f7 hotspot.map
--- a/hotspot.map Wed May 18 09:04:01 2011 -0400
+++ b/hotspot.map Wed Jun 01 02:35:43 2011 +0100
@@ -1,2 +1,1 @@
# version url changeset md5sum
-hs20 http://hg.openjdk.java.net/hsx/hsx20/master f0f676c5a2c6 369ad745bf697d525d1a00fc09906829
diff -r 9cd3b8769614 -r b1123c5a67f7 patches/arm.patch
--- a/patches/arm.patch Wed May 18 09:04:01 2011 -0400
+++ b/patches/arm.patch Wed Jun 01 02:35:43 2011 +0100
@@ -164,3 +164,60 @@
Thread* t = ThreadLocalStorage::get_thread_slow();
SignalHandlerMark shm(t);
+diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp
+--- openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp 2011-01-25 22:57:24.000000000 +0000
++++ openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp 2011-01-28 01:46:18.769782690 +0000
+@@ -1,6 +1,7 @@
+ /*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2009 Red Hat, Inc.
++ * Copyright 2009 Edward Nevill
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -26,6 +27,44 @@
+ #ifndef CPU_ZERO_VM_BYTECODES_ZERO_HPP
+ #define CPU_ZERO_VM_BYTECODES_ZERO_HPP
+
+-// This file is intentionally empty
++#ifdef HOTSPOT_ASM
++#define _iaccess_0 ((Bytecodes::Code)0xdb)
++#define _iaccess_1 ((Bytecodes::Code)0xdc)
++#define _iaccess_2 ((Bytecodes::Code)0xdd)
++#define _iaccess_3 ((Bytecodes::Code)0xde)
++
++#define _invokeresolved ((Bytecodes::Code)0xdf)
++#define _invokespecialresolved ((Bytecodes::Code)0xe0)
++#define _invokestaticresolved ((Bytecodes::Code)0xe1)
++
++#define _iload_iload ((Bytecodes::Code)0xe3)
++#define _iload_iload_N ((Bytecodes::Code)0xe4)
++
++#define _dmac ((Bytecodes::Code)0xe6)
++
++ _iload_0_iconst_N , // 231
++ _iload_1_iconst_N , // 232
++ _iload_2_iconst_N , // 233
++ _iload_3_iconst_N , // 234
++ _iload_iconst_N , // 235
++ _iadd_istore_N , // 236
++ _isub_istore_N , // 237
++ _iand_istore_N , // 238
++ _ior_istore_N , // 239
++ _ixor_istore_N , // 240
++ _iadd_u4store , // 241
++ _isub_u4store , // 242
++ _iand_u4store , // 243
++ _ior_u4store , // 244
++ _ixor_u4store , // 245
++ _iload_0_iload , // 246
++ _iload_1_iload , // 247
++ _iload_2_iload , // 248
++ _iload_3_iload , // 249
++ _iload_0_iload_N , // 250
++ _iload_1_iload_N , // 251
++ _iload_2_iload_N , // 252
++ _iload_3_iload_N , // 253
++#endif // HOTSPOT_ASM
+
+ #endif // CPU_ZERO_VM_BYTECODES_ZERO_HPP
diff -r 9cd3b8769614 -r b1123c5a67f7 patches/gcc-suffix.patch
--- a/patches/gcc-suffix.patch Wed May 18 09:04:01 2011 -0400
+++ b/patches/gcc-suffix.patch Wed Jun 01 02:35:43 2011 +0100
@@ -46,3 +46,34 @@
endif
ifneq ("$(findstring sparc,$(ARCH))", "")
# sparc or sparcv9
+diff -Nru openjdk.orig/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile
+--- openjdk.orig/hotspot/agent/src/os/linux/Makefile 2011-01-25 22:57:24.000000000 +0000
++++ openjdk/hotspot/agent/src/os/linux/Makefile 2011-01-28 00:43:20.632487152 +0000
+@@ -23,7 +23,7 @@
+ #
+
+ ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
+-GCC = gcc
++GCC = gcc$(GCC_SUFFIX)
+
+ JAVAH = ${JAVA_HOME}/bin/javah
+
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2011-01-28 00:35:53.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2011-01-28 00:43:56.676866099 +0000
+@@ -28,11 +28,11 @@
+ # When cross-compiling the ALT_COMPILER_PATH points
+ # to the cross-compilation toolset
+ ifdef CROSS_COMPILE_ARCH
+-CPP = $(ALT_COMPILER_PATH)/g++
+-CC = $(ALT_COMPILER_PATH)/gcc
++CPP = $(ALT_COMPILER_PATH)/g++$(GCC_SUFFIX)
++CC = $(ALT_COMPILER_PATH)/gcc$(GCC_SUFFIX)
+ else
+-CPP = g++
+-CC = gcc
++CPP = g++$(GCC_SUFFIX)
++CC = gcc$(GCC_SUFFIX)
+ endif
+
+ AS = $(CC) -c
diff -r 9cd3b8769614 -r b1123c5a67f7 patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch
--- a/patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch Wed May 18 09:04:01 2011 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
---- openjdk/hotspot/src/cpu/x86/vm/assembler_x86.cpp 2011-03-30 11:31:16.408872134 -0700
-+++ openjdk/hotspot/src/cpu/x86/vm/assembler_x86.cpp 2011-03-30 11:31:16.084614406 -0700
-@@ -7769,6 +7769,28 @@
- }
- }
-
-+void MacroAssembler::cmov32(Condition cc, Register dst, Address src) {
-+ if (VM_Version::supports_cmov()) {
-+ cmovl(cc, dst, src);
-+ } else {
-+ Label L;
-+ jccb(negate_condition(cc), L);
-+ movl(dst, src);
-+ bind(L);
-+ }
-+}
-+
-+void MacroAssembler::cmov32(Condition cc, Register dst, Register src) {
-+ if (VM_Version::supports_cmov()) {
-+ cmovl(cc, dst, src);
-+ } else {
More information about the distro-pkg-dev
mailing list