Mercurial > hg > openjdk > jdk7u > hotspot
changeset 5803:85455f630351
8078628: linux-zero does not build without precompiled headers
Summary: add missing includes
Reviewed-by: aph
| author | andrew |
|---|---|
| date | Mon, 15 Jan 2018 17:22:36 +0000 |
| parents | d8a079873393 |
| children | d2335c3ba9e9 |
| files | src/cpu/zero/vm/entry_zero.hpp src/cpu/zero/vm/methodHandles_zero.hpp src/cpu/zero/vm/nativeInst_zero.cpp src/share/vm/interpreter/cppInterpreterGenerator.hpp src/share/vm/prims/methodHandles.hpp |
| diffstat | 5 files changed, 20 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/zero/vm/entry_zero.hpp Fri Jan 12 16:53:46 2018 +0000 +++ b/src/cpu/zero/vm/entry_zero.hpp Mon Jan 15 17:22:36 2018 +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() {
--- a/src/cpu/zero/vm/methodHandles_zero.hpp Fri Jan 12 16:53:46 2018 +0000 +++ b/src/cpu/zero/vm/methodHandles_zero.hpp Mon Jan 15 17:22:36 2018 +0000 @@ -1,6 +1,6 @@ /* * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011, 2013, Red Hat, Inc. + * Copyright (c) 2011, 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 @@ -23,6 +23,8 @@ * */ +#ifndef CPU_ZERO_VM_METHODHANDLES_ZERO_HPP +#define CPU_ZERO_VM_METHODHANDLES_ZERO_HPP // Adapters static unsigned int adapter_code_size() { @@ -37,3 +39,5 @@ static int method_handle_entry_linkToVirtual(methodOop method, intptr_t UNUSED, TRAPS); static int method_handle_entry_linkToInterface(methodOop method, intptr_t UNUSED, TRAPS); static int method_handle_entry_invalid(methodOop method, intptr_t UNUSED, TRAPS); + +#endif // CPU_ZERO_VM_METHODHANDLES_ZERO_HPP
--- a/src/cpu/zero/vm/nativeInst_zero.cpp Fri Jan 12 16:53:46 2018 +0000 +++ b/src/cpu/zero/vm/nativeInst_zero.cpp Mon Jan 15 17:22:36 2018 +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"
--- a/src/share/vm/interpreter/cppInterpreterGenerator.hpp Fri Jan 12 16:53:46 2018 +0000 +++ b/src/share/vm/interpreter/cppInterpreterGenerator.hpp Mon Jan 15 17:22:36 2018 +0000 @@ -1,5 +1,6 @@ /* * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -28,6 +29,10 @@ // This file contains the platform-independent parts // of the template interpreter generator. +#ifdef TARGET_ARCH_zero +#include "entry_zero.hpp" +#endif + #ifdef CC_INTERP class CppInterpreterGenerator: public AbstractInterpreterGenerator {
--- a/src/share/vm/prims/methodHandles.hpp Fri Jan 12 16:53:46 2018 +0000 +++ b/src/share/vm/prims/methodHandles.hpp Mon Jan 15 17:22:36 2018 +0000 @@ -1,5 +1,6 @@ /* * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -31,6 +32,10 @@ #include "runtime/globals.hpp" #include "runtime/interfaceSupport.hpp" +#ifdef TARGET_ARCH_zero +#include "entry_zero.hpp" +#endif + class MacroAssembler; class Label;