/hg/icedtea7-forest/hotspot: 8078628, PR3151: Zero build fails w...

[andrew at icedtea.classpath.org]

changeset 1d13eeada397 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=1d13eeada397
author: andrew
date: Tue Oct 25 04:22:24 2016 +0100

	8078628, PR3151: Zero build fails with pre-compiled headers disabled


diffstat:

 src/cpu/zero/vm/entry_zero.hpp                       |  4 +++-
 src/cpu/zero/vm/methodHandles_zero.hpp               |  6 +++++-
 src/cpu/zero/vm/nativeInst_zero.cpp                  |  3 ++-
 src/share/vm/interpreter/cppInterpreterGenerator.hpp |  5 +++++
 src/share/vm/prims/methodHandles.hpp                 |  5 +++++
 5 files changed, 20 insertions(+), 3 deletions(-)

diffs (107 lines):

diff -r c7d4a58dc3b6 -r 1d13eeada397 src/cpu/zero/vm/entry_zero.hpp
--- a/src/cpu/zero/vm/entry_zero.hpp	Thu Oct 06 15:11:35 2016 +0000
+++ b/src/cpu/zero/vm/entry_zero.hpp	Tue Oct 25 04:22:24 2016 +0100
@@ -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 -r c7d4a58dc3b6 -r 1d13eeada397 src/cpu/zero/vm/methodHandles_zero.hpp
--- a/src/cpu/zero/vm/methodHandles_zero.hpp	Thu Oct 06 15:11:35 2016 +0000
+++ b/src/cpu/zero/vm/methodHandles_zero.hpp	Tue Oct 25 04:22:24 2016 +0100
@@ -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() {
@@ -39,3 +41,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
diff -r c7d4a58dc3b6 -r 1d13eeada397 src/cpu/zero/vm/nativeInst_zero.cpp
--- a/src/cpu/zero/vm/nativeInst_zero.cpp	Thu Oct 06 15:11:35 2016 +0000
+++ b/src/cpu/zero/vm/nativeInst_zero.cpp	Tue Oct 25 04:22:24 2016 +0100
@@ -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"
diff -r c7d4a58dc3b6 -r 1d13eeada397 src/share/vm/interpreter/cppInterpreterGenerator.hpp
--- a/src/share/vm/interpreter/cppInterpreterGenerator.hpp	Thu Oct 06 15:11:35 2016 +0000
+++ b/src/share/vm/interpreter/cppInterpreterGenerator.hpp	Tue Oct 25 04:22:24 2016 +0100
@@ -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 {
diff -r c7d4a58dc3b6 -r 1d13eeada397 src/share/vm/prims/methodHandles.hpp
--- a/src/share/vm/prims/methodHandles.hpp	Thu Oct 06 15:11:35 2016 +0000
+++ b/src/share/vm/prims/methodHandles.hpp	Tue Oct 25 04:22:24 2016 +0100
@@ -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;