Mercurial > hg > icedtea7
changeset 2896:18f2aec9b670
PR3211: AArch64 build fails with pre-compiled headers disabled
2016-10-26 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR3211: AArch64 build fails with pre-compiled
headers disabled
* Makefile.am:
(ICEDTEA_PATCHES): Add patch for PR3211.
* NEWS: Updated.
* patches/pr3211.patch:
Add missing includes to AArch64 port.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Thu, 27 Oct 2016 07:01:33 +0100 |
| parents | cebac2cc1f7a |
| children | 3e24116d0925 |
| files | ChangeLog Makefile.am NEWS patches/pr3211.patch |
| diffstat | 4 files changed, 45 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Oct 27 06:23:54 2016 +0100 +++ b/ChangeLog Thu Oct 27 07:01:33 2016 +0100 @@ -1,3 +1,13 @@ +2016-10-26 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR3211: AArch64 build fails with pre-compiled + headers disabled + * Makefile.am: + (ICEDTEA_PATCHES): Add patch for PR3211. + * NEWS: Updated. + * patches/pr3211.patch: + Add missing includes to AArch64 port. + 2016-10-26 Andrew John Hughes <gnu.andrew@member.fsf.org> PR3180: Support building without pre-compiled headers
--- a/Makefile.am Thu Oct 27 06:23:54 2016 +0100 +++ b/Makefile.am Thu Oct 27 07:01:33 2016 +0100 @@ -371,7 +371,7 @@ # Patch list -ICEDTEA_PATCHES = +ICEDTEA_PATCHES = patches/pr3211.patch # Conditional patches
--- a/NEWS Thu Oct 27 06:23:54 2016 +0100 +++ b/NEWS Thu Oct 27 07:01:33 2016 +0100 @@ -62,6 +62,7 @@ * AArch64 port - S8157306, PR3209: Random infrequent null pointer exceptions in javac - S8167200: AArch64: Broken stack pointer adjustment in interpreter + - PR3211: AArch64 build fails with pre-compiled headers disabled New in release 2.6.7 (2016-07-28):
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/pr3211.patch Thu Oct 27 07:01:33 2016 +0100 @@ -0,0 +1,33 @@ +# HG changeset patch +# User andrew +# Date 1477547871 -3600 +# Thu Oct 27 06:57:51 2016 +0100 +# Node ID f23cc792224c21431b71da6a31ab751ac6f5c236 +# Parent 76e61db9631544414570a5238b66c12465e6a821 +PR3211: AArch64 build fails with pre-compiled headers disabled +Contributed-by: Tiago Stürmer Daitx <tdaitx@gmail.com> + +diff --git a/src/cpu/aarch64/vm/assembler_aarch64.cpp b/src/cpu/aarch64/vm/assembler_aarch64.cpp +--- openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp ++++ openjdk/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp +@@ -64,6 +64,7 @@ + #include "gc_implementation/g1/heapRegion.hpp" + #endif + ++#include "opto/compile.hpp" + + extern "C" void entry(CodeBuffer *cb); + +diff --git a/src/cpu/aarch64/vm/vm_version_aarch64.cpp b/src/cpu/aarch64/vm/vm_version_aarch64.cpp +--- openjdk/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp ++++ openjdk/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp +@@ -25,6 +25,9 @@ + */ + + #include "precompiled.hpp" ++#include "asm/assembler.hpp" ++#include "asm/assembler.inline.hpp" ++#include "utilities/sizes.hpp" + #include "assembler_aarch64.hpp" + #include "memory/resourceArea.hpp" + #include "runtime/java.hpp"