/hg/release/icedtea7-2.4: 10 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Mar 28 12:28:02 UTC 2014
changeset 931fe5bd6067 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=931fe5bd6067
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Mar 27 20:26:36 2014 +0000
Prepare for 2.4.6 release.
2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Set release date to today.
* configure.ac: Set to 2.4.6.
changeset 372ef328babd in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=372ef328babd
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Mar 27 20:30:05 2014 +0000
Update patch locations for tarball.
2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(EXTRA_DIST): Don't look for patches in
boot/hotspot/*. Do look for patches in
hotspot/*.
changeset 3024634a3335 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=3024634a3335
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Mar 27 21:18:02 2014 +0000
Update to latest aarch64 tree.
2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
* hotspot.map:
Update to latest aarch64 tree.
changeset df0089517a62 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=df0089517a62
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Mar 27 03:50:20 2014 +0000
Perform configure checks using ecj.jar if native ecj is enabled.
2014-03-26 Andrew John Hughes <gnu.andrew at member.fsf.org>
Perform configure checks using ecj.jar
if native ecj is enabled.
* Makefile.am:
(native-ecj): Link against gcj explicitly.
* acinclude.m4:
(IT_FIND_COMPILER): Run IT_WITH_GCJ
and set JAVAC to an invocation of the ECJ_JAR
if native ecj is used. Depend on IT_FIND_JAVA
and IT_FIND_ECJ_JAR for this.
(IT_FIND_ECJ_JAR): Define only once.
(IT_WITH_GCJ): Likewise.
(IT_DIAMOND_CHECK): Depend on IT_CHECK_JAVA_AND_JAVAC_WORK.
* configure.ac: Remove invocation of IT_WITH_GCJ.
changeset c99ce4169f55 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=c99ce4169f55
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Mar 27 23:33:04 2014 +0000
S8035893: JVM_GetVersionInfo fails to zero structure
2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Updated.
* hotspot.map: Bring in S8035893 backport.
changeset 47177c9bfafa in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=47177c9bfafa
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 28 03:41:03 2014 +0000
Apply Werror fix to aarch64 port.
2012-08-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
(ICEDTEA_PATCHES): Add -Werror patch
from IcedTea7 HEAD.
* patches/hotspot/aarch64/werror.patch:
Allow COMPILER_WARNINGS_FATAL to turn off -Werror.
changeset fdd91eddd59b in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=fdd91eddd59b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 28 11:55:57 2014 +0000
Revert previous change to ARM32 JIT default as bootstraps on Fedora.
2014-03-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
(IT_ENABLE_ARM32JIT): Turn JIT on by default.
* NEWS: Readd mention of turning JIT on by default.
changeset 4ca3077d0f5d in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=4ca3077d0f5d
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 28 12:06:12 2014 +0000
Update release date.
2014-03-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Update release date.
changeset 7207e8b9dc7f in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=7207e8b9dc7f
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 28 12:08:50 2014 +0000
Update NEWS with recent changes.
2014-03-26 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Update with recent changes.
changeset d2bc83a8ce09 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=d2bc83a8ce09
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 28 12:27:42 2014 +0000
Added tag icedtea-2.4.6 for changeset 7207e8b9dc7f
diffstat:
.hgtags | 1 +
ChangeLog | 60 ++++++++++++++++++++++++++++++++++++
Makefile.am | 8 +++-
NEWS | 5 ++-
acinclude.m4 | 17 +++++++--
configure.ac | 3 +-
hotspot.map | 4 +-
patches/hotspot/aarch64/werror.patch | 43 +++++++++++++++++++++++++
8 files changed, 130 insertions(+), 11 deletions(-)
diffs (277 lines):
diff -r 0e95da4065f2 -r d2bc83a8ce09 .hgtags
--- a/.hgtags Thu Mar 27 20:22:28 2014 +0000
+++ b/.hgtags Fri Mar 28 12:27:42 2014 +0000
@@ -41,3 +41,4 @@
3dd8c1e3a5b3827f1843a78a017c57d0ed45f2c0 icedtea-2.4.3
73ef620ce0a5d16d5c90e58eb17d022c1ecb572e icedtea-2.4.4
4bfa1c865fdd3d385c3bdf7a7c8611f80d42029d icedtea-2.4.5
+7207e8b9dc7f2a1673b02e410e75927fa49651fa icedtea-2.4.6
diff -r 0e95da4065f2 -r d2bc83a8ce09 ChangeLog
--- a/ChangeLog Thu Mar 27 20:22:28 2014 +0000
+++ b/ChangeLog Fri Mar 28 12:27:42 2014 +0000
@@ -1,3 +1,63 @@
+2014-03-26 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Update with recent changes.
+
+2014-03-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Update release date.
+
+2014-03-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * acinclude.m4:
+ (IT_ENABLE_ARM32JIT): Turn JIT on by default.
+ * NEWS: Readd mention of turning JIT on by default.
+
+2012-08-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add -Werror patch
+ from IcedTea7 HEAD.
+ * patches/hotspot/aarch64/werror.patch:
+ Allow COMPILER_WARNINGS_FATAL to turn off -Werror.
+
+2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Updated.
+ * hotspot.map: Bring in S8035893 backport.
+
+2014-03-26 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ Perform configure checks using ecj.jar
+ if native ecj is enabled.
+ * Makefile.am:
+ (native-ecj): Link against gcj explicitly.
+ * acinclude.m4:
+ (IT_FIND_COMPILER): Run IT_WITH_GCJ
+ and set JAVAC to an invocation of the ECJ_JAR
+ if native ecj is used. Depend on IT_FIND_JAVA
+ and IT_FIND_ECJ_JAR for this.
+ (IT_FIND_ECJ_JAR): Define only once.
+ (IT_WITH_GCJ): Likewise.
+ (IT_DIAMOND_CHECK): Depend on IT_CHECK_JAVA_AND_JAVAC_WORK.
+ * configure.ac: Remove invocation of IT_WITH_GCJ.
+
+2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * hotspot.map:
+ Update to latest aarch64 tree.
+
+2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (EXTRA_DIST): Don't look for patches in
+ boot/hotspot/*. Do look for patches in
+ hotspot/*.
+
+2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Set release date to today.
+ * configure.ac: Set to 2.4.6.
+
2014-03-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
* acinclude.m4:
diff -r 0e95da4065f2 -r d2bc83a8ce09 Makefile.am
--- a/Makefile.am Thu Mar 27 20:22:28 2014 +0000
+++ b/Makefile.am Fri Mar 28 12:27:42 2014 +0000
@@ -297,6 +297,10 @@
ICEDTEA_PATCHES += patches/nss-config.patch
endif
+if WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += patches/hotspot/aarch64/werror.patch
+endif
+
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
# Bootstrapping patches
@@ -773,7 +777,7 @@
EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \
$(top_srcdir)/patches/boot/*.patch \
$(top_srcdir)/patches/cacao/*.patch \
- $(top_srcdir)/patches/boot/hotspot/*/*.patch \
+ $(top_srcdir)/patches/hotspot/*/*.patch \
tools-copy contrib overlays \
javaws.png javaws.desktop \
jconsole.desktop policytool.desktop \
@@ -1627,7 +1631,7 @@
mkdir -p stamps
if BUILD_NATIVE_ECJ
${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
- --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
+ --main=org.eclipse.jdt.internal.compiler.batch.Main -lgcj ${ECJ_JAR}
endif
touch $@
diff -r 0e95da4065f2 -r d2bc83a8ce09 NEWS
--- a/NEWS Thu Mar 27 20:22:28 2014 +0000
+++ b/NEWS Fri Mar 28 12:27:42 2014 +0000
@@ -12,10 +12,11 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 2.4.6 (2014-04-XX):
+New in release 2.4.6 (2014-03-28):
* Backports
- S8009062: poor performance of JNI AttachCurrentThread after fix for 7017193
+ - S8035893: JVM_GetVersionInfo fails to zero structure
- Re-enable the 'gamma' test at the end of the HotSpot build, but only for HotSpot based bootstrap JDKs.
* Bug fixes
- PR1101: Undefined symbols on GNU/Linux SPARC
@@ -25,6 +26,7 @@
- PR1684: Build fails with empty PAX_COMMAND
- RH1015432: java-1.7.0-openjdk: Fails on PPC with StackOverflowError (revised fix)
- Link against $(LIBDL) if SYSTEM_CUPS is not true
+ - Perform configure checks using ecj.jar when --with-gcj (native ecj build) is enabled.
* ARM32 port
- Add arm_port from IcedTea 6
- Add patches/arm.patch from IcedTea 6
@@ -63,6 +65,7 @@
- Include $(CFLAGS) in assembler stage
- PR1626: ARM32 assembler update for hsx24. Use ARM32JIT to turn it on/off.
- Replace literal offsets for METHOD_SIZEOFPARAMETERS and ISTATE_NEXT_FRAME with correct symbolic names.
+ - Turn ARM32 JIT on by default
* AArch64 port
- PR1713: Support AArch64 Port
* Shark
diff -r 0e95da4065f2 -r d2bc83a8ce09 acinclude.m4
--- a/acinclude.m4 Thu Mar 27 20:22:28 2014 +0000
+++ b/acinclude.m4 Fri Mar 28 12:27:42 2014 +0000
@@ -126,9 +126,17 @@
AC_DEFUN([IT_FIND_COMPILER],
[
+ AC_REQUIRE([IT_FIND_JAVA])
+ AC_REQUIRE([IT_FIND_ECJ_JAR])
+
IT_FIND_JAVAC
IT_FIND_ECJ
IT_USING_ECJ
+ IT_WITH_GCJ
+
+ if test x"${GCJ}" != xno ; then
+ JAVAC="${JAVA} -classpath ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main"
+ fi
AC_SUBST(ECJ)
AC_SUBST(JAVAC)
@@ -315,7 +323,7 @@
AM_CONDITIONAL([SRC_DIR_HARDLINKABLE], test x"${it_cv_hardlink_src}" = "xyes")
])
-AC_DEFUN([IT_FIND_ECJ_JAR],
+AC_DEFUN_ONCE([IT_FIND_ECJ_JAR],
[
AC_MSG_CHECKING([for an ecj JAR file])
AC_ARG_WITH([ecj-jar],
@@ -930,7 +938,7 @@
AM_CONDITIONAL([USE_JDK7], test x"${project}" = "xjdk7")
])
-AC_DEFUN([IT_WITH_GCJ],
+AC_DEFUN_ONCE([IT_WITH_GCJ],
[
AC_MSG_CHECKING([whether to compile ecj natively])
AC_ARG_WITH([gcj],
@@ -1786,6 +1794,7 @@
])
AC_DEFUN([IT_DIAMOND_CHECK],[
+ AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
AC_CACHE_CHECK([if javac lacks support for the diamond operator], it_cv_diamond, [
CLASS=Test.java
BYTECODE=$(echo $CLASS|sed 's#\.java##')
@@ -2631,7 +2640,7 @@
[
AC_MSG_CHECKING([whether to enable the ARM32 JIT])
AC_ARG_ENABLE([arm32-jit],
- [AS_HELP_STRING(--enable-arm32-jit,build with the ARM32 JIT [[default=no]])],
+ [AS_HELP_STRING(--enable-arm32-jit,build with the ARM32 JIT [[default=yes]])],
[
case "${enableval}" in
yes)
@@ -2643,7 +2652,7 @@
esac
],
[
- enable_arm32jit=no
+ enable_arm32jit=yes
])
AC_MSG_RESULT([$enable_arm32jit])
AM_CONDITIONAL([ENABLE_ARM32JIT], test x"${enable_arm32jit}" = "xyes")
diff -r 0e95da4065f2 -r d2bc83a8ce09 configure.ac
--- a/configure.ac Thu Mar 27 20:22:28 2014 +0000
+++ b/configure.ac Fri Mar 28 12:27:42 2014 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.4.6pre01], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.4.6], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
@@ -43,7 +43,6 @@
IT_CHECK_FOR_MERCURIAL
IT_OBTAIN_HG_REVISIONS
AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
-IT_WITH_GCJ
IT_WITH_HOTSPOT_BUILD
AC_PATH_TOOL([LINUX32],[linux32])
IT_CHECK_GCC_VERSION
diff -r 0e95da4065f2 -r d2bc83a8ce09 hotspot.map
--- a/hotspot.map Thu Mar 27 20:22:28 2014 +0000
+++ b/hotspot.map Fri Mar 28 12:27:42 2014 +0000
@@ -1,3 +1,3 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot 00478c5bf5e9 9f77cd372778c8a3359f3c9c0eb37c1dbd7c1f569613da89de64b41de48a5760
-aarch64 http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot 22910135cca6 477cd13f7fbe34d6dd878bbdb1e16f73b4b22e0e78d049d98f3c9cce8c193a1a
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot 172674e0ab65 2aadfe9b1848a619bd2d35f802b3e71ef5286e7822f9e7b02ce2539ca817d9b0
+aarch64 http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c
diff -r 0e95da4065f2 -r d2bc83a8ce09 patches/hotspot/aarch64/werror.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/hotspot/aarch64/werror.patch Fri Mar 28 12:27:42 2014 +0000
@@ -0,0 +1,43 @@
+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 2014-03-25 14:07:53.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2014-03-28 03:26:57.229802760 +0000
+@@ -205,7 +205,9 @@
+ endif
+
+ # Compiler warnings are treated as errors
++ifneq ($(COMPILER_WARNINGS_FATAL),false)
+ WARNINGS_ARE_ERRORS = -Werror
++endif
+
+ ifeq ($(USE_CLANG), true)
+ # However we need to clean the code up before we can unrestrictedly enable this option with Clang
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/adlc.make openjdk/hotspot/make/solaris/makefiles/adlc.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/adlc.make 2014-03-25 14:07:53.000000000 +0000
++++ openjdk/hotspot/make/solaris/makefiles/adlc.make 2014-03-28 03:26:02.604988364 +0000
+@@ -73,8 +73,10 @@
+
+ # CFLAGS_WARN holds compiler options to suppress/enable warnings.
+ # Compiler warnings are treated as errors
+-ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
+- CFLAGS_WARN = +w -errwarn
++ifneq ($(COMPILER_WARNINGS_FATAL),false)
++ ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
++ CFLAGS_WARN = +w -errwarn
++ endif
+ endif
+ CFLAGS += $(CFLAGS_WARN)
+
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/gcc.make openjdk/hotspot/make/solaris/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/gcc.make 2014-03-25 14:07:53.000000000 +0000
++++ openjdk/hotspot/make/solaris/makefiles/gcc.make 2014-03-28 03:27:28.206264586 +0000
+@@ -116,7 +116,9 @@
+
+
+ # Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
++ifneq ($(COMPILER_WARNINGS_FATAL),false)
++WARNINGS_ARE_ERRORS = -Werror
++endif
+ # Enable these warnings. See 'info gcc' about details on these options
+ WARNING_FLAGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef
+ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(WARNING_FLAGS)
More information about the distro-pkg-dev
mailing list