added and applied patch604: aarch64-ifdefbugfix.patch to fix rhbz1276959

This commit is contained in:
Jiri Vanek 2015-11-02 16:20:17 +01:00
parent 45afe24df1
commit ebd5c0b82d
2 changed files with 18 additions and 2 deletions

12
aarch64-ifdefbugfix.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/src/share/vm/interpreter/abstractInterpreter.hpp b/src/share/vm/interpreter/abstractInterpreter.hpp
--- openjdk/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
+++ openjdk/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
@@ -34,7 +34,7 @@
# include INTERP_MASM_MD_HPP
#elif defined TARGET_ARCH_x86
# include "interp_masm_x86.hpp"
-#elif TARGET_ARCH_MODEL_aarch64
+#elif defined TARGET_ARCH_MODEL_aarch64
# include "interp_masm_aarch64.hpp"
#elif defined TARGET_ARCH_MODEL_sparc
# include "interp_masm_sparc.hpp"

View File

@ -660,7 +660,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}
Release: 15.%{buildver}%{?dist}
Release: 16.%{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
@ -755,6 +755,7 @@ Patch511: rh1214835.patch
Patch601: %{name}-rh1191652-root.patch
Patch602: %{name}-rh1191652-jdk.patch
Patch603: %{name}-rh1191652-hotspot-aarch64.patch
Patch604: aarch64-ifdefbugfix.patch
BuildRequires: autoconf
BuildRequires: automake
@ -1024,7 +1025,7 @@ sh %{SOURCE12}
%patch603
%patch601
%patch602
%patch604
%patch504
%patch511
@ -1712,6 +1713,9 @@ end
%endif
%changelog
* Mon Nov 02 2015 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.60-16.b28
added and applied patch604: aarch64-ifdefbugfix.patch to fix rhbz1276959
* Thu Oct 15 2015 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.60-15.b28
- moved to single source integration forest
- removed patch patch9999 enableArm64.patch