[java-1.7.0-openjdk/f19] added aand applied patch410, 1015432.patch, resolves rhbz#1015432
jiri vanek
jvanek at fedoraproject.org
Mon Jan 6 15:06:00 UTC 2014
commit c1f37d62973b0e8721ead14ba84c8fccf0035a34
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date: Mon Jan 6 16:05:27 2014 +0100
added aand applied patch410, 1015432.patch, resolves rhbz#1015432
1015432.patch | 23 +++++++++++++++++++++++
java-1.7.0-openjdk.spec | 9 ++++++++-
2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/1015432.patch b/1015432.patch
new file mode 100644
index 0000000..709f0a9
--- /dev/null
+++ b/1015432.patch
@@ -0,0 +1,23 @@
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Wed Oct 23 15:44:12 2013 -0700
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Thu Dec 19 16:03:33 2013 +0000
+@@ -4797,9 +4797,19 @@
+ // 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.
++
++
+ os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed,
+ (size_t)(StackYellowPages+StackRedPages+StackShadowPages) * Linux::page_size() +
+- (2*BytesPerWord COMPILER2_PRESENT(+1)) * Linux::vm_default_page_size());
++ (2*BytesPerWord COMPILER2_PRESENT(+1))
++ *
++#ifdef PPC
++ NOT_ZERO ( Linux::vm_default_page_size() )
++ ZERO_ONLY ( Linux::page_size() )
++#else
++ ( Linux::vm_default_page_size() )
++#endif
++ );
+
+ size_t threadStackSizeInBytes = ThreadStackSize * K;
+ if (threadStackSizeInBytes != 0 &&
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 0626f68..225e127 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -149,7 +149,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.60
-Release: %{icedtea_version}.0%{?dist}
+Release: %{icedtea_version}.1%{?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
@@ -261,6 +261,7 @@ Patch300: pulse-soundproperties.patch
#Workaround RH902004
Patch402: gstackbounds.patch
Patch403: PStack-808293.patch
+Patch410: 1015432.patch
# End of tmp patches
BuildRequires: autoconf
@@ -511,6 +512,8 @@ tar xzf %{SOURCE9}
%patch403
%endif
+%patch410
+
%build
# How many cpu's do we have?
%ifarch aarch64
@@ -1307,6 +1310,10 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog
+* Mon Jan 06 2014 Jiri Vanek <jvanek at redhat.com> - 1.7.0.40-2.4.3.1.f19
+- added aand applied patch410, 1015432.patch
+- resolves rhbz#1015432
+
* Thu Oct 10 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.40-2.4.3.0.f19
- security update to icedtea 2.4.3 (u45, b15)
- removed upstreamed patch101 zero-s8024914.patch
More information about the scm-commits
mailing list