------------------------------------------------------------ revno: 736 committer: Matthias Klose <[email protected]> branch nick: openjdk8 timestamp: Mon 2019-03-18 22:38:41 +0100 message: * Update to 8u212-b01. * Enable SA on AArch64. removed: debian/patches/jdk-8132985-backport-double-free.patch debian/patches/jdk-8139803-backport-warning.patch added: debian/patches/enable-sa-on-aarch64.diff modified: corba.tar.xz debian/changelog debian/patches/hotspot-disable-exec-shield-workaround.patch debian/patches/libjpeg-fix.diff debian/patches/link-with-as-needed.diff debian/patches/ppc64el.diff debian/patches/system-lcms.diff debian/patches/system-libjpeg.diff debian/patches/system-libpng.diff debian/patches/system-pcsclite.diff debian/patches/workaround_expand_exec_shield_cs_limit.diff debian/patches/zero-sh.diff debian/patches/zero-x32.diff debian/rules hotspot-aarch32.tar.xz hotspot-aarch64.tar.xz hotspot.tar.xz jaxp.tar.xz jaxws.tar.xz jdk.tar.xz langtools.tar.xz nashorn.tar.xz root.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 'corba.tar.xz' Binary files corba.tar.xz 2019-03-17 17:24:49 +0000 and corba.tar.xz 2019-03-18 21:38:41 +0000 differ === modified file 'debian/changelog' --- debian/changelog 2019-03-18 14:08:49 +0000 +++ debian/changelog 2019-03-18 21:38:41 +0000 @@ -1,3 +1,10 @@ +openjdk-8 (8u212-b01-1) UNRELEASED; urgency=medium + + * Update to 8u212-b01. + * Enable SA on AArch64. + + -- Matthias Klose <[email protected]> Mon, 18 Mar 2019 22:37:19 +0100 + openjdk-8 (8u202-b26-3) unstable; urgency=medium * Fix the 8u202 merge for aarch32, not using SA. === added file 'debian/patches/enable-sa-on-aarch64.diff' --- debian/patches/enable-sa-on-aarch64.diff 1970-01-01 00:00:00 +0000 +++ debian/patches/enable-sa-on-aarch64.diff 2019-03-18 21:38:41 +0000 @@ -0,0 +1,24 @@ +--- a/common/autoconf/generated-configure.sh ++++ b/common/autoconf/generated-configure.sh +@@ -14779,9 +14779,6 @@ $as_echo "$with_jvm_variants" >&6; } + if test "x$VAR_CPU" = xppc64 -o "x$VAR_CPU" = xppc64le ; then + INCLUDE_SA=false + fi +- if test "x$OPENJDK_TARGET_CPU" = xaarch64; then +- INCLUDE_SA=false +- fi + + + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then +--- a/common/autoconf/jdk-options.m4 ++++ b/common/autoconf/jdk-options.m4 +@@ -161,9 +161,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS + if test "x$VAR_CPU" = xppc64 -o "x$VAR_CPU" = xppc64le ; then + INCLUDE_SA=false + fi +- if test "x$OPENJDK_TARGET_CPU" = xaarch64; then +- INCLUDE_SA=false +- fi + AC_SUBST(INCLUDE_SA) + + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then === modified file 'debian/patches/hotspot-disable-exec-shield-workaround.patch' --- debian/patches/hotspot-disable-exec-shield-workaround.patch 2019-03-17 17:34:59 +0000 +++ debian/patches/hotspot-disable-exec-shield-workaround.patch 2019-03-18 21:38:41 +0000 @@ -11,5 +11,5 @@ -#if defined(IA32) && !defined(ZERO) +#if 0 size_t page_size = os::vm_page_size(); + /* - * Take the highest VA the OS will give us and exec === removed file 'debian/patches/jdk-8132985-backport-double-free.patch' --- debian/patches/jdk-8132985-backport-double-free.patch 2019-03-17 17:34:59 +0000 +++ debian/patches/jdk-8132985-backport-double-free.patch 1970-01-01 00:00:00 +0000 @@ -1,151 +0,0 @@ - -# HG changeset patch -# User psadhukhan -# Date 1444048603 -10800 -# Node ID 9b0e9d8ccccf47b47add56dbdbd4a27cd2452af7 -# Parent b5125fa7ef4b687b959ed353c8ff47d6eead9fe3 -8132985: Crash in freetypescaler.c due to double free -Reviewed-by: prr, simonis - ---- a/jdk/src/share/native/sun/font/freetypeScaler.c -+++ b/jdk/src/share/native/sun/font/freetypeScaler.c -@@ -60,6 +60,7 @@ typedef struct { - JNIEnv* env; - FT_Library library; - FT_Face face; -+ FT_Stream faceStream; - jobject font2D; - jobject directBuffer; - -@@ -107,16 +108,10 @@ static void freeNativeResources(JNIEnv * - if (scalerInfo == NULL) - return; - -- //apparently Done_Face will only close the stream -- // but will not relase the memory of stream structure. -- // We need to free it explicitly to avoid leak. -- //Direct access to the stream field might be not ideal solution as -- // it is considred to be "private". -- //Alternatively we could have stored pointer to the structure -- // in the scalerInfo but this will increase size of the structure -- // for no good reason -- stream = scalerInfo->face->stream; -- -+ // FT_Done_Face always closes the stream, but only frees the memory -+ // of the data structure if it was internally allocated by FT. -+ // We hold on to a pointer to the stream structure if we provide it -+ // ourselves, so that we can free it here. - FT_Done_Face(scalerInfo->face); - FT_Done_FreeType(scalerInfo->library); - -@@ -128,10 +123,9 @@ static void freeNativeResources(JNIEnv * - free(scalerInfo->fontData); - } - -- if (stream != NULL) { -- free(stream); -- } -- -+ if (scalerInfo->faceStream != NULL) { -+ free(scalerInfo->faceStream); -+ } - free(scalerInfo); - } - -@@ -302,6 +296,9 @@ Java_sun_font_FreetypeFontScaler_initNat - &ft_open_args, - indexInCollection, - &scalerInfo->face); -+ if (!error) { -+ scalerInfo->faceStream = ftstream; -+ } - } - if (error || scalerInfo->directBuffer == NULL) { - free(ftstream); ---- /dev/null -+++ b/jdk/test/java/awt/FontClass/FontDisposer/FontDisposeTest.java -@@ -0,0 +1,84 @@ -+/* -+ * Copyright (c) 2015, 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. -+ * -+ * 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. -+ */ -+import java.awt.Font; -+import java.awt.Graphics2D; -+import java.awt.font.FontRenderContext; -+import java.awt.image.BufferedImage; -+import java.io.FileInputStream; -+import java.io.ByteArrayInputStream; -+import java.io.InputStream; -+import java.lang.reflect.Field; -+import java.lang.reflect.Method; -+ -+import sun.font.Font2DHandle; -+import sun.font.Font2D; -+import sun.font.FontScaler; -+import sun.font.Type1Font; -+ -+/** -+ * @bug 8132985 -+ * @summary Tests to verify Type1 Font scaler dispose crashes -+ * @modules java.desktop/sun.font -+ */ -+public class FontDisposeTest -+{ -+ public static void main(String[] args) throws Exception -+ { -+ // The bug only happens with Type 1 fonts. The Ghostscript font files -+ // should be commonly available. From distro pacakge or -+ // ftp://ftp.gnu.org/gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz -+ // Pass pfa/pfb font file as argument -+ String path = args[0]; -+ -+ // Load -+ InputStream stream = new FileInputStream(path); -+ Font font = Font.createFont(Font.TYPE1_FONT,stream); -+ -+ // Ensure native bits have been generated -+ BufferedImage img = new BufferedImage(100,100, -+ BufferedImage.TYPE_INT_ARGB); -+ Graphics2D g2d = img.createGraphics(); -+ FontRenderContext frc = g2d.getFontRenderContext(); -+ -+ font.getLineMetrics("derp",frc); -+ -+ // Force disposal - -+ // System.gc() is not sufficient. -+ Field font2DHandleField = Font.class.getDeclaredField("font2DHandle"); -+ font2DHandleField.setAccessible(true); -+ sun.font.Font2DHandle font2DHandle = -+ (sun.font.Font2DHandle)font2DHandleField.get(font); -+ -+ sun.font.Font2D font2D = font2DHandle.font2D; -+ sun.font.Type1Font type1Font = (sun.font.Type1Font)font2D; -+ -+ Method getScalerMethod = -+ sun.font.Type1Font.class.getDeclaredMethod("getScaler"); -+ getScalerMethod.setAccessible(true); -+ sun.font.FontScaler scaler = -+ (sun.font.FontScaler)getScalerMethod.invoke(type1Font); -+ -+ // dispose should not crash due to double free -+ scaler.dispose(); -+ } -+} === removed file 'debian/patches/jdk-8139803-backport-warning.patch' --- debian/patches/jdk-8139803-backport-warning.patch 2019-03-17 17:34:59 +0000 +++ debian/patches/jdk-8139803-backport-warning.patch 1970-01-01 00:00:00 +0000 @@ -1,19 +0,0 @@ - -# HG changeset patch -# User psadhukhan -# Date 1445944584 -10800 -# Node ID dfeaf40df80032570558c031f37f6630dc729e3f -# Parent 8e4b93a5a036bec10caeed3c1063b63e5ca571b1 -8139803: Fix for 8132985 breaks OpenJDK build on windows. -Reviewed-by: serb, simonis - ---- a/jdk/src/share/native/sun/font/freetypeScaler.c -+++ b/jdk/src/share/native/sun/font/freetypeScaler.c -@@ -103,7 +103,6 @@ Java_sun_font_FreetypeFontScaler_initIDs - } - - static void freeNativeResources(JNIEnv *env, FTScalerInfo* scalerInfo) { -- void *stream; - - if (scalerInfo == NULL) - return; === modified file 'debian/patches/libjpeg-fix.diff' --- debian/patches/libjpeg-fix.diff 2019-03-17 17:34:59 +0000 +++ debian/patches/libjpeg-fix.diff 2019-03-18 21:38:41 +0000 @@ -2,7 +2,7 @@ --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk -@@ -730,7 +730,7 @@ endif +@@ -731,7 +731,7 @@ endif ifeq ($(USE_EXTERNAL_LIBJPEG), true) LIBJPEG_LIBS := -ljpeg BUILD_LIBJAVAJPEG_INCLUDE_FILES := \ === modified file 'debian/patches/link-with-as-needed.diff' --- debian/patches/link-with-as-needed.diff 2019-03-17 17:34:59 +0000 +++ debian/patches/link-with-as-needed.diff 2019-03-18 21:38:41 +0000 @@ -2,7 +2,7 @@ --- a/jdk/make/CompileLaunchers.gmk +++ b/jdk/make/CompileLaunchers.gmk -@@ -427,7 +427,7 @@ endif +@@ -437,7 +437,7 @@ endif # binary (at least on linux) which causes the size to differ between old and new build. ifeq ($(USE_EXTERNAL_LIBZ), true) UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB @@ -11,7 +11,7 @@ else UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \ -@@ -483,9 +483,9 @@ $(eval $(call SetupNativeCompilation,BUI +@@ -493,9 +493,9 @@ $(eval $(call SetupNativeCompilation,BUI LDFLAGS_posix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -25,7 +25,7 @@ PROGRAM := unpack200, \ --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk -@@ -751,10 +751,10 @@ $(eval $(call SetupNativeCompilation,BUI +@@ -752,10 +752,10 @@ $(eval $(call SetupNativeCompilation,BUI $(BUILD_LIBJAVAJPEG_CLOSED_INCLUDES) \ $(BUILD_LIBJAVAJPEG_HEADERS), \ MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \ === modified file 'debian/patches/ppc64el.diff' --- debian/patches/ppc64el.diff 2019-03-17 17:34:59 +0000 +++ debian/patches/ppc64el.diff 2019-03-18 21:38:41 +0000 @@ -18,7 +18,7 @@ define_pd_global(uintx, JVMInvokeMethodSlack, 8192); --- a/hotspot/src/os/linux/vm/os_linux.cpp +++ b/hotspot/src/os/linux/vm/os_linux.cpp -@@ -5042,6 +5042,7 @@ void os::init(void) { +@@ -5046,6 +5046,7 @@ void os::init(void) { pthread_mutex_init(&dl_mutex, NULL); @@ -26,7 +26,7 @@ // If the pagesize of the VM is greater than 8K determine the appropriate // number of initial guard pages. The user can change this with the // command line arguments, if needed. -@@ -5050,6 +5051,7 @@ void os::init(void) { +@@ -5054,6 +5055,7 @@ void os::init(void) { StackRedPages = 1; StackShadowPages = round_to((StackShadowPages*Linux::vm_default_page_size()), vm_page_size()) / vm_page_size(); } @@ -34,7 +34,7 @@ } // To install functions for atexit system call -@@ -5104,9 +5106,16 @@ jint os::init_2(void) +@@ -5108,9 +5110,16 @@ jint os::init_2(void) // size. Add a page for compiler2 recursion in main thread. // Add in 2*BytesPerWord times page size to account for VM stack during // class initialization depending on 32 or 64 bit VM. === modified file 'debian/patches/system-lcms.diff' --- debian/patches/system-lcms.diff 2019-03-17 17:34:59 +0000 +++ debian/patches/system-lcms.diff 2019-03-18 21:38:41 +0000 @@ -2,7 +2,7 @@ --- a/common/autoconf/libraries.m4 +++ b/common/autoconf/libraries.m4 -@@ -782,6 +782,46 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], +@@ -845,6 +845,46 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], ############################################################################### # @@ -51,7 +51,7 @@ --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk -@@ -658,8 +658,8 @@ endif +@@ -659,8 +659,8 @@ endif ########################################################################################## # TODO: Update awt lib path when awt is converted @@ -62,7 +62,7 @@ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \ LANG := C, \ -@@ -678,19 +678,19 @@ $(eval $(call SetupNativeCompilation,BUI +@@ -679,19 +679,19 @@ $(eval $(call SetupNativeCompilation,BUI LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \ LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \ LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \ === modified file 'debian/patches/system-libjpeg.diff' --- debian/patches/system-libjpeg.diff 2019-03-17 17:34:59 +0000 +++ debian/patches/system-libjpeg.diff 2019-03-18 21:38:41 +0000 @@ -4,7 +4,7 @@ --- a/common/autoconf/libraries.m4 +++ b/common/autoconf/libraries.m4 -@@ -711,11 +711,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], +@@ -774,11 +774,36 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], # Check for the jpeg library # @@ -48,7 +48,7 @@ ############################################################################### --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk -@@ -694,21 +694,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT) +@@ -695,21 +695,24 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT) ########################################################################################## @@ -79,7 +79,7 @@ # Suppress gcc warnings like "variable might be clobbered by 'longjmp' # or 'vfork'": this warning indicates that some variable is placed to # a register by optimized compiler and it's value might be lost on longjmp(). -@@ -720,37 +723,50 @@ endif +@@ -721,37 +724,50 @@ endif # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) # ifeq ($(CC_43_OR_NEWER), 1) @@ -144,7 +144,7 @@ ########################################################################################## -@@ -1140,6 +1156,13 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1142,6 +1158,13 @@ ifndef BUILD_HEADLESS_ONLY GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib endif @@ -158,7 +158,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen else -@@ -1195,11 +1218,13 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1197,11 +1220,13 @@ ifndef BUILD_HEADLESS_ONLY EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \ LANG := C, \ OPTIMIZATION := LOW, \ === modified file 'debian/patches/system-libpng.diff' --- debian/patches/system-libpng.diff 2019-03-17 17:34:59 +0000 +++ debian/patches/system-libpng.diff 2019-03-18 21:38:41 +0000 @@ -2,7 +2,7 @@ --- a/common/autoconf/libraries.m4 +++ b/common/autoconf/libraries.m4 -@@ -782,6 +782,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], +@@ -845,6 +845,47 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], ############################################################################### # @@ -62,7 +62,7 @@ LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@ --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk -@@ -1146,7 +1146,6 @@ endif +@@ -1148,7 +1148,6 @@ endif ifndef BUILD_HEADLESS_ONLY LIBSPLASHSCREEN_DIRS := \ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \ @@ -70,7 +70,7 @@ $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen ifeq ($(USE_EXTERNAL_LIBGIF), true) -@@ -1163,6 +1162,13 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1165,6 +1164,13 @@ ifndef BUILD_HEADLESS_ONLY LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg endif @@ -84,7 +84,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen else -@@ -1219,12 +1225,12 @@ ifndef BUILD_HEADLESS_ONLY +@@ -1221,12 +1227,12 @@ ifndef BUILD_HEADLESS_ONLY LANG := C, \ OPTIMIZATION := LOW, \ CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ === modified file 'debian/patches/system-pcsclite.diff' --- debian/patches/system-pcsclite.diff 2019-03-17 17:34:59 +0000 +++ debian/patches/system-pcsclite.diff 2019-03-18 21:38:41 +0000 @@ -1,6 +1,6 @@ --- a/common/autoconf/libraries.m4 +++ b/common/autoconf/libraries.m4 -@@ -863,6 +863,53 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], +@@ -926,6 +926,53 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], ############################################################################### # === modified file 'debian/patches/workaround_expand_exec_shield_cs_limit.diff' --- debian/patches/workaround_expand_exec_shield_cs_limit.diff 2019-03-17 17:34:59 +0000 +++ debian/patches/workaround_expand_exec_shield_cs_limit.diff 2019-03-18 21:38:41 +0000 @@ -7,11 +7,11 @@ -#if defined(IA32) +#if defined(IA32) && !defined(ZERO) size_t page_size = os::vm_page_size(); + /* - * Take the highest VA the OS will give us and exec --- a/hotspot/src/os/linux/vm/os_linux.cpp +++ b/hotspot/src/os/linux/vm/os_linux.cpp -@@ -5133,7 +5133,7 @@ ZERO_ONLY ( +@@ -5137,7 +5137,7 @@ ZERO_ONLY ( Linux::capture_initial_stack(JavaThread::stack_size_at_create()); === modified file 'debian/patches/zero-sh.diff' --- debian/patches/zero-sh.diff 2019-03-17 17:34:59 +0000 +++ debian/patches/zero-sh.diff 2019-03-18 21:38:41 +0000 @@ -2,7 +2,7 @@ --- a/hotspot/src/os/linux/vm/os_linux.cpp +++ b/hotspot/src/os/linux/vm/os_linux.cpp -@@ -1966,7 +1966,8 @@ void * os::dll_load(const char *filename +@@ -1970,7 +1970,8 @@ void * os::dll_load(const char *filename {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"}, {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, {EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"}, @@ -12,7 +12,7 @@ }; #if (defined IA32) -@@ -1997,9 +1998,11 @@ void * os::dll_load(const char *filename +@@ -2001,9 +2002,11 @@ void * os::dll_load(const char *filename static Elf32_Half running_arch_code=EM_MIPS; #elif (defined M68K) static Elf32_Half running_arch_code=EM_68K; === modified file 'debian/patches/zero-x32.diff' --- debian/patches/zero-x32.diff 2019-03-17 17:34:59 +0000 +++ debian/patches/zero-x32.diff 2019-03-18 21:38:41 +0000 @@ -2,7 +2,7 @@ --- a/hotspot/src/os/linux/vm/os_linux.cpp +++ b/hotspot/src/os/linux/vm/os_linux.cpp -@@ -1971,7 +1971,7 @@ void * os::dll_load(const char *filename +@@ -1975,7 +1975,7 @@ void * os::dll_load(const char *filename #if (defined IA32) static Elf32_Half running_arch_code=EM_386; === modified file 'debian/rules' --- debian/rules 2019-03-17 22:50:57 +0000 +++ debian/rules 2019-03-18 21:38:41 +0000 @@ -357,8 +357,6 @@ jdk-i18n-pt_BR.diff \ jdk-java-nio-bits-unligned-aarch64.diff \ hotspot-ia64.diff \ - jdk-8132985-backport-double-free.patch \ - jdk-8139803-backport-warning.patch \ # FIXME: # dont-strip-images.diff \ @@ -416,6 +414,9 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(hotspot_aarch32_archs))) COMMON_PATCHES += \ aarch32.diff +else + COMMON_PATCHES += \ + enable-sa-on-aarch64.diff endif ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386)) @@ -1956,7 +1957,7 @@ is_release = is_release = yes hg_project = jdk8u -hg_tag = jdk8u202-b26 +hg_tag = jdk8u212-b01 package_version = $(subst jdk,,$(hg_tag)) ifneq ($(is_release),yes) package_version := $(subst -,~,$(package_version)) === modified file 'hotspot-aarch32.tar.xz' Binary files hotspot-aarch32.tar.xz 2019-03-17 17:24:49 +0000 and hotspot-aarch32.tar.xz 2019-03-18 21:38:41 +0000 differ === modified file 'hotspot-aarch64.tar.xz' Binary files hotspot-aarch64.tar.xz 2019-03-17 17:24:49 +0000 and hotspot-aarch64.tar.xz 2019-03-18 21:38:41 +0000 differ === modified file 'hotspot.tar.xz' Binary files hotspot.tar.xz 2019-03-17 17:24:49 +0000 and hotspot.tar.xz 2019-03-18 21:38:41 +0000 differ === modified file 'jaxp.tar.xz' Binary files jaxp.tar.xz 2019-03-17 17:24:49 +0000 and jaxp.tar.xz 2019-03-18 21:38:41 +0000 differ === modified file 'jaxws.tar.xz' Binary files jaxws.tar.xz 2019-03-17 17:24:49 +0000 and jaxws.tar.xz 2019-03-18 21:38:41 +0000 differ === modified file 'jdk.tar.xz' Binary files jdk.tar.xz 2019-03-17 17:24:49 +0000 and jdk.tar.xz 2019-03-18 21:38:41 +0000 differ === modified file 'langtools.tar.xz' Binary files langtools.tar.xz 2019-03-17 17:24:49 +0000 and langtools.tar.xz 2019-03-18 21:38:41 +0000 differ === modified file 'nashorn.tar.xz' Binary files nashorn.tar.xz 2019-03-17 17:24:49 +0000 and nashorn.tar.xz 2019-03-18 21:38:41 +0000 differ === modified file 'root.tar.xz' Binary files root.tar.xz 2019-03-17 17:24:49 +0000 and root.tar.xz 2019-03-18 21:38:41 +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.
