Commit 59add99

committed

Try to fix build failure (linker cannot find vtable_start_...)

1 parent 09f8784 commit 59add99Copy full SHA for 59add99

File tree

+18

-0

lines changed

+18

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,12 @@ if [ ! -d "$JDKDIR" ]; then`
`141`	`141`	`PATCHES="$PATCHES cds"`
`142`	`142`	`fi`
`143`	`143`
	`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`	`+`
`144`	`150`	`# write patches to metadata`
`145`	`151`	`echo "[FETCH] Patches applied: $PATCHES"`
`146`	`152`	`echo "JAVA_PATCHES=\"$PATCHES\"" >>"$BUILDDIR/metadata"`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff 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`

Comments

(0)