Mercurial > hg > release > icedtea6-1.13
changeset 3276:47d928687363
PR3152: Zero build fails with pch disabled
2016-12-28 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR3152: Zero build fails with pch disabled
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* NEWS: Updated.
* patches/openjdk/8078628-pr3152-zero_pch_failure.patch:
Backport patch from b41 to fix Zero build failure when
building without pre-compiled headers.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Tue, 03 Jan 2017 05:43:43 +0000 |
parents | 3b10a198e6d6 |
children | e61c9fc4401d |
files | ChangeLog Makefile.am NEWS patches/openjdk/8078628-pr3152-zero_pch_failure.patch |
diffstat | 4 files changed, 62 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jan 01 05:21:54 2017 +0000 +++ b/ChangeLog Tue Jan 03 05:43:43 2017 +0000 @@ -1,3 +1,13 @@ +2016-12-28 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR3152: Zero build fails with pch disabled + * Makefile.am: + (ICEDTEA_PATCHES): Add new patch. + * NEWS: Updated. + * patches/openjdk/8078628-pr3152-zero_pch_failure.patch: + Backport patch from b41 to fix Zero build failure when + building without pre-compiled headers. + 2016-12-23 Andrew John Hughes <gnu.andrew@member.fsf.org> PR3205: Builds fails with pch disabled
--- a/Makefile.am Sun Jan 01 05:21:54 2017 +0000 +++ b/Makefile.am Tue Jan 03 05:43:43 2017 +0000 @@ -624,7 +624,8 @@ patches/openjdk/6260348-pr3068.patch \ patches/openjdk/6961123-pr2975.patch \ patches/pr2800-missing_resources.patch \ - patches/openjdk/8169448-pr3205-pch_failure.patch + patches/openjdk/8169448-pr3205-pch_failure.patch \ + patches/openjdk/8078628-pr3152-zero_pch_failure.patch if WITH_RHINO ICEDTEA_PATCHES += \
--- a/NEWS Sun Jan 01 05:21:54 2017 +0000 +++ b/NEWS Tue Jan 03 05:43:43 2017 +0000 @@ -15,6 +15,7 @@ New in release 1.13.13 (2016-10-XX): * Bug fixes + - PR3152: Zero build fails with pch disabled - PR3205: Builds fails with pch disabled New in release 1.13.12 (2016-08-24):
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8078628-pr3152-zero_pch_failure.patch Tue Jan 03 05:43:43 2017 +0000 @@ -0,0 +1,49 @@ +# HG changeset patch +# User andrew +# Date 1482709933 0 +# Sun Dec 25 23:52:13 2016 +0000 +# Node ID 1ae05a34e052d1672b4a7894ddf5fc2f662eb861 +# Parent 598f4f521889aadf7abccaf0634e9cd0d8b75599 +8078628: Zero build fails with pre-compiled headers disabled +Summary: Add missing includes to make Zero builds without pre-compiled headers work +Reviewed-by: omajid + +diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/entry_zero.hpp openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp +--- openjdk.orig/hotspot/src/cpu/zero/vm/entry_zero.hpp 2016-08-22 15:02:02.000000000 +0100 ++++ openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp 2016-12-26 02:36:46.775167402 +0000 +@@ -1,6 +1,6 @@ + /* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +- * Copyright 2008, 2009, 2010 Red Hat, Inc. ++ * Copyright 2016 Red Hat, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -26,6 +26,8 @@ + #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP + #define CPU_ZERO_VM_ENTRY_ZERO_HPP + ++#include "interpreter/cppInterpreter.hpp" ++ + class ZeroEntry { + public: + ZeroEntry() { +diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp +--- openjdk.orig/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp 2016-08-22 15:02:03.000000000 +0100 ++++ openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp 2016-12-26 02:36:46.775167402 +0000 +@@ -1,6 +1,6 @@ + /* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +- * Copyright 2008 Red Hat, Inc. ++ * Copyright 2016 Red Hat, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -25,6 +25,7 @@ + + #include "precompiled.hpp" + #include "assembler_zero.inline.hpp" ++#include "entry_zero.hpp" + #include "memory/resourceArea.hpp" + #include "nativeInst_zero.hpp" + #include "oops/oop.inline.hpp"