|
| 1 | +diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4 |
| 2 | +index 43653c115..4c5f960a8 100644 |
| 3 | +--- a/make/autoconf/hotspot.m4 |
| 4 | ++++ b/make/autoconf/hotspot.m4 |
| 5 | +@@ -138,6 +138,11 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_MISC], |
| 6 | + HOTSPOT_TARGET_CPU_DEFINE="ARM32" |
| 7 | + fi |
| 8 | + |
| 9 | ++ if test "x$OPENJDK_BUILD_CPU" = xarm; then |
| 10 | ++ HOTSPOT_BUILD_CPU=arm_32 |
| 11 | ++ HOTSPOT_BUILD_CPU_DEFINE="ARM32" |
| 12 | ++ fi |
| 13 | ++ |
| 14 | + # --with-cpu-port is no longer supported |
| 15 | + UTIL_DEPRECATED_ARG_WITH(with-cpu-port) |
| 16 | + |
| 17 | +diff --git a/src/hotspot/share/memory/metaspaceShared.cpp b/src/hotspot/share/memory/metaspaceShared.cpp |
| 18 | +index 7adecd141..e895e21d1 100644 |
| 19 | +--- a/src/hotspot/share/memory/metaspaceShared.cpp |
| 20 | ++++ b/src/hotspot/share/memory/metaspaceShared.cpp |
| 21 | +@@ -71,6 +71,7 @@ |
| 22 | + #include "utilities/ostream.hpp" |
| 23 | + #include "utilities/defaultStream.hpp" |
| 24 | + #include "utilities/hashtable.inline.hpp" |
| 25 | ++#include "gc/shared/softRefPolicy.hpp" |
| 26 | + #if INCLUDE_G1GC |
| 27 | + #include "gc/g1/g1CollectedHeap.inline.hpp" |
| 28 | + #endif |
| 29 | +diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp |
| 30 | +index 1761efa7a..cd0602cd0 100644 |
| 31 | +--- a/src/hotspot/share/oops/constantPool.cpp |
| 32 | ++++ b/src/hotspot/share/oops/constantPool.cpp |
| 33 | +@@ -443,8 +443,12 @@ void ConstantPool::remove_unshareable_info() { |
| 34 | + } |
| 35 | + |
| 36 | + int ConstantPool::cp_to_object_index(int cp_index) { |
| 37 | ++ Array<u2> *map = reference_map(); |
| 38 | ++ if (map == 0) |
| 39 | ++ return _no_index_sentinel; |
| 40 | ++ |
| 41 | + // this is harder don't do this so much. |
| 42 | +- int i = reference_map()->find(cp_index); |
| 43 | ++ int i = map->find(cp_index); |
| 44 | + // We might not find the index for jsr292 call. |
| 45 | + return (i < 0) ? _no_index_sentinel : i; |
| 46 | + } |
0 commit comments