Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit dddd147

Browse files
authored
Merge pull request #72 from JakubVanek/feature/loom
Updated Loom support
2 parents a728024 + cd578e0 commit dddd147

File tree

3 files changed

+71
-4
lines changed

3 files changed

+71
-4
lines changed

‎scripts/config.sh‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,12 +323,13 @@ elif [ "$JDKVER" == "loom" ] || [ "$JDKVER" == "tip" ]; then
323323
VERSION_SUFFIX="ev3-loom-experimental"
324324
JAVA_REPO="https://github.com/openjdk/loom.git"
325325
JAVA_BRANCH="fibers"
326+
PATCHVER="loom"
326327
else
327328
VERSION_POLICY="latest_tag"
328329
JAVA_REPO="https://github.com/openjdk/jdk.git"
330+
PATCHVER="jdk15"
329331
fi
330332
JAVA_SCM="git"
331-
PATCHVER="jdk15"
332333
AUTOGEN_STYLE="v2"
333334
if [ "$BUILDER_TYPE" = "native" ]; then
334335
HOSTJDK="$BUILDDIR/jdk-ev3"
@@ -342,9 +343,9 @@ elif [ "$JDKVER" == "loom" ] || [ "$JDKVER" == "tip" ]; then
342343
fi
343344
else
344345
# same for both stretch & buster
345-
HOSTJDK="$BUILDDIR/jdk-14.0.1+7"
346-
HOSTJDK_FILE="$BUILDDIR/OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz"
347-
HOSTJDK_URL="https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.1%2B7/OpenJDK14U-jdk_x64_linux_hotspot_14.0.1_7.tar.gz"
346+
HOSTJDK="$BUILDDIR/jdk-15.0.1+9"
347+
HOSTJDK_FILE="$BUILDDIR/OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz"
348+
HOSTJDK_URL="https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz"
348349
fi
349350
IMAGEDIR="$JDKDIR/build/linux-arm-${JDKVM}-${HOTSPOT_DEBUG}/images"
350351
HOTSPOT_ABI=arm-sflt

‎scripts/loom_new.patch‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
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 a0b1ac36c..776bbb70e 100644
19+
--- a/src/hotspot/share/memory/metaspaceShared.cpp
20+
+++ b/src/hotspot/share/memory/metaspaceShared.cpp
21+
@@ -69,6 +69,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+
}

‎scripts/loom_nosflt.patch‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
2+
index dd04ad1ab..d43e29e5a 100644
3+
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp
4+
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp
5+
@@ -1248,10 +1248,11 @@ extern int __aeabi_dcmpgt(double, double);
6+
7+
// Imported code from glibc soft-fp bundle for
8+
// calculation accuracy improvement. See CR 6757269.
9+
-extern double __aeabi_fadd_glibc(float, float);
10+
-extern double __aeabi_fsub_glibc(float, float);
11+
-extern double __aeabi_dadd_glibc(double, double);
12+
-extern double __aeabi_dsub_glibc(double, double);
13+
+#define __aeabi_fadd_glibc __aeabi_fadd
14+
+#define __aeabi_fsub_glibc __aeabi_fsub
15+
+#define __aeabi_dadd_glibc __aeabi_dadd
16+
+#define __aeabi_dsub_glibc __aeabi_dsub
17+
+
18+
};
19+
#endif // __SOFTFP__
20+

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /