# HG changeset patch # User stuefe # Date 1519795864 0 # Node ID c6b5a99cea9e2a4491cc3630c9511ed741dc0132 # Parent de8045923ad264b7750140582f2d7a4eb86f1c0c 8078628: linux-zero does not build without precompiled header Summary: add missing includes Reviewed-by: coleenp, stefank, sgehwolf, dholmes diff -r de8045923ad2 -r c6b5a99cea9e src/cpu/zero/vm/entry_zero.hpp --- a/src/cpu/zero/vm/entry_zero.hpp Mon Dec 18 18:18:10 2017 -0500 +++ b/src/cpu/zero/vm/entry_zero.hpp Wed Feb 28 05:31:04 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -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 -r de8045923ad2 -r c6b5a99cea9e src/cpu/zero/vm/nativeInst_zero.cpp --- a/src/cpu/zero/vm/nativeInst_zero.cpp Mon Dec 18 18:18:10 2017 -0500 +++ b/src/cpu/zero/vm/nativeInst_zero.cpp Wed Feb 28 05:31:04 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright 2008 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -25,6 +25,8 @@ #include "precompiled.hpp" #include "assembler_zero.inline.hpp" +#include "entry_zero.hpp" +#include "interpreter/cppInterpreter.hpp" #include "memory/resourceArea.hpp" #include "nativeInst_zero.hpp" #include "oops/oop.inline.hpp" diff -r de8045923ad2 -r c6b5a99cea9e src/share/vm/code/codeCache.cpp --- a/src/share/vm/code/codeCache.cpp Mon Dec 18 18:18:10 2017 -0500 +++ b/src/share/vm/code/codeCache.cpp Wed Feb 28 05:31:04 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,6 +41,7 @@ #include "oops/oop.inline.hpp" #include "runtime/handles.inline.hpp" #include "runtime/arguments.hpp" +#include "runtime/deoptimization.hpp" #include "runtime/icache.hpp" #include "runtime/java.hpp" #include "runtime/mutexLocker.hpp" diff -r de8045923ad2 -r c6b5a99cea9e src/share/vm/interpreter/cppInterpreterGenerator.hpp --- a/src/share/vm/interpreter/cppInterpreterGenerator.hpp Mon Dec 18 18:18:10 2017 -0500 +++ b/src/share/vm/interpreter/cppInterpreterGenerator.hpp Wed Feb 28 05:31:04 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,6 +29,9 @@ // of the template interpreter generator. #ifdef CC_INTERP +#ifdef TARGET_ARCH_zero +# include "entry_zero.hpp" +#endif class CppInterpreterGenerator: public AbstractInterpreterGenerator { protected: diff -r de8045923ad2 -r c6b5a99cea9e src/share/vm/interpreter/interpreter.hpp --- a/src/share/vm/interpreter/interpreter.hpp Mon Dec 18 18:18:10 2017 -0500 +++ b/src/share/vm/interpreter/interpreter.hpp Wed Feb 28 05:31:04 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,11 +28,9 @@ #include "code/stubs.hpp" #include "interpreter/cppInterpreter.hpp" #include "interpreter/templateInterpreter.hpp" -#ifdef ZERO #ifdef TARGET_ARCH_zero # include "entry_zero.hpp" #endif -#endif // This file contains the platform-independent parts // of the interpreter and the interpreter generator. diff -r de8045923ad2 -r c6b5a99cea9e src/share/vm/runtime/frame.hpp --- a/src/share/vm/runtime/frame.hpp Mon Dec 18 18:18:10 2017 -0500 +++ b/src/share/vm/runtime/frame.hpp Wed Feb 28 05:31:04 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -45,11 +45,9 @@ # include "adfiles/adGlobals_ppc_64.hpp" #endif #endif // COMPILER2 -#ifdef ZERO #ifdef TARGET_ARCH_zero # include "stack_zero.hpp" #endif -#endif typedef class BytecodeInterpreter* interpreterState; diff -r de8045923ad2 -r c6b5a99cea9e src/share/vm/runtime/frame.inline.hpp --- a/src/share/vm/runtime/frame.inline.hpp Mon Dec 18 18:18:10 2017 -0500 +++ b/src/share/vm/runtime/frame.inline.hpp Wed Feb 28 05:31:04 2018 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -46,14 +46,12 @@ #ifdef TARGET_ARCH_ppc # include "jniTypes_ppc.hpp" #endif -#ifdef ZERO #ifdef TARGET_ARCH_zero # include "entryFrame_zero.hpp" # include "fakeStubFrame_zero.hpp" # include "interpreterFrame_zero.hpp" # include "sharkFrame_zero.hpp" #endif -#endif // This file holds platform-independent bodies of inline functions for frames. diff -r de8045923ad2 -r c6b5a99cea9e src/share/vm/runtime/thread.hpp --- a/src/share/vm/runtime/thread.hpp Mon Dec 18 18:18:10 2017 -0500 +++ b/src/share/vm/runtime/thread.hpp Wed Feb 28 05:31:04 2018 +0000 @@ -51,11 +51,9 @@ #include "gc_implementation/g1/dirtyCardQueue.hpp" #include "gc_implementation/g1/satbQueue.hpp" #endif // INCLUDE_ALL_GCS -#ifdef ZERO #ifdef TARGET_ARCH_zero # include "stack_zero.hpp" #endif -#endif class ThreadSafepointState; class ThreadProfiler;