jvanek pushed to java-1.8.0-openjdk (f22). "Added rhbz1206656_fix_current_stack_pointer.patch"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 1 14:54:39 UTC 2015
>From 449b4d54f3701285728da8b91517b183128e0d8d Mon Sep 17 00:00:00 2001
From: Jiri <jvanek at redhat.com>
Date: Wed, 1 Apr 2015 16:54:18 +0200
Subject: Added rhbz1206656_fix_current_stack_pointer.patch
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 748a8ed..bdd19f2 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -635,7 +635,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}
-Release: 25.%{buildver}%{?dist}
+Release: 26.%{buildver}%{?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
@@ -724,6 +724,8 @@ Patch300: jstack-pr1845.patch
Patch400: ppc_stack_overflow_fix.patch
Patch401: fix_ZERO_ARCHDEF_ppc.patch
Patch402: atomic_linux_zero.inline.hpp.patch
+# Fixes StackOverflowError on ARM32 bit Zero. See RHBZ#1206656
+Patch403: rhbz1206656_fix_current_stack_pointer.patch
#both upstreamed, will fly away in u60
Patch501: 1182011_JavaPrintApiDoesNotPrintUmlautCharsWithPostscriptOutputCorrectly.patch
@@ -1014,6 +1016,7 @@ sh %{SOURCE12}
%patch400
%patch401
%patch402
+%patch403
# Extract systemtap tapsets
%if %{with_systemtap}
@@ -1705,6 +1708,10 @@ end
%changelog
+* Tue Mar 31 2015 Severin Gehwolf <sgehwolf at redhat.com> - 1:1.8.0.40-26.b25
+- Make Zero build-able on ARM32.
+ Resolves: RHBZ#1206656
+
* Fri Mar 27 2015 Dan HorĂ¡k <dan[at]danny.cz> - 1:1.8.0.40-25.b25
- refresh s390 patches
diff --git a/rhbz1206656_fix_current_stack_pointer.patch b/rhbz1206656_fix_current_stack_pointer.patch
new file mode 100644
index 0000000..dbefaef
--- /dev/null
+++ b/rhbz1206656_fix_current_stack_pointer.patch
@@ -0,0 +1,14 @@
+diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+--- jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
++++ jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+@@ -55,8 +55,8 @@
+ #include "utilities/vmError.hpp"
+
+ address os::current_stack_pointer() {
+- address dummy = (address) &dummy;
+- return dummy;
++ // return the address of the current function
++ return (address)__builtin_frame_address(0);
+ }
+
+ frame os::get_sender_for_C_frame(frame* fr) {
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/java-1.8.0-openjdk.git/commit/?h=f22&id=449b4d54f3701285728da8b91517b183128e0d8d
More information about the scm-commits
mailing list