/hg/icedtea6: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Dec 29 22:02:43 UTC 2016
changeset 31cd20a94f67 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=31cd20a94f67
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Dec 28 22:26:44 2016 +0000
PR3152: Zero build fails with pch disabled
2016-12-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3152: Zero build fails with pch disabled
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* NEWS: Updated.
* patches/openjdk/8078628-pr3152-zero_pch_failure.patch:
Backport patch from b41 to fix Zero build failure when
building without pre-compiled headers.
changeset 92d9535dcc2b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=92d9535dcc2b
author: Mark Wielaard <mark at klomp.org>
date: Fri Mar 16 13:15:15 2012 +0100
PR3174: systemtap: type definition 'symbolOopDesc' not found
jstack: Change symbolOopDesc to Symbol to accomodate S6990754.
Use native memory and reference counting to implement SymbolTable.
2016-12-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3174: systemtap: type definition 'symbolOopDesc' not found
* NEWS: Updated
2012-03-16 Mark Wielaard <mjw at redhat.com>
PR3174: systemtap: type definition 'symbolOopDesc' not found
* tapset/jstack.stp.in: Change symbolOopDesc to Symbol to accomodate
S6990754 - Use native memory and reference counting to implement
SymbolTable.
changeset 88679d322216 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=88679d322216
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Dec 29 02:50:39 2016 +0000
PR3175: invalid zip timestamp handling leads to error updating JAR files
2016-08-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3175: invalid zip timestamp handling leads to
error updating JAR files
* AUTHORS: Add Ricardo Ribalda.
* NEWS: Updated.
2016-08-19 Ricardo Ribalda <ricardo.ribalda at gmail.com>
PR3175: invalid zip timestamp handling leads to
error updating JAR files
* Makefile.am:
(add-pulseaudio): Don't use -u so files are always
overwritten, regardless of timestamps.
(add-pulseaudio-debug): Likewise.
(add-pulseaudio-ecj): Likewise.
changeset f516b928f3a8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f516b928f3a8
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Dec 29 21:59:32 2016 +0000
PR3213: Disable ARM32 JIT by default
2016-12-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3213: Disable ARM32 JIT by default
* Makefile.am:
(ICEDTEA_PATCHES): Add patch.
* patches/pr3213-conditional_arm32jit.patch:
Backport conditionalisation of ARM32 JIT port
from IcedTea 2.x.
2014-02-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3213: Disable ARM32 JIT by default
* INSTALL:
Document ARM32 JIT and --enable-arm32-jit option.
* Makefile.am:
(ARM32JIT_STATUS): Set based on ENABLE_ARM32JIT.
(ICEDTEA_ENV): Pass ARM32JIT to OpenJDK build,
using value of ${ARM32JIT_STATUS}.
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_ARM32JIT): Allow the ARM32 JIT to be
enabled.
* configure.ac: Invoke IT_ENABLE_ARM32JIT macro.
diffstat:
AUTHORS | 1 +
ChangeLog | 63 +++++++++++++++++++
INSTALL | 6 +-
Makefile.am | 19 ++++-
NEWS | 4 +
acinclude.m4 | 22 ++++++
configure.ac | 1 +
patches/openjdk/8078628-pr3152-zero_pch_failure.patch | 49 ++++++++++++++
patches/pr3213-conditional_arm32jit.patch | 29 ++++++++
tapset/jstack.stp.in | 18 ++--
10 files changed, 196 insertions(+), 16 deletions(-)
diffs (361 lines):
diff -r 4034994bef71 -r f516b928f3a8 AUTHORS
--- a/AUTHORS Fri Dec 23 18:52:53 2016 +0000
+++ b/AUTHORS Thu Dec 29 21:59:32 2016 +0000
@@ -36,6 +36,7 @@
Parag Nemade <pnemade at redhat.com>
Xerxes RÃ¥nby <xerxes at zafena.se>
Mark Reinhold <mr at sun.com>
+Ricardo Ribalda <ricardo.ribalda at gmail.com>
Bernhard Rosenkränzer <bero at arklinux.org>
Marc Schoenefeld <mschoene at redhat.com>
Andreas Schwab <schwab at suse.cz>
diff -r 4034994bef71 -r f516b928f3a8 ChangeLog
--- a/ChangeLog Fri Dec 23 18:52:53 2016 +0000
+++ b/ChangeLog Thu Dec 29 21:59:32 2016 +0000
@@ -1,3 +1,66 @@
+2016-12-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3213: Disable ARM32 JIT by default
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add patch.
+ * patches/pr3213-conditional_arm32jit.patch:
+ Backport conditionalisation of ARM32 JIT port
+ from IcedTea 2.x.
+
+2014-02-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3213: Disable ARM32 JIT by default
+ * INSTALL:
+ Document ARM32 JIT and --enable-arm32-jit option.
+ * Makefile.am:
+ (ARM32JIT_STATUS): Set based on ENABLE_ARM32JIT.
+ (ICEDTEA_ENV): Pass ARM32JIT to OpenJDK build,
+ using value of ${ARM32JIT_STATUS}.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_ENABLE_ARM32JIT): Allow the ARM32 JIT to be
+ enabled.
+ * configure.ac: Invoke IT_ENABLE_ARM32JIT macro.
+
+2016-08-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3175: invalid zip timestamp handling leads to
+ error updating JAR files
+ * AUTHORS: Add Ricardo Ribalda.
+ * NEWS: Updated.
+
+2016-08-19 Ricardo Ribalda <ricardo.ribalda at gmail.com>
+
+ PR3175: invalid zip timestamp handling leads to
+ error updating JAR files
+ * Makefile.am:
+ (add-pulseaudio): Don't use -u so files are always
+ overwritten, regardless of timestamps.
+ (add-pulseaudio-debug): Likewise.
+ (add-pulseaudio-ecj): Likewise.
+
+2016-12-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3174: systemtap: type definition 'symbolOopDesc' not found
+ * NEWS: Updated
+
+2012-03-16 Mark Wielaard <mjw at redhat.com>
+
+ PR3174: systemtap: type definition 'symbolOopDesc' not found
+ * tapset/jstack.stp.in: Change symbolOopDesc to Symbol to accomodate
+ S6990754 - Use native memory and reference counting to implement
+ SymbolTable.
+
+2016-12-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3152: Zero build fails with pch disabled
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * NEWS: Updated.
+ * patches/openjdk/8078628-pr3152-zero_pch_failure.patch:
+ Backport patch from b41 to fix Zero build failure when
+ building without pre-compiled headers.
+
2016-12-23 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3205: Builds fails with pch disabled
diff -r 4034994bef71 -r f516b928f3a8 INSTALL
--- a/INSTALL Fri Dec 23 18:52:53 2016 +0000
+++ b/INSTALL Thu Dec 29 21:59:32 2016 +0000
@@ -175,6 +175,7 @@
* --enable-system-kerberos: Link against the system Kerberos library and
query it at runtime to obtain the cache location, rather than using a
hardcoded value.
+* --enable-arm32-jit: Build the ARM32 JIT.
* --disable-precompiled-headers: Don't use pre-compiled headers.
Testing
@@ -278,8 +279,9 @@
--enable-shark to configure. Please note that Shark is still in
development and builds are still likely to fail at present.
-On ARM32, there is also a native JIT port built on top of Zero, which
-is built on this platform by default.
+On ARM32, there is also a native JIT port built on top of Zero. This
+currently has issues (see PR3196) and is thus not enabled by
+default. To enable it, pass --enable-arm32-jit to configure.
Support for Different Versions of HotSpot
=========================================
diff -r 4034994bef71 -r f516b928f3a8 Makefile.am
--- a/Makefile.am Fri Dec 23 18:52:53 2016 +0000
+++ b/Makefile.am Thu Dec 29 21:59:32 2016 +0000
@@ -642,7 +642,9 @@
patches/openjdk/6260348-pr3068.patch \
patches/openjdk/6961123-pr2975.patch \
patches/pr2800-missing_resources.patch \
- patches/openjdk/8169448-pr3205-pch_failure.patch
+ patches/openjdk/8169448-pr3205-pch_failure.patch \
+ patches/openjdk/8078628-pr3152-zero_pch_failure.patch \
+ patches/pr3213-conditional_arm32jit.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -804,6 +806,12 @@
WERROR_STATUS=false
endif
+if ENABLE_ARM32JIT
+ARM32JIT_STATUS=true
+else
+ARM32JIT_STATUS=false
+endif
+
ICEDTEA_UNSET = \
JAVAC= \
JAVA_HOME= \
@@ -849,7 +857,8 @@
CC=$(CC)$(GCC_SUFFIX) \
CXX=$(CXX)$(GCC_SUFFIX) \
COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \
- UNLIMITED_CRYPTO="true"
+ UNLIMITED_CRYPTO="true" \
+ ARM32JIT="${ARM32JIT_STATUS}"
if ENABLE_CACAO
ICEDTEA_ENV += \
@@ -1881,7 +1890,7 @@
cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
$(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
- $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+ $(ZIP) -qr $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
endif
touch $@
@@ -1904,7 +1913,7 @@
cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
$(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
- $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+ $(ZIP) -qr $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
endif
touch $@
@@ -2229,7 +2238,7 @@
cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
$(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
- $(ZIP) -qur $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+ $(ZIP) -qr $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
endif
touch $@
diff -r 4034994bef71 -r f516b928f3a8 NEWS
--- a/NEWS Fri Dec 23 18:52:53 2016 +0000
+++ b/NEWS Thu Dec 29 21:59:32 2016 +0000
@@ -34,7 +34,11 @@
- PR2957: Build bootstrap code (rt-class-files.stamp) using bootstrap flags (source/target 1.5)
- PR3139: Update documentation
- PR3143: Fix typo in --with-openjdk-src-dir introduced by PR3139
+ - PR3152: Zero build fails with pch disabled
+ - PR3174: systemtap: type definition 'symbolOopDesc' not found
+ - PR3175: invalid zip timestamp handling leads to error updating JAR files
- PR3205: Builds fails with pch disabled
+ - PR3213: Disable ARM32 JIT by default
New in release 1.13.12 (2016-08-24):
diff -r 4034994bef71 -r f516b928f3a8 acinclude.m4
--- a/acinclude.m4 Fri Dec 23 18:52:53 2016 +0000
+++ b/acinclude.m4 Thu Dec 29 21:59:32 2016 +0000
@@ -2182,6 +2182,28 @@
AM_CONDITIONAL([VM_SUPPORTS_XBOOTCLASSPATH], test x"${it_cv_xbootclasspath_works}" = "xyes")
])
+AC_DEFUN([IT_ENABLE_ARM32JIT],
+[
+ 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]])],
+ [
+ case "${enableval}" in
+ yes)
+ enable_arm32jit=yes
+ ;;
+ *)
+ enable_arm32jit=no
+ ;;
+ esac
+ ],
+ [
+ enable_arm32jit=no
+ ])
+ AC_MSG_RESULT([$enable_arm32jit])
+ AM_CONDITIONAL([ENABLE_ARM32JIT], test x"${enable_arm32jit}" = "xyes")
+])
+
AC_DEFUN_ONCE([IT_HAS_PAX],
[
AC_MSG_CHECKING([if a PaX kernel is in use])
diff -r 4034994bef71 -r f516b928f3a8 configure.ac
--- a/configure.ac Fri Dec 23 18:52:53 2016 +0000
+++ b/configure.ac Thu Dec 29 21:59:32 2016 +0000
@@ -302,6 +302,7 @@
IT_SET_SHARK_BUILD
IT_ENABLE_ZERO_BUILD
IT_CHECK_ADDITIONAL_VMS
+IT_ENABLE_ARM32JIT
IT_ENABLE_NON_NSS_CURVES
IT_ENABLE_HG
IT_WITH_HG_REVISION
diff -r 4034994bef71 -r f516b928f3a8 patches/openjdk/8078628-pr3152-zero_pch_failure.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/8078628-pr3152-zero_pch_failure.patch Thu Dec 29 21:59:32 2016 +0000
@@ -0,0 +1,49 @@
+# HG changeset patch
+# User andrew
+# Date 1482709933 0
+# Sun Dec 25 23:52:13 2016 +0000
+# Node ID 1ae05a34e052d1672b4a7894ddf5fc2f662eb861
+# Parent 598f4f521889aadf7abccaf0634e9cd0d8b75599
+8078628: Zero build fails with pre-compiled headers disabled
+Summary: Add missing includes to make Zero builds without pre-compiled headers work
+Reviewed-by: omajid
+
+diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/entry_zero.hpp openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp
+--- openjdk.orig/hotspot/src/cpu/zero/vm/entry_zero.hpp 2016-08-22 15:02:02.000000000 +0100
++++ openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp 2016-12-26 02:36:46.775167402 +0000
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2008, 2009, 2010 Red Hat, Inc.
++ * Copyright 2016 Red Hat, Inc.
+ * 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 +26,8 @@
+ #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP
+ #define CPU_ZERO_VM_ENTRY_ZERO_HPP
+
++#include "interpreter/cppInterpreter.hpp"
++
+ class ZeroEntry {
+ public:
+ ZeroEntry() {
+diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp
+--- openjdk.orig/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp 2016-08-22 15:02:03.000000000 +0100
++++ openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp 2016-12-26 02:36:46.775167402 +0000
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2008 Red Hat, Inc.
++ * Copyright 2016 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -25,6 +25,7 @@
+
+ #include "precompiled.hpp"
+ #include "assembler_zero.inline.hpp"
++#include "entry_zero.hpp"
+ #include "memory/resourceArea.hpp"
+ #include "nativeInst_zero.hpp"
+ #include "oops/oop.inline.hpp"
diff -r 4034994bef71 -r f516b928f3a8 patches/pr3213-conditional_arm32jit.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr3213-conditional_arm32jit.patch Thu Dec 29 21:59:32 2016 +0000
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User chrisphi
+# Date 1392756328 0
+# Tue Feb 18 20:45:28 2014 +0000
+# Node ID 0a9100ca5a41c8430aa9a51ef2ca5dd4d6f38322
+# Parent c9da84d02a614d10d2118d7725b58b42b02fbbc3
+ARM32 assembler update for hsx24. Use ARM32JIT to turn it on/off.
+
+diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make
+--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
++++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
+@@ -26,7 +26,8 @@
+ # Setup common to Zero (non-Shark) and Shark versions of VM
+
+ ifeq ($(ZERO_LIBARCH),arm)
+-
++# check to see if we are building the assembler jit or just zero.
++ifeq ($(ARM32JIT),true)
+ Obj_Files += asm_helper.o
+ Obj_Files += cppInterpreter_arm.o
+ Obj_Files += thumb2.o
+@@ -54,6 +55,7 @@
+ $(CXX_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE)
+
+ endif
++endif
+
+ %.o: %.S
+ @echo Assembling $<
diff -r 4034994bef71 -r f516b928f3a8 tapset/jstack.stp.in
--- a/tapset/jstack.stp.in Fri Dec 23 18:52:53 2016 +0000
+++ b/tapset/jstack.stp.in Thu Dec 29 21:59:32 2016 +0000
@@ -412,7 +412,7 @@
// that describe the method and signature. This constant pool
// contains symbolic information that describe the properties
// of the class. The indexes for methods and signaturates in
- // the constant pool are symbolOopDescs that contain utf8
+ // the constant pool are Symbols that contain utf8
// strings (plus lenghts). (We could also sanity check that
// the tag value is correct [CONSTANT_String = 8]).
// Note that the class name uses '/' instead of '.' as
@@ -427,17 +427,17 @@
"@ABS_SERVER_LIBJVM_SO@")->_pool_holder;
klassSymbol = @cast(klassPtr + oopDesc_size, "Klass",
"@ABS_SERVER_LIBJVM_SO@")->_name;
- klassName = &@cast(klassSymbol, "symbolOopDesc",
+ klassName = &@cast(klassSymbol, "Symbol",
"@ABS_SERVER_LIBJVM_SO@")->_body[0];
- klassLength = @cast(klassSymbol, "symbolOopDesc",
+ klassLength = @cast(klassSymbol, "Symbol",
"@ABS_SERVER_LIBJVM_SO@")->_length;
methodIndex = @cast(methodOopPtr, "methodOopDesc",
"@ABS_SERVER_LIBJVM_SO@")->_constMethod->_name_index;
- methodOopDesc = user_long(constantPoolOop_base + (methodIndex * ptr_size));
- methodName = &@cast(methodOopDesc, "symbolOopDesc",
+ methodOopDesc = user_long(constantPoolOop_base + (methodIndex * ptr_size)) - 1;
+ methodName = &@cast(methodOopDesc, "Symbol",
"@ABS_SERVER_LIBJVM_SO@")->_body[0];
- methodLength = @cast(methodOopDesc, "symbolOopDesc",
+ methodLength = @cast(methodOopDesc, "Symbol",
"@ABS_SERVER_LIBJVM_SO@")->_length;
if (log_sig)
@@ -445,10 +445,10 @@
sigIndex = @cast(methodOopPtr, "methodOopDesc",
"@ABS_SERVER_LIBJVM_SO@")->_constMethod->_signature_index;
sigOopDesc = user_long(constantPoolOop_base
- + (sigIndex * ptr_size));
- sigName = &@cast(sigOopDesc, "symbolOopDesc",
+ + (sigIndex * ptr_size)) - 1;
+ sigName = &@cast(sigOopDesc, "Symbol",
"@ABS_SERVER_LIBJVM_SO@")->_body[0];
- sigLength = @cast(sigOopDesc, "symbolOopDesc",
+ sigLength = @cast(sigOopDesc, "Symbol",
"@ABS_SERVER_LIBJVM_SO@")->_length;
sig = user_string_n(sigName, sigLength);
}
More information about the distro-pkg-dev
mailing list