Skip to content

Commit 49121cc

Browse files
committed
[scripts] Extend Zero-interpreter support
1 parent b32cda9 commit 49121cc

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ otherwise the build would get discarded. The final build needs at least 6.5 GB o
2626
```
2727
sudo docker run --rm -it -v <path on host, where the sources should be stored>:/build ev3dev-lang-java:jdk-build
2828
```
29-
4. Select the OpenJDK version you want to cross-compile:
29+
4. Select the OpenJDK version you want to cross-compile (select only one):
3030
```
31-
export JDKVER=9
32-
export JDKVER=10
31+
export JDKVER=9 # OpenJDK 9 with ARM32 JIT
32+
export JDKVER=9zero # OpenJDK 9 with Zero interpreter
33+
export JDKVER=10 # OpenJDK 10 with ARM32 JIT
34+
export JDKVER=10zero # OpenJDK 10 with Zero interpreter
3335
```
3436
5. Before we can start the build process, Boot JDK must be downloaded:
3537
```

scripts/config.sh

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,29 @@ LEJOSEND="-final"
5353
#LEJOS_NAME=openjdk9-jri
5454

5555
# OpenJDK 9
56-
if [ "$JDKVER" -eq "9" ]; then
56+
if [ "$JDKVER" -eq "9" ] || [ "$JDKVER" -eq "9zero" ]; then
5757
JAVA_REPO="http://hg.openjdk.java.net/jdk-updates/jdk9u/"
5858
PATCHVER="jdk9"
5959
AUTOGEN_PATH="./common/autoconf/autogen.sh"
60-
HOTSPOT_VARIANT=client
60+
if [ "$JDKVER" -eq "9zero" ]; then
61+
HOTSPOT_VARIANT=zero
62+
else
63+
HOTSPOT_VARIANT=client
64+
fi
6165
HOSTJDK="$BUILDDIR/jdk-9.0.4"
6266
HOSTJDK_FILE="$BUILDDIR/openjdk-9.0.4_linux-x64_bin.tar.gz"
6367
HOSTJDK_URL="https://download.java.net/java/GA/jdk9/9.0.4/binaries/openjdk-9.0.4_linux-x64_bin.tar.gz"
6468

6569
# OpenJDK 10
66-
elif [ "$JDKVER" -eq "10" ]; then
70+
elif [ "$JDKVER" -eq "10" ] || [ "$JDKVER" -eq "10zero" ]; then
6771
JAVA_REPO="http://hg.openjdk.java.net/jdk-updates/jdk10u/"
6872
PATCHVER="jdk10"
6973
AUTOGEN_PATH="./make/autoconf/autogen.sh"
70-
HOTSPOT_VARIANT=client
74+
if [ "$JDKVER" -eq "10zero" ]; then
75+
HOTSPOT_VARIANT=zero
76+
else
77+
HOTSPOT_VARIANT=client
78+
fi
7179
HOSTJDK="$BUILDDIR/jdk-10"
7280
HOSTJDK_FILE="$BUILDDIR/openjdk-10_linux-x64_bin.tar.gz"
7381
HOSTJDK_URL="https://download.java.net/java/GA/jdk10/10/binaries/openjdk-10_linux-x64_bin.tar.gz"

0 commit comments

Comments
 (0)