[java-1.7.0-openjdk] - added variable arm_arches as restriction to some cases of not jit_arches - size_t patch adapted to
jiri vanek
jvanek at fedoraproject.org
Wed May 22 16:08:08 UTC 2013
commit ec38fba02eef26b404c13dfb73293805b113d464
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date: Wed May 22 18:08:27 2013 +0200
- added variable arm_arches as restriction to some cases of not jit_arches
- size_t patch adapted to 2.3 which is now default on all except arm arches
java-1.7.0-openjdk-size_t.patch | 40 +++++++++++++++++++-------------------
java-1.7.0-openjdk.spec | 29 +++++++++++++++++----------
2 files changed, 38 insertions(+), 31 deletions(-)
---
diff --git a/java-1.7.0-openjdk-size_t.patch b/java-1.7.0-openjdk-size_t.patch
index f9bfc20..554ec92 100644
--- a/java-1.7.0-openjdk-size_t.patch
+++ b/java-1.7.0-openjdk-size_t.patch
@@ -46,34 +46,34 @@ diff -up openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/comp
diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sav openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sav 2012-02-14 16:11:12.000000000 -0500
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2012-03-09 16:30:30.426921691 -0500
-@@ -481,7 +481,7 @@ ConcurrentMark::ConcurrentMark(ReservedS
+@@ -543,7 +543,7 @@
+ #endif // _MSC_VER
+
+ uint ConcurrentMark::scale_parallel_threads(uint n_par_threads) {
+- return MAX2((n_par_threads + 2) / 4, 1U);
++ return MAX2((size_t)((n_par_threads + 2) / 4), (size_t)1);
+ }
+
+ ConcurrentMark::ConcurrentMark(ReservedSpace rs,
+@@ -571,7 +571,7 @@
_regionStack(),
// _finger set in set_non_marking_state
-- _max_task_num(MAX2(ParallelGCThreads, (size_t)1)),
+- _max_task_num(MAX2((uint)ParallelGCThreads, 1U)),
+ _max_task_num(MAX2((size_t)ParallelGCThreads, (size_t)1)),
// _active_tasks set in set_non_marking_state
// _tasks set inside the constructor
_task_queues(new CMTaskQueueSet((int) _max_task_num)),
-@@ -586,7 +586,7 @@ ConcurrentMark::ConcurrentMark(ReservedS
- _sleep_factor = sleep_factor;
- _marking_task_overhead = marking_task_overhead;
- } else {
-- _parallel_marking_threads = MAX2((ParallelGCThreads + 2) / 4, (size_t)1);
-+ _parallel_marking_threads = MAX2((size_t)((ParallelGCThreads + 2) / 4), (size_t)1);
- _sleep_factor = 0.0;
- _marking_task_overhead = 1.0;
- }
-@@ -1116,7 +1116,7 @@ void ConcurrentMark::markFromRoots() {
-
- _restart_for_overflow = false;
+@@ -1318,7 +1318,7 @@
+ assert(parallel_marking_threads() <= max_parallel_marking_threads(),
+ "Maximum number of marking threads exceeded");
-- size_t active_workers = MAX2((size_t) 1, parallel_marking_threads());
+- uint active_workers = MAX2(1U, parallel_marking_threads());
+ size_t active_workers = MAX2((size_t) 1, (size_t)parallel_marking_threads());
- force_overflow_conc()->init();
- set_phase(active_workers, true /* concurrent */);
-@@ -3689,7 +3689,7 @@ void CMTask::drain_local_queue(bool part
+ // Parallel task terminator is set in "set_phase()"
+ set_phase(active_workers, true /* concurrent */);
+@@ -4515,7 +4515,7 @@
// of things to do) or totally (at the very end).
size_t target_size;
if (partially) {
@@ -82,11 +82,11 @@ diff -up openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.sa
} else {
target_size = 0;
}
-@@ -4604,7 +4604,7 @@ size_t G1PrintRegionLivenessInfoClosure:
+@@ -5438,7 +5438,7 @@
// The > 0 check is to deal with the prev and next live bytes which
// could be 0.
if (*hum_bytes > 0) {
-- bytes = MIN2((size_t) HeapRegion::GrainBytes, *hum_bytes);
+- bytes = MIN2(HeapRegion::GrainBytes, *hum_bytes);
+ bytes = MIN2((size_t) HeapRegion::GrainBytes, (size_t)*hum_bytes);
*hum_bytes -= bytes;
}
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 813b627..978f8c9 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -7,6 +7,9 @@
%global multilib_arches ppc64 sparc64 x86_64
%global jit_arches %{ix86} x86_64 sparcv9 sparc64
+#this is even greater restriction then jit archs. It should have all modifications
+#as jit_archs, and as addition also using 2.1 source
+%global arm_arches armv5tel armv7hl
%ifarch x86_64
%global archbuild amd64
@@ -142,7 +145,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}.10%{?dist}
+Release: %{icedtea_version}.11%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -447,10 +450,10 @@ Although working pretty fine, there are known issues with accessibility on, so d
%prep
-%ifarch %{jit_arches}
-%global source_num 0
-%else
+%ifarch %{arm_arches}
%global source_num 100
+%else
+%global source_num 0
%endif
%setup -q -c -n %{name} -T -a %{source_num}
@@ -459,10 +462,10 @@ cp %{SOURCE2} .
# OpenJDK patches
# Rhino patch -- one default version (100) and one specific to 2.1.1 (400)
-%ifarch %{jit_arches}
-%patch100
-%else
+%ifarch %{arm_arches}
%patch400
+%else
+%patch100
%endif
# pulseaudio support
@@ -611,10 +614,10 @@ make \
ANT="/usr/bin/ant" \
DISTRO_NAME="Fedora" \
DISTRO_PACKAGE_VERSION="fedora-%{release}-%{_arch}" \
-%ifarch %{jit_arches}
- JDK_UPDATE_VERSION=`printf "%02d" %{buildver}` \
-%else
+%ifnarch %{arm_arches}
JDK_UPDATE_VERSION="03" \
+%else
+ JDK_UPDATE_VERSION=`printf "%02d" %{buildver}` \
%endif
MILESTONE="fcs" \
HOTSPOT_BUILD_JOBS="$NUM_PROC" \
@@ -1116,7 +1119,7 @@ exit 0
%{_mandir}/man1/javah-%{uniquesuffix}.1*
%{_mandir}/man1/javap-%{uniquesuffix}.1*
%{_mandir}/man1/jconsole-%{uniquesuffix}.1*
-%ifarch %{jit_arches} # Only in u4+
+%ifnarch %{arm_arches} # Only in u4+
%{_mandir}/man1/jcmd-%{uniquesuffix}.1*
%endif
%{_mandir}/man1/jdb-%{uniquesuffix}.1*
@@ -1161,6 +1164,10 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog
+* Thu May 22 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.19-2.3.9.11.fc20
+- added variable arm_arches as restriction to some cases of not jit_arches
+- size_t patch adapted to 2.3 which is now default on all except arm arches
+
* Fri May 17 2013 Omair Majid <omajid at redhat.com> - 1.7.0.19-2.3.9.10.fc20
- Replace %{name} with %{uniquesuffix} where it's used as a unique suffix.
More information about the scm-commits
mailing list