------------------------------------------------------------ revno: 745 committer: Matthias Klose <[email protected]> branch nick: openjdk8 timestamp: Fri 2019-06-07 09:36:26 +0200 message: openjdk-8 (8u222-b04-3) experimental; urgency=medium * Update ARM32 to jdk8u222-b04-aarch32-190603. * Regenerate the ppc64el patch. * Remove unused patches ppc64le-8036767 and zero-opt. removed: debian/patches/ppc64le-8036767.diff debian/patches/zero-opt.diff modified: debian/changelog debian/rules hotspot-aarch32.tar.xz
-- lp:~openjdk/openjdk/openjdk8 https://code.launchpad.net/~openjdk/openjdk/openjdk8 Your team Debian Java Maintainers is subscribed to branch lp:~openjdk/openjdk/openjdk8. To unsubscribe from this branch go to https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== modified file 'debian/changelog' --- debian/changelog 2019-06-06 17:47:33 +0000 +++ debian/changelog 2019-06-07 07:36:26 +0000 @@ -1,8 +1,10 @@ -openjdk-8 (8u222-b04-2) experimental; urgency=medium +openjdk-8 (8u222-b04-3) experimental; urgency=medium + * Update ARM32 to jdk8u222-b04-aarch32-190603. * Regenerate the ppc64el patch. + * Remove unused patches ppc64le-8036767 and zero-opt. - -- Matthias Klose <[email protected]> Thu, 06 Jun 2019 19:34:58 +0200 + -- Matthias Klose <[email protected]> Fri, 07 Jun 2019 09:14:38 +0200 openjdk-8 (8u222-b04-1) experimental; urgency=medium === removed file 'debian/patches/ppc64le-8036767.diff' --- debian/patches/ppc64le-8036767.diff 2019-03-17 17:24:49 +0000 +++ debian/patches/ppc64le-8036767.diff 1970-01-01 00:00:00 +0000 @@ -1,114 +0,0 @@ -# DP: Common bits to configure ppc64le support. - ---- a/common/autoconf/hotspot-spec.gmk.in -+++ b/common/autoconf/hotspot-spec.gmk.in -@@ -71,6 +71,10 @@ ISA_DIR=$(OPENJDK_TARGET_CPU_ISADIR) - LIBARCH=$(OPENJDK_TARGET_CPU_LEGACY_LIB) - # Set the cpu architecture - ARCH=$(OPENJDK_TARGET_CPU_ARCH) -+# ppc64le uses the HotSpot ppc64 build -+ifeq ($(OPENJDK_TARGET_CPU), ppc64le) -+ ARCH=ppc64 -+endif - # Legacy setting for building for a 64 bit machine. - # If yes then this expands to _LP64:=1 - @LP64@ ---- a/common/autoconf/platform.m4 -+++ b/common/autoconf/platform.m4 -@@ -122,7 +122,7 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU - VAR_CPU_ENDIAN=big - ;; - powerpc64le) -- VAR_CPU=ppc64 -+ VAR_CPU=ppc64le - VAR_CPU_ARCH=ppc - VAR_CPU_BITS=64 - VAR_CPU_ENDIAN=little ---- a/common/autoconf/toolchain.m4 -+++ b/common/autoconf/toolchain.m4 -@@ -1125,6 +1125,9 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_ - else - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN" - fi -+ if test "x$OPENJDK_TARGET_CPU" = xppc64le; then -+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2" -+ fi - if test "x$OPENJDK_TARGET_OS" = xlinux; then - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX" - fi ---- a/jdk/make/lib/SoundLibraries.gmk -+++ b/jdk/make/lib/SoundLibraries.gmk -@@ -143,6 +143,10 @@ else - ifeq ($(OPENJDK_TARGET_CPU), aarch64) - LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64 - endif -+ -+ ifeq ($(OPENJDK_TARGET_CPU), ppc64le) -+ LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64LE -+ endif - endif - - LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"' ---- a/jdk/src/share/native/com/sun/media/sound/SoundDefs.h -+++ b/jdk/src/share/native/com/sun/media/sound/SoundDefs.h -@@ -44,6 +44,8 @@ - #define X_ARM 7 - #define X_PPC 8 - #define X_AARCH64 9 -+#define X_PPC64 10 -+#define X_PPC64LE 11 - - // ********************************** - // Make sure you set X_PLATFORM and X_ARCH defines correctly. ---- /dev/null -+++ b/jdk/src/solaris/bin/ppc64le/jvm.cfg -@@ -0,0 +1,33 @@ -+# Copyright (c) 2011, 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 -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+# List of JVMs that can be used as an option to java, javac, etc. -+# Order is important -- first in this list is the default JVM. -+# NOTE that this both this file and its format are UNSUPPORTED and -+# WILL GO AWAY in a future release. -+# -+# You may also select a JVM in an arbitrary location with the -+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported -+# and may not be available in a future release. -+# -+-server KNOWN ---- a/hotspot/make/defs.make -+++ b/hotspot/make/defs.make -@@ -326,6 +326,13 @@ ifneq ($(OSNAME),windows) - LIBARCH/ppc64 = ppc64 - LIBARCH/zero = $(ZERO_LIBARCH) - -+ # Override LIBARCH for ppc64le -+ ifeq ($(ARCH), ppc64) -+ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN), little) -+ LIBARCH = ppc64le -+ endif -+ endif -+ - LP64_ARCH += sparcv9 amd64 ia64 ppc64 zero - endif - === removed file 'debian/patches/zero-opt.diff' --- debian/patches/zero-opt.diff 2014-07-07 15:53:29 +0000 +++ debian/patches/zero-opt.diff 1970-01-01 00:00:00 +0000 @@ -1,16 +0,0 @@ -# DP: Build zero with -O2 -finline-functions instead of -O3 (still needed?) ---- openjdk/hotspot/make/linux/makefiles/gcc.make~ 2013-04-15 13:44:59.703968963 +0200 -+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2013-04-15 16:22:04.124240511 +0200 -@@ -170,7 +170,11 @@ - CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) - - # The flags to use for an Optimized g++ build --OPT_CFLAGS += -O3 -+ifeq ($(ZERO_BUILD), true) -+ OPT_CFLAGS += -O2 -finline-functions -+else -+ OPT_CFLAGS += -O3 -+endif - - # Hotspot uses very unstrict aliasing turn this optimization off - OPT_CFLAGS += -fno-strict-aliasing === modified file 'debian/rules' --- debian/rules 2019-06-06 17:47:33 +0000 +++ debian/rules 2019-06-07 07:36:26 +0000 @@ -130,6 +130,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), armel)) with_check = disabled running check on $(DEB_HOST_ARCH) endif +with_check = disabled for this build with_docs = $(if $(findstring nodoc, $(DEB_BUILD_OPTIONS)),,yes) ifneq (,$(findstring shark, $(PKGSOURCE))) @@ -313,9 +314,6 @@ export USE_PRECOMPILED_HEADER endif -# $(if $(filter $(DEB_HOST_ARCH),$(hotspot_aarch64_archs)),8132051-zero.diff) \ -# FIXME: 8132051-zero.diff doesn't apply for the default hotspot tarball, -# resulting in broken zero builds COMMON_PATCHES = \ autoconf-select.diff \ hotspot-warn-no-errformat.diff \ @@ -359,11 +357,6 @@ jdk-java-nio-bits-unligned-aarch64.diff \ hotspot-ia64.diff \ -ifeq (,$(filter $(DEB_HOST_ARCH),$(hotspot_aarch64_archs) $(hotspot_aarch32_archs))) - COMMON_PATCHES += \ - 8221355.diff -endif - # FIXME: # dont-strip-images.diff \ # 8141491.diff \ @@ -394,8 +387,6 @@ ifeq (,$(filter $(DEB_HOST_ARCH),$(hotspot_aarch64_archs) $(hotspot_aarch32_archs))) COMMON_PATCHES += \ zero-sh.diff -# FIXME zero-opt.diff -# FIXME ppc64le-8036767.diff endif # FIXME: needs an update @@ -1997,7 +1988,7 @@ hg_tag_aarch64 = aarch64-shenandoah-jdk8u222-b04 hg_url_aarch64 = http://hg.openjdk.java.net/aarch64-port/$(hg_project_aarch64) hg_project_aarch32 = jdk8u -hg_tag_aarch32 = jdk8u212-b04-aarch32-190430 +hg_tag_aarch32 = jdk8u222-b04-aarch32-190603 hg_url_aarch32 = http://hg.openjdk.java.net/aarch32-port/$(hg_project_aarch32) origdir = ../openjdk-8-$(package_version).orig source_date := $(shell dpkg-parsechangelog | sed -n '/^Date: /{s///p;q;}') === modified file 'hotspot-aarch32.tar.xz' Binary files hotspot-aarch32.tar.xz 2019-06-06 17:47:33 +0000 and hotspot-aarch32.tar.xz 2019-06-07 07:36:26 +0000 differ
__ This is the maintainer address of Debian's Java team <https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-maintainers>. Please use [email protected] for discussions and questions.
