diff options
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch index 018640b..b09745c 100644 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch +++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build-pt2.patch @@ -1,38 +1,11 @@ ---- hotspot/src/cpu/zero/vm/entry_zero.hpp.orig +--- hotspot/src/cpu/zero/vm/entry_zero.hpp +++ hotspot/src/cpu/zero/vm/entry_zero.hpp -@@ -26,6 +26,10 @@ +@@ -26,6 +26,8 @@ #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP #define CPU_ZERO_VM_ENTRY_ZERO_HPP +#include "utilities/globalDefinitions.hpp" +#include "utilities/exceptions.hpp" -+#include "interpreter/cppInterpreter.hpp" -+ - class ZeroEntry { - public: - ZeroEntry() { ---- hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp.orig -+++ hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp -@@ -30,6 +30,10 @@ - - #ifdef CC_INTERP + #include "interpreter/cppInterpreter.hpp" -+#ifdef TARGET_ARCH_zero -+#include "entry_zero.hpp" -+#endif -+ - class CppInterpreterGenerator: public AbstractInterpreterGenerator { - protected: - // shared code sequences ---- hotspot/src/cpu/zero/vm/nativeInst_zero.cpp.orig -+++ hotspot/src/cpu/zero/vm/nativeInst_zero.cpp -@@ -26,6 +26,9 @@ - #include "precompiled.hpp" - #include "assembler_zero.inline.hpp" - #include "memory/resourceArea.hpp" -+#ifdef CC_INTERP -+#include "entry_zero.hpp" -+#endif - #include "nativeInst_zero.hpp" - #include "oops/oop.inline.hpp" - #include "runtime/handles.hpp" + class ZeroEntry { |