Skip to content

Commit 59add99

Browse files
committed
Try to fix build failure (linker cannot find vtable_start_...)
1 parent 09f8784 commit 59add99

2 files changed

Lines changed: 18 additions & 0 deletions

File tree

scripts/fetch.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,12 @@ if [ ! -d "$JDKDIR" ]; then
141141
PATCHES="$PATCHES cds"
142142
fi
143143

144+
# generic broken build
145+
if [ -f "$SCRIPTDIR/${PATCHVER}_klassinline.patch" ]; then
146+
patch -p1 -i "$SCRIPTDIR/${PATCHVER}_klassinline.patch"
147+
PATCHES="$PATCHES klassinline"
148+
fi
149+
144150
# write patches to metadata
145151
echo "[FETCH] Patches applied: $PATCHES"
146152
echo "JAVA_PATCHES=\"$PATCHES\"" >>"$BUILDDIR/metadata"

scripts/jdk14_klassinline.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/src/hotspot/cpu/arm/vtableStubs_arm.cpp b/src/hotspot/cpu/arm/vtableStubs_arm.cpp
2+
index 2c564b818..f84e11662 100644
3+
--- a/src/hotspot/cpu/arm/vtableStubs_arm.cpp
4+
+++ b/src/hotspot/cpu/arm/vtableStubs_arm.cpp
5+
@@ -32,6 +32,7 @@
6+
#include "oops/compiledICHolder.hpp"
7+
#include "oops/instanceKlass.hpp"
8+
#include "oops/klassVtable.hpp"
9+
+#include "oops/klass.inline.hpp"
10+
#include "runtime/sharedRuntime.hpp"
11+
#include "vmreg_arm.inline.hpp"
12+
#ifdef COMPILER2

0 commit comments

Comments
 (0)