/hg/release/icedtea7-2.5: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Oct 15 05:30:31 UTC 2014
changeset 2b6cee016628 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=2b6cee016628
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 15 03:50:28 2014 +0100
CA172, PR2030, G453612: Add ARM hardfloat support to CACAO on Gentoo.
2013-01-23 Andrew John Hughes <gnu.andrew at redhat.com>
CA172, PR2030, G453612: Add ARM hardfloat support
to CACAO on Gentoo.
* Makefile.am:
(ICEDTEA_PATCHES): Add armhf patch when building
CACAO.
* NEWS: Updated.
* patches/cacao/armhf.patch:
Patch to enable hardfloat on triplet used by Gentoo.
changeset 4ab80eb99ae1 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=4ab80eb99ae1
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 15 04:09:18 2014 +0100
PR2014: Use version from hotspot.map to create tarball filename
2014-10-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(TAR_SUFFIX): New variable to store filename
suffix of OpenJDK drop tarballs.
(OPENJDK_SRC_ZIP): Use TAR_SUFFIX.
(CORBA_SRC_ZIP): Likewise.
(JAXP_SRC_ZIP): Likewise.
(JAXWS_SRC_ZIP): Likewise.
(JDK_SRC_ZIP): Likewise.
(LANGTOOLS_SRC_ZIP): Likewise.
(HOTSPOT_SRC_ZIP): Likewise.
(download-hotspot): Look for $(HSBUILD).$(TAR_SUFFIX)
as the drop tarball filename in the URL if using
a non-default HotSpot, rather than always looking
for hotspot.$(TAR_SUFFIX).
(ADD_ZERO_CONFIGURE_ARGS): Make use of $(TAR_SUFFIX).
* NEWS: Updated.
* hotspot.map.in:
Use same drop path for aarch64 as for default.
changeset ee08f15d6df1 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=ee08f15d6df1
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 15 04:34:18 2014 +0100
PR2015: Update hotspot.map documentation in INSTALL
2014-10-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
* INSTALL: Update section on hotspot.map
to reflect recent changes.
* Makefile.am:
(download-hotspot): Use $(TAR_SUFFIX) in hg drops
as well.
* NEWS: Updated.
changeset ff1723d0a8a2 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=ff1723d0a8a2
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 15 04:57:41 2014 +0100
Set version to u71b14.
2014-10-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(JDK_UPDATE_VERSION): Bump to u71.
(BUILD_VERSION): Set to b14.
changeset 7967926b78d7 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=7967926b78d7
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 15 06:30:19 2014 +0100
Added tag icedtea-2.5.3 for changeset ff1723d0a8a2
diffstat:
.hgtags | 1 +
ChangeLog | 47 +++++++++++++++++++++++++++++++++++
INSTALL | 62 +++++++++++++++++++++++++++++++++-------------
Makefile.am | 32 ++++++++++++++---------
NEWS | 4 +++
hotspot.map.in | 2 +-
patches/cacao/armhf.patch | 12 +++++++++
7 files changed, 128 insertions(+), 32 deletions(-)
diffs (262 lines):
diff -r 121ad7411fd1 -r 7967926b78d7 .hgtags
--- a/.hgtags Tue Oct 14 22:11:50 2014 +0100
+++ b/.hgtags Wed Oct 15 06:30:19 2014 +0100
@@ -39,3 +39,4 @@
81ffee9f8143a9ced4e3c418924f2641ed72b2cc icedtea-2.5.0
a2d9b45d7491a9c84afb33a457533817a7f3e600 icedtea-2.5.1
7a5b620a054a6276333c4b3009d1a0dd5248a7f3 icedtea-2.5.2
+ff1723d0a8a23ef46e158aafcf2ee15c3e6317dc icedtea-2.5.3
diff -r 121ad7411fd1 -r 7967926b78d7 ChangeLog
--- a/ChangeLog Tue Oct 14 22:11:50 2014 +0100
+++ b/ChangeLog Wed Oct 15 06:30:19 2014 +0100
@@ -1,3 +1,50 @@
+2014-10-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (JDK_UPDATE_VERSION): Bump to u71.
+ (BUILD_VERSION): Set to b14.
+
+2014-10-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * INSTALL: Update section on hotspot.map
+ to reflect recent changes.
+ * Makefile.am:
+ (download-hotspot): Use $(TAR_SUFFIX) in hg drops
+ as well.
+ * NEWS: Updated.
+
+2014-10-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (TAR_SUFFIX): New variable to store filename
+ suffix of OpenJDK drop tarballs.
+ (OPENJDK_SRC_ZIP): Use TAR_SUFFIX.
+ (CORBA_SRC_ZIP): Likewise.
+ (JAXP_SRC_ZIP): Likewise.
+ (JAXWS_SRC_ZIP): Likewise.
+ (JDK_SRC_ZIP): Likewise.
+ (LANGTOOLS_SRC_ZIP): Likewise.
+ (HOTSPOT_SRC_ZIP): Likewise.
+ (download-hotspot): Look for $(HSBUILD).$(TAR_SUFFIX)
+ as the drop tarball filename in the URL if using
+ a non-default HotSpot, rather than always looking
+ for hotspot.$(TAR_SUFFIX).
+ (ADD_ZERO_CONFIGURE_ARGS): Make use of $(TAR_SUFFIX).
+ * NEWS: Updated.
+ * hotspot.map.in:
+ Use same drop path for aarch64 as for default.
+
+2013-01-23 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ CA172, PR2030, G453612: Add ARM hardfloat support
+ to CACAO on Gentoo.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add armhf patch when building
+ CACAO.
+ * NEWS: Updated.
+ * patches/cacao/armhf.patch:
+ Patch to enable hardfloat on triplet used by Gentoo.
+
2014-10-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/hotspot/aarch64/20140715-8030763-validate_global_memory_allocation.patch,
diff -r 121ad7411fd1 -r 7967926b78d7 INSTALL
--- a/INSTALL Tue Oct 14 22:11:50 2014 +0100
+++ b/INSTALL Wed Oct 15 06:30:19 2014 +0100
@@ -306,35 +306,61 @@
IcedTea allows the version of HotSpot provided with the upstream build
drop to be replaced with another. Support for this is provided by the
---with-hotspot-build option which causes IcedTea to probe the
-hotspot.map file for an entry with the given build name. The
-hotspot.map file maps the name to a changeset from a given repository
-URL. During the build, it downloads HotSpot from
-${URL}/archive/${CHANGESET}.tar.gz and the resulting file is verified
-using the MD5 sum stored in hotspot.map.
+--with-hotspot-build=${name} option which causes IcedTea to probe the
+hotspot.map file for an entry with the given build name. The map file
+always contains an entry named 'default' which corresponds to the
+upstream build drop. Specifying --without-hotspot-build will ensure
+that 'default' is used.
+
+At build time, the hotspot.map file is used as follows:
+
+1. The type of tarball (Mercurial changeset or drop), URL, changeset
+ID and SHA256 checksum corresponding to the HotSpot build being used
+are obtained from the hotspot.map file.
+2. When the download-hotspot target is invoked, the URL used is
+constructed using the contents of hotspot.map. If the type is 'hg',
+then the tarball is downloaded from
+${URL}/archive/${CHANGESET}.${TAR_SUFFIX}, where ${URL} and ${CHANGESET}
+are taken from hotspot.map and ${TAR_SUFFIX} is the suffix used in the
+filename to specify the type of compression being used (e.g. tar.gz or
+tar.bz2). If the type is 'drop', then the tarball is downloaded from
+${URL}/${HSNAME}.${TAR_SUFFIX}, where ${HSNAME} is the name of the
+HotSpot build being used. In the case of 'default', ${HSNAME} is set
+to 'hotspot'. Once the file is downloaded, it is verified using
+the SHA256 checksum from the hotspot.map file.
+3. When the extract-hotspot target is invoked, the name of the
+top-level directory from the tarball is constructed using the
+${CHANGESET} field from hotspot.map i.e. the tarball should contain
+a top-level directory called hotspot-${CHANGESET}.
New build selections may be provided by providing further mappings in
-the hotspot.map file. The name can be anything
+the hotspot.map.in file. The name can be anything
e.g. 'shiny_new_hotspot'. This is simply used to map the argument to
--with-hotspot-build to the values in the file and to apply
appropriate patches (see patches/hotspot, $HSBUILD is available in
-Makefile.am for obtaining the build name). The special value
-'original' is used for patches/hotspot/original to denote those for
-the upstream HotSpot; this value does not appear in hotspot.map.
+Makefile.am for obtaining the build name).
-The changeset and URL should refer to a valid HotSpot tree when used
-as above. The required values can be obtained from a local checkout
-or by using the web interface. The simplest way to calculate the MD5
-sum is to download the tarball and then run the 'md5sum' application
-on it. The resulting value should be added to hotspot.map.
+The required values for the changeset field can be obtained from a
+local checkout or by using the web interface. The simplest way to
+calculate the SHA256 sum is to download the tarball and then run the
+'sha256sum' application on it. The resulting value should be added to
+hotspot.map.in.
+
+Note that the source tree contains hotspot.map.in, but hotspot.map is
+used at build-time. The latter is generated by configure and this
+generation process may be used to include information determined
+by configure. In the case of the existing hotspot.map.in entries,
+this is used to include the IcedTea release version in the URL.
As with the OpenJDK build tarballs, the location of an alternate zip
can be specified using --with-hotspot-src-zip. This skips the
-download stage and just verifies that the zip's MD5 sum matches that
+download stage and just verifies that the zip's SHA256 sum matches that
of the requested build.
-Currently, IcedTea7 only supports the 'original' HotSpot provided as
-part of the upstream IcedTea forest.
+Currently, IcedTea 2.x supports the 'default' HotSpot tree, which is
+part of the IcedTea forest for the particular minor release series
+being used, and 'aarch64', which uses snapshots of the AArch64 HotSpot
+port available at http://hg.openjdk.java.net/aarch64-port/jdk7u
JavaScript Support
==================
diff -r 121ad7411fd1 -r 7967926b78d7 Makefile.am
--- a/Makefile.am Tue Oct 14 22:11:50 2014 +0100
+++ b/Makefile.am Wed Oct 15 06:30:19 2014 +0100
@@ -1,7 +1,7 @@
# Dependencies
-JDK_UPDATE_VERSION = 65
-BUILD_VERSION = b32
+JDK_UPDATE_VERSION = 71
+BUILD_VERSION = b14
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
CORBA_CHANGESET = 4aed5efcd8df
@@ -137,6 +137,7 @@
# Conditional defintions
+TAR_SUFFIX = tar.bz2
if USE_HG
OPENJDK_SRC_ZIP =
CORBA_SRC_ZIP =
@@ -146,13 +147,13 @@
LANGTOOLS_SRC_ZIP =
HOTSPOT_SRC_ZIP =
else
- OPENJDK_SRC_ZIP = openjdk.tar.bz2
- CORBA_SRC_ZIP = corba.tar.bz2
- JAXP_SRC_ZIP = jaxp.tar.bz2
- JAXWS_SRC_ZIP = jaxws.tar.bz2
- JDK_SRC_ZIP = jdk.tar.bz2
- LANGTOOLS_SRC_ZIP = langtools.tar.bz2
- HOTSPOT_SRC_ZIP = hotspot.tar.bz2
+ OPENJDK_SRC_ZIP = openjdk.$(TAR_SUFFIX)
+ CORBA_SRC_ZIP = corba.$(TAR_SUFFIX)
+ JAXP_SRC_ZIP = jaxp.$(TAR_SUFFIX)
+ JAXWS_SRC_ZIP = jaxws.$(TAR_SUFFIX)
+ JDK_SRC_ZIP = jdk.$(TAR_SUFFIX)
+ LANGTOOLS_SRC_ZIP = langtools.$(TAR_SUFFIX)
+ HOTSPOT_SRC_ZIP = hotspot.$(TAR_SUFFIX)
endif
if WITH_HGREV
@@ -253,7 +254,8 @@
if BUILD_CACAO
ICEDTEA_PATCHES += \
patches/cacao/launcher.patch \
- patches/cacao/memory.patch
+ patches/cacao/memory.patch \
+ patches/cacao/armhf.patch
else
if USING_CACAO
ICEDTEA_PATCHES += \
@@ -1099,9 +1101,13 @@
mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
fi ; \
if test "x$(HS_TYPE)" = "xhg"; then \
- $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
+ $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).$(TAR_SUFFIX) -O $(HOTSPOT_SRC_ZIP) ; \
else \
- $(WGET) $(HS_URL)/$(HOTSPOT_SRC_ZIP) ; \
+ if test "x$(HSBUILD)" = "xdefault"; then \
+ $(WGET) $(HS_URL)/$(HOTSPOT_SRC_ZIP) ; \
+ else \
+ $(WGET) $(HS_URL)/$(HSBUILD).$(TAR_SUFFIX) -O $(HOTSPOT_SRC_ZIP) ; \
+ fi ; \
fi ; \
if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \
| $(SHA256SUM) --check ; then \
@@ -2265,7 +2271,7 @@
'--disable-bootstrap% '--enable-bootstrap% , \
$(CONFIGURE_ARGS)) \
$(foreach i, openjdk hotspot corba jaxp jaxws jdk langtools, \
- $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.bz2))
+ $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).$(TAR_SUFFIX)))
ADD_ZERO_EXTRA_BUILD_ENV = \
BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(BUILD_OUTPUT_DIR)/langtools/dist \
diff -r 121ad7411fd1 -r 7967926b78d7 NEWS
--- a/NEWS Tue Oct 14 22:11:50 2014 +0100
+++ b/NEWS Wed Oct 15 06:30:19 2014 +0100
@@ -62,8 +62,12 @@
- PR2002: Fix references to hotspot.map following PR2000
- PR2003: --disable-system-gtk option broken by refactoring in PR1736
- PR2009: Checksum of policy JAR files changes on every build
+ - PR2014: Use version from hotspot.map to create tarball filename
+ - PR2015: Update hotspot.map documentation in INSTALL
- PR2025: LCMS_CFLAGS & LCMS_LIBS should not be used unless SYSTEM_LCMS is enabled
- RH1015432: java-1.7.0-openjdk: Fails on PPC with StackOverflowError (revised comprehensive fix)
+* CACAO
+ - PR2030, G453612, CA172: ARM hardfloat support for CACAO
* AArch64 port
- AArch64 C2 instruct for smull
- Add frame anchor fences.
diff -r 121ad7411fd1 -r 7967926b78d7 hotspot.map.in
--- a/hotspot.map.in Tue Oct 14 22:11:50 2014 +0100
+++ b/hotspot.map.in Wed Oct 15 06:30:19 2014 +0100
@@ -1,3 +1,3 @@
# version type(drop/hg) url changeset sha256sum
default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 1d0d98e7c981 8c8e1f7e97f47fe4029e0b0ba42b3515474adabe64e1fbee15c0e2e22a13aa28
-aarch64 drop http://icedtea.classpath.org/download/drops/aarch64/@ICEDTEA_RELEASE@ 116bc9da35de b9e7f67079184310450c9b461b492f340aa7824c27079b430c8f25b58b327ec5
+aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 116bc9da35de b9e7f67079184310450c9b461b492f340aa7824c27079b430c8f25b58b327ec5
diff -r 121ad7411fd1 -r 7967926b78d7 patches/cacao/armhf.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/armhf.patch Wed Oct 15 06:30:19 2014 +0100
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+--- cacao/cacao/configure.ac
++++ cacao/cacao/configure.ac
+@@ -50,7 +50,7 @@
+ JAVA_ARCH="arm"
+
+ case "$host" in
+- *-gnueabihf)
++ *-hardfloat-*-gnueabi | *-gnueabihf)
+ ARCH_FLAGS="$ARCH_FLAGS -D__ARMHF__"
+ ;;
+ esac
More information about the distro-pkg-dev
mailing list