------------------------------------------------------------
revno: 706
committer: Matthias Klose <d...@ubuntu.com>
branch nick: openjdk8
timestamp: Sat 2017-07-22 11:43:45 +0200
message:
* Update the m68k-support patch (Adrian Glaubitz). Closes: #864180.
* Disable generation of jvmti.html on m68k (Adrian Glaubitz).
Closes: #864205.
added:
debian/patches/hotspot-disable-jvmtidocs.diff
modified:
debian/changelog
debian/patches/m68k-support.diff
--
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 2017-07-21 13:59:23 +0000
+++ debian/changelog 2017-07-22 09:43:45 +0000
@@ -1,3 +1,11 @@
+openjdk-8 (8u141-b15-2) UNRELEASED; urgency=medium
+
+ * Update the m68k-support patch (Adrian Glaubitz). Closes: #864180.
+ * Disable generation of jvmti.html on m68k (Adrian Glaubitz).
+ Closes: #864205.
+
+ -- Matthias Klose <d...@ubuntu.com> Sat, 22 Jul 2017 11:39:47 +0200
+
openjdk-8 (8u141-b15-1) unstable; urgency=high
* Update to 8u141-b15, Hotspot 8u141-b16 for AArch64.
=== added file 'debian/patches/hotspot-disable-jvmtidocs.diff'
--- debian/patches/hotspot-disable-jvmtidocs.diff 1970-01-01 00:00:00 +0000
+++ debian/patches/hotspot-disable-jvmtidocs.diff 2017-07-22 09:43:45 +0000
@@ -0,0 +1,22 @@
+--- a/hotspot/make/linux/Makefile.orig 2017-03-06 20:12:11.000000000 +0100
++++ a/hotspot/make/linux/Makefile 2017-05-08 07:59:49.775242564 +0200
+@@ -349,7 +349,7 @@
+ # ENABLE_FULL_DEBUG_SYMBOLS value is used.
+ docs: checks
+ $(QUIETLY) mkdir -p $(SUBDIR_DOCS)
+- $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) BUILD_FLAVOR=product jvmtidocs
++ #$(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) BUILD_FLAVOR=product jvmtidocs
+
+ # Synonyms for win32-like targets.
+ compiler2: debug product
+--- a/hotspot/make/linux/makefiles/defs.make.orig 2017-03-06 20:12:11.000000000 +0100
++++ a/hotspot/make/linux/makefiles/defs.make 2017-05-08 11:28:50.001500588 +0200
+@@ -234,7 +234,7 @@
+ # Library suffix
+ LIBRARY_SUFFIX=so
+
+-EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
++#EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
+
+ # client and server subdirectories have symbolic links to ../libjsig.so
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
=== modified file 'debian/patches/m68k-support.diff'
--- debian/patches/m68k-support.diff 2017-01-23 10:17:38 +0000
+++ debian/patches/m68k-support.diff 2017-07-22 09:43:45 +0000
@@ -1,7 +1,8 @@
-
---- a/common/autoconf/generated-configure.sh
-+++ b/common/autoconf/generated-configure.sh
-@@ -6919,6 +6919,12 @@ test -n "$target_alias" &&
+Index: jdk8u-c684352da3e3/common/autoconf/generated-configure.sh
+===================================================================
+--- jdk8u-c684352da3e3.orig/common/autoconf/generated-configure.sh
++++ jdk8u-c684352da3e3/common/autoconf/generated-configure.sh
+@@ -6883,6 +6883,12 @@ test -n "$target_alias" &&
VAR_CPU_BITS=64
VAR_CPU_ENDIAN=big
;;
@@ -14,7 +15,7 @@
*)
as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5
;;
-@@ -7062,6 +7068,12 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUI
+@@ -7026,6 +7032,12 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUI
VAR_CPU_BITS=64
VAR_CPU_ENDIAN=big
;;
@@ -27,9 +28,11 @@
*)
as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5
;;
---- a/common/autoconf/platform.m4
-+++ b/common/autoconf/platform.m4
-@@ -156,6 +156,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU
+Index: jdk8u-c684352da3e3/common/autoconf/platform.m4
+===================================================================
+--- jdk8u-c684352da3e3.orig/common/autoconf/platform.m4
++++ jdk8u-c684352da3e3/common/autoconf/platform.m4
+@@ -102,6 +102,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU
VAR_CPU_BITS=64
VAR_CPU_ENDIAN=big
;;
@@ -42,8 +45,10 @@
*)
AC_MSG_ERROR([unsupported cpu $1])
;;
---- a/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
-+++ b/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
+Index: jdk8u-c684352da3e3/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
+===================================================================
+--- jdk8u-c684352da3e3.orig/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
++++ jdk8u-c684352da3e3/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
@@ -38,7 +38,7 @@
* __m68k_cmpxchg
*
@@ -109,8 +114,10 @@
}
}
#endif // M68K
---- a/hotspot/src/share/vm/memory/allocation.hpp
-+++ b/hotspot/src/share/vm/memory/allocation.hpp
+Index: jdk8u-c684352da3e3/hotspot/src/share/vm/memory/allocation.hpp
+===================================================================
+--- jdk8u-c684352da3e3.orig/hotspot/src/share/vm/memory/allocation.hpp
++++ jdk8u-c684352da3e3/hotspot/src/share/vm/memory/allocation.hpp
@@ -191,7 +191,7 @@ template <MEMFLAGS F> class CHeapObj ALL
throw();
void operator delete(void* p);
@@ -147,8 +154,22 @@
// One of the following macros must be used when allocating an array
// or object to determine whether it should reside in the C heap on in
---- a/hotspot/src/share/vm/oops/oop.hpp
-+++ b/hotspot/src/share/vm/oops/oop.hpp
+Index: jdk8u-c684352da3e3/hotspot/src/share/vm/oops/constMethod.hpp
+===================================================================
+--- jdk8u-c684352da3e3.orig/hotspot/src/share/vm/oops/constMethod.hpp
++++ jdk8u-c684352da3e3/hotspot/src/share/vm/oops/constMethod.hpp
+@@ -517,6 +517,6 @@ private:
+
+ // Verify
+ void verify_on(outputStream* st);
+-};
++} __attribute__ ((aligned (4)));
+
+ #endif // SHARE_VM_OOPS_CONSTMETHODOOP_HPP
+Index: jdk8u-c684352da3e3/hotspot/src/share/vm/oops/oop.hpp
+===================================================================
+--- jdk8u-c684352da3e3.orig/hotspot/src/share/vm/oops/oop.hpp
++++ jdk8u-c684352da3e3/hotspot/src/share/vm/oops/oop.hpp
@@ -374,6 +374,6 @@ class oopDesc {
static int mark_offset_in_bytes() { return offset_of(oopDesc, _mark); }
static int klass_offset_in_bytes() { return offset_of(oopDesc, _metadata._klass); }
@@ -157,8 +178,11 @@
+} __attribute__ ((aligned (4)));
#endif // SHARE_VM_OOPS_OOP_HPP
---- a/jdk/make/gensrc/GensrcX11Wrappers.gmk
-+++ b/jdk/make/gensrc/GensrcX11Wrappers.gmk
+
+Index: jdk8u-c684352da3e3/jdk/make/gensrc/GensrcX11Wrappers.gmk
+===================================================================
+--- jdk8u-c684352da3e3.orig/jdk/make/gensrc/GensrcX11Wrappers.gmk
++++ jdk8u-c684352da3e3/jdk/make/gensrc/GensrcX11Wrappers.gmk
@@ -57,12 +57,16 @@ else
GENSRC_X11_VERSION := 32 64
endif
@@ -177,8 +201,10 @@
$(MKDIR) -p $(@D)
$(RM) '$@'
$(SORT) $< > $@
---- a/jdk/src/solaris/bin/java_md_solinux.c
-+++ b/jdk/src/solaris/bin/java_md_solinux.c
+Index: jdk8u-c684352da3e3/jdk/src/solaris/bin/java_md_solinux.c
+===================================================================
+--- jdk8u-c684352da3e3.orig/jdk/src/solaris/bin/java_md_solinux.c
++++ jdk8u-c684352da3e3/jdk/src/solaris/bin/java_md_solinux.c
@@ -1023,12 +1023,24 @@ void SplashFreeLibrary() {
}
}
@@ -222,8 +248,10 @@
void * tmp;
thr_join(tid, NULL, &tmp);
rslt = (int)tmp;
+Index: jdk8u-c684352da3e3/jdk/src/solaris/classes/sun/awt/X11/generator/sizes.32-linux-m68k
+===================================================================
--- /dev/null
-+++ b/jdk/src/solaris/classes/sun/awt/X11/generator/sizes.32-linux-m68k
++++ jdk8u-c684352da3e3/jdk/src/solaris/classes/sun/awt/X11/generator/sizes.32-linux-m68k
@@ -0,0 +1,1016 @@
+long 4
+int 4
@@ -1241,15 +1269,16 @@
+XTextProperty.format 8
+XTextProperty.nitems 12
+XTextProperty 16
---- a/hotspot/src/share/vm/oops/constMethod.hpp
-+++ b/hotspot/src/share/vm/oops/constMethod.hpp
-@@ -224,6 +224,9 @@ private:
- u2 _max_locals; // Number of local variables used by this method
- u2 _size_of_parameters; // size of the parameter block (receiver + arguments) in words
- u2 _orig_method_idnum; // Original unique identification number for the method
-+#ifdef __m68k__
-+ u2 _padding; // pad the structure to a multiple of 32bit
-+#endif
+Index: jdk8u-c684352da3e3/make/Javadoc.gmk
+===================================================================
+--- jdk8u-c684352da3e3.orig/make/Javadoc.gmk
++++ jdk8u-c684352da3e3/make/Javadoc.gmk
+@@ -47,7 +47,7 @@ HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPU
+ BUILD_NUMBER=$(JDK_BUILD_NUMBER)
- // Constructor
- ConstMethod(int byte_code_size,
+ JAVADOC_CMD = $(JAVA) \
+- -Xmx1024m \
++ -Xmx512m \
+ -Djava.awt.headless=true \
+ $(NEW_JAVADOC) \
+ -bootclasspath $(JDK_OUTPUTDIR)/classes
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
debian-j...@lists.debian.org for discussions and questions.
