From 01ea0513115a141b0540784a2cb94bdcbcf4c86c Mon Sep 17 00:00:00 2001 From: Deepak Bhole Date: Fri, 2 Aug 2013 11:55:04 -0400 Subject: [PATCH] Added a missing includes patch (#302/%{name}-arm64-missing-includes.patch) Added --disable-precompiled-headers for arm64 build --- ...1.8.0-openjdk-arm64-missing-includes.patch | 31 +++++++++++++++++++ java-1.8.0-openjdk.spec | 13 +++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 java-1.8.0-openjdk-arm64-missing-includes.patch diff --git a/java-1.8.0-openjdk-arm64-missing-includes.patch b/java-1.8.0-openjdk-arm64-missing-includes.patch new file mode 100644 index 0000000..e65184f --- /dev/null +++ b/java-1.8.0-openjdk-arm64-missing-includes.patch @@ -0,0 +1,31 @@ +# HG changeset patch +# User aph +# Date 1375434503 -3600 +# Node ID d9d274bdde7a71eb642ce320e7557d70eea7cee9 +# Parent c1cd345fa3810a1d0e58cec9b31419025fb44ae0 +Add a couple of missing #includes. + +diff -r c1cd345fa381 -r d9d274bdde7a src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp +--- a/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp Mon Jul 29 18:31:19 2013 +0100 ++++ b/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp Fri Aug 02 10:08:23 2013 +0100 +@@ -26,10 +26,11 @@ + + #include "precompiled.hpp" + #include "asm/assembler.hpp" ++#include "c1/c1_CodeStubs.hpp" + #include "c1/c1_Defs.hpp" + #include "c1/c1_MacroAssembler.hpp" + #include "c1/c1_Runtime1.hpp" +-#include "c1/c1_CodeStubs.hpp" ++#include "compiler/disassembler.hpp" + #include "interpreter/interpreter.hpp" + #include "nativeInst_aarch64.hpp" + #include "oops/compiledICHolder.hpp" +@@ -38,6 +39,7 @@ + #include "register_aarch64.hpp" + #include "runtime/sharedRuntime.hpp" + #include "runtime/signature.hpp" ++#include "runtime/vframe.hpp" + #include "runtime/vframeArray.hpp" + #include "vmreg_aarch64.inline.hpp" + diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 8e28965..1efc99e 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -142,7 +142,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.14.%{jdk8_version}%{?dist} +Release: 0.15.%{jdk8_version}%{?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 @@ -213,6 +213,7 @@ Patch203: system-lcms.patch Patch2031: system-lcmsAARCH64.patch Patch301: removeMswitchesFromx11.patch +Patch302: %{name}-arm64-missing-includes.patch BuildRequires: autoconf BuildRequires: automake @@ -404,6 +405,11 @@ sh %{SOURCE12} %ifarch %{aarch64} %patch301 + +pushd jdk8/hotspot >& /dev/null +%patch302 -p1 +popd >& /dev/null + %endif # Extract systemtap tapsets @@ -453,6 +459,7 @@ bash ../../configure \ %endif %ifarch %{aarch64} --with-jvm-variants=client \ + --disable-precompiled-headers \ %endif --with-build-number=%{buildver} \ --with-boot-jdk=/usr/lib/jvm/java-openjdk \ @@ -944,6 +951,10 @@ exit 0 %doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE %changelog +* Fri Aug 02 2013 Deepak Bhole - 1:1.8.0.0-0.15.b89 +- Added a missing includes patch (#302/%{name}-arm64-missing-includes.patch) +- Added --disable-precompiled-headers for arm64 build + * Mon Jul 29 2013 Jiri Vanek - 1:1.8.0.0-0.14.b89 - added patch 301 - removeMswitchesFromx11.patch