[java-1.8.0-openjdk] Updated to u40-b02, adapted seconadry-arches patches
jiri vanek
jvanek at fedoraproject.org
Thu Aug 28 16:14:27 UTC 2014
commit cf544ea5850cee501ea628114f77f7b67e723d5d
Author: Jiri Vanek <jvanek at redhat.com>
Date: Thu Aug 28 18:13:56 2014 +0200
Updated to u40-b02, adapted seconadry-arches patches
.gitignore | 2 +
0001-PPC64LE-arch-support-in-openjdk-1.8.patch | 43 --------------------
enableArm64.patch | 50 ++++++++++++------------
java-1.8.0-openjdk-s390-java-opts.patch | 5 +-
java-1.8.0-openjdk-size_t.patch | 28 +++++++------
java-1.8.0-openjdk.spec | 13 +++++-
sources | 2 +-
7 files changed, 56 insertions(+), 87 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 66459fe..63edfc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@
/aarch64-hotspot-jdk8-b128-aarch64-992.tar.xz
/jdk8u-jdk8u20-b23.tar.xz
/jdk8u-jdk8u40-b01.tar.xz
+/jdk8u-jdk8u40-b02.tar.xz
+/jdk8u-jdk8u20-b26.tar.xz
diff --git a/enableArm64.patch b/enableArm64.patch
index e5c3824..a62d224 100644
--- a/enableArm64.patch
+++ b/enableArm64.patch
@@ -5,7 +5,7 @@
+-client IGNORE
--- jdk8/common/autoconf/generated-configure.sh
+++ jdk8/common/autoconf/generated-configure.sh
-@@ -6728,8 +6728,9 @@
+@@ -6731,8 +6731,9 @@
# The aliases save the names the user supplied, while $host etc.
# will get canonicalized.
test -n "$target_alias" &&
@@ -17,7 +17,7 @@
program_prefix=${target_alias}-
# Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
-@@ -6808,6 +6809,12 @@
+@@ -6816,6 +6817,12 @@
VAR_CPU=arm
VAR_CPU_ARCH=arm
VAR_CPU_BITS=32
@@ -30,7 +30,7 @@
VAR_CPU_ENDIAN=little
;;
powerpc)
-@@ -6930,6 +6937,12 @@
+@@ -6949,6 +6956,12 @@
VAR_CPU_BITS=32
VAR_CPU_ENDIAN=little
;;
@@ -43,31 +43,31 @@
powerpc)
VAR_CPU=ppc
VAR_CPU_ARCH=ppc
-@@ -7889,6 +7902,9 @@
+@@ -7950,6 +7963,9 @@
+ if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
INCLUDE_SA=false
fi
- if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
-+ INCLUDE_SA=false
-+ fi
+ if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
++ INCLUDE_SA=false
++ fi
+ if test "x$VAR_CPU" = xppc64 ; then
INCLUDE_SA=false
fi
-
-@@ -29737,6 +29753,9 @@
- case "${OPENJDK_TARGET_CPU}" in
+@@ -29957,6 +29973,9 @@
s390)
- ZERO_ARCHFLAG="-m31"
-+ ;;
+ ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
+ ;;
+ aarch64)
+ ZERO_ARCHFLAG=""
- ;;
++ ;;
*)
- ZERO_ARCHFLAG="-m${OPENJDK_TARGET_CPU_BITS}"
+ ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
+ esac
--- jdk8/common/autoconf/jdk-options.m4
+++ jdk8/common/autoconf/jdk-options.m4
-@@ -88,11 +88,6 @@
- JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
+@@ -117,11 +117,6 @@
JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
+ JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
- if test "x$JVM_VARIANT_CLIENT" = xtrue; then
- if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
@@ -77,17 +77,17 @@
if test "x$JVM_VARIANT_KERNEL" = xtrue; then
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.])
-@@ -126,6 +121,9 @@
+@@ -159,6 +154,9 @@
INCLUDE_SA=false
fi
- if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
+ if test "x$VAR_CPU" = xppc64 ; then
+ INCLUDE_SA=false
+ fi
+ if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
INCLUDE_SA=false
fi
AC_SUBST(INCLUDE_SA)
-@@ -423,12 +421,6 @@
+@@ -460,12 +458,6 @@
AC_MSG_ERROR([Update version must have a value])
elif test "x$with_update_version" != x; then
JDK_UPDATE_VERSION="$with_update_version"
@@ -117,22 +117,22 @@
powerpc)
--- jdk8/common/autoconf/toolchain.m4
+++ jdk8/common/autoconf/toolchain.m4
-@@ -1078,6 +1078,9 @@
+@@ -1158,6 +1158,9 @@
s390)
- ZERO_ARCHFLAG="-m31"
+ ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
;;
+ aarch64)
+ ZERO_ARCHFLAG=""
+ ;;
*)
- ZERO_ARCHFLAG="-m${OPENJDK_TARGET_CPU_BITS}"
+ ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
esac
--- jdk8/jdk/make/lib/SoundLibraries.gmk
+++ jdk8/jdk/make/lib/SoundLibraries.gmk
-@@ -130,6 +130,10 @@
+@@ -138,6 +138,10 @@
- ifeq ($(OPENJDK_TARGET_CPU), ppc)
- LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC
+ ifeq ($(OPENJDK_TARGET_CPU), ppc64)
+ LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64
+ endif
+
+ ifeq ($(OPENJDK_TARGET_CPU), aarch64)
diff --git a/java-1.8.0-openjdk-s390-java-opts.patch b/java-1.8.0-openjdk-s390-java-opts.patch
index 79108b8..af6063d 100644
--- a/java-1.8.0-openjdk-s390-java-opts.patch
+++ b/java-1.8.0-openjdk-s390-java-opts.patch
@@ -1,13 +1,13 @@
diff -up jdk8/common/autoconf/boot-jdk.m4.s390 jdk8/common/autoconf/boot-jdk.m4
--- jdk8/common/autoconf/boot-jdk.m4.s390 2014-03-11 16:01:27.000000000 -0400
+++ jdk8/common/autoconf/boot-jdk.m4 2014-05-21 11:50:36.507890197 -0400
-@@ -315,12 +315,12 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR
+@@ -315,12 +315,12 @@
fi
# Minimum amount of heap memory.
- ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs,[$JAVA])
+ ADD_JVM_ARG_IF_OK([-Xms256M],boot_jdk_jvmargs,[$JAVA])
- if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
+ if test "x$OPENJDK_TARGET_OS" = "xmacosx" || test "x$OPENJDK_TARGET_CPU" = "xppc64" ; then
# Why does macosx need more heap? Its the huge JDK batch.
ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA])
else
@@ -16,3 +16,4 @@ diff -up jdk8/common/autoconf/boot-jdk.m4.s390 jdk8/common/autoconf/boot-jdk.m4
fi
# When is adding -client something that speeds up the JVM?
# ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA])
+
diff --git a/java-1.8.0-openjdk-size_t.patch b/java-1.8.0-openjdk-size_t.patch
index 2976f5d..a9f8a7f 100644
--- a/java-1.8.0-openjdk-size_t.patch
+++ b/java-1.8.0-openjdk-size_t.patch
@@ -91,9 +91,9 @@ diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.siz
@@ -845,7 +845,7 @@ OtherRegionsTable::do_cleanup_work(HRRSC
// This can be done by either mutator threads together with the
// concurrent refinement threads or GC threads.
- int HeapRegionRemSet::num_par_rem_sets() {
-- return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), ParallelGCThreads);
-+ return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), (size_t)ParallelGCThreads);
+ uint HeapRegionRemSet::num_par_rem_sets() {
+- return MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), (uint)ParallelGCThreads);
++ return MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), (size_t)ParallelGCThreads);
}
HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
@@ -138,7 +138,7 @@ diff -up jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
diff -up jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.size_t jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp
--- jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.size_t 2014-03-11 16:02:13.000000000 -0400
+++ jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp 2014-05-16 13:31:55.620132543 -0400
-@@ -386,7 +386,7 @@ void TwoGenerationCollectorPolicy::initi
+@@ -389,7 +389,7 @@
uintx calculated_size = NewSize + OldSize;
double shrink_factor = (double) MaxHeapSize / calculated_size;
uintx smaller_new_size = align_size_down((uintx)(NewSize * shrink_factor), _gen_alignment);
@@ -147,7 +147,7 @@ diff -up jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.size_t jdk8/hotspo
_initial_gen0_size = NewSize;
// OldSize is already aligned because above we aligned MaxHeapSize to
-@@ -434,7 +434,7 @@ void GenCollectorPolicy::initialize_size
+@@ -437,7 +437,7 @@
// yield a size that is too small) and bound it by MaxNewSize above.
// Ergonomics plays here by previously calculating the desired
// NewSize and MaxNewSize.
@@ -156,15 +156,16 @@ diff -up jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.size_t jdk8/hotspo
}
assert(max_new_size > 0, "All paths should set max_new_size");
-@@ -461,16 +461,16 @@ void GenCollectorPolicy::initialize_size
- // generally small compared to the NewRatio calculation.
+@@ -459,7 +459,7 @@
+ // lower limit.
_min_gen0_size = NewSize;
desired_new_size = NewSize;
- max_new_size = MAX2(max_new_size, NewSize);
+ max_new_size = MAX2(max_new_size, (size_t)NewSize);
- } else {
- // For the case where NewSize is the default, use NewRatio
- // to size the minimum and initial generation sizes.
+ } else if (FLAG_IS_ERGO(NewSize)) {
+ // If NewSize is set ergonomically, we should use it as a lower
+ // limit, but use NewRatio to calculate the initial size.
+@@ -473,10 +473,9 @@
// Use the default NewSize as the floor for these values. If
// NewRatio is overly large, the resulting sizes can be too
// small.
@@ -172,11 +173,12 @@ diff -up jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.size_t jdk8/hotspo
+ _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size), (size_t)NewSize);
desired_new_size =
- MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);
-+ MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize);
- }
+- }
++ MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize); }
assert(_min_gen0_size > 0, "Sanity check");
-@@ -572,7 +572,7 @@ void TwoGenerationCollectorPolicy::initi
+ _initial_gen0_size = desired_new_size;
+@@ -577,7 +576,7 @@
} else {
// It's been explicitly set on the command line. Use the
// OldSize and then determine the consequences.
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 364d411..f9d4cd9 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -97,7 +97,7 @@
# Standard JPackage naming and versioning defines.
%global origin openjdk
%global updatever 40
-%global buildver b01
+%global buildver b02
%global aarch64_updatever 0
%global aarch64_buildver b128
# priority must be 6 digits in total
@@ -225,7 +225,6 @@ Patch203: system-lcms.patch
Patch300: jstack-pr1845.patch
-Patch999: 0001-PPC64LE-arch-support-in-openjdk-1.8.patch
Patch9999: enableArm64.patch
BuildRequires: autoconf
@@ -481,7 +480,6 @@ sh %{SOURCE12}
%ifarch ppc %{power64}
# PPC fixes
%patch103
-%patch999 -p1
%endif
# Extract systemtap tapsets
@@ -1336,6 +1334,15 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog
+* Thu Aug 28 2014 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.40-1.b02
+- updated to u20-b26
+- adapted aarch64 patch
+- removed upstreamed patch 0001-PPC64LE-arch-support-in-openjdk-1.8.patch
+
+* Wed Aug 27 2014 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.40-1.b02
+- updated to u40-b02
+- adapted aarch64 patches
+
* Wed Aug 27 2014 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.40-1.b01
- updated to u40-b01
- adapted java-1.8.0-openjdk-accessible-toolkit.patch
diff --git a/sources b/sources
index 71244e6..c32111d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-35130478f55ef3b57381486f0053d61d jdk8u-jdk8u40-b01.tar.xz
+78d96904ad6d9a7cee76849b0e49b6f0 jdk8u-jdk8u40-b02.tar.xz
94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz
8c0436da8098f15c7bda2fa4f927e525 aarch64-hotspot-jdk8-b128-aarch64-992.tar.xz
More information about the scm-commits
mailing list