Re-merge branch 'openjdk-10-stretch' into openjdk-10

build/Dockerfile.system

@@ -39,7 +39,7 @@ RUN dpkg --add-architecture armel && \
         cpio \
         gawk \
         file \
-        zip \
+        pigz \
         unzip \
         procps \
         autoconf \

build/fetch.sh

@@ -15,4 +15,6 @@ cd "$JDKDIR"
 patch -p1 < "$SCRIPTDIR/ev3.patch"
 #  - use the system-provided floating point implementation
 patch -p1 < "$SCRIPTDIR/float.patch"
+#  - remove illegal memory barriers on armv5
+patch -p1 < "$SCRIPTDIR/barrier.patch"
 

build/zip.sh

@@ -9,9 +9,6 @@ cd "$IMAGEDIR"
 
 # clean destinations
 rm -rf ./jre-ev3
-rm -rf ./jdk-pc
-rm -rf ./jshell-support
-rm -f  ./jdk-ev3
 
 # build ev3 runtime image
 "$SCRIPTDIR/jdk-10/bin/jlink" \
@@ -21,32 +18,10 @@ rm -f  ./jdk-ev3
    --strip-debug \
    --no-header-files \
    --no-man-pages \
-   --add-modules java.se,jdk.jdwp.agent,jdk.jshell \
+   --add-modules java.se,jdk.jdwp.agent \
    --output ./jre-ev3
 
-# build microjdk
-"$SCRIPTDIR/jdk-10/bin/jlink" \
-   --module-path "$SCRIPTDIR/jdk-10/jmods" \
-   --compress 2 \
-   --strip-debug \
-   --no-header-files \
-   --no-man-pages \
-   --add-modules java.se,jdk.attach,jdk.jdwp.agent,jdk.jlink,jdk.jartool,jdk.compiler,jdk.jdi,jdk.jshell \
-   --output ./jdk-pc
-
-cp -r ./jmods ./jdk-pc/jmods-ev3
-
-# rename jdk directory
-ln -s ./jdk ./jdk-ev3
-
-# JShell hack
-mkdir jshell-support
-"$SCRIPTDIR/jdk-10/bin/javac" -d ./jshell-support "$SCRIPTDIR/jshellhack/DumpPort.java"
-"$SCRIPTDIR/jdk-10/bin/jar" cf ./jshellhack.jar -C ./jshell-support jshellhack/DumpPort.class
-cp ./jshellhack.jar ./jdk-pc/bin
-cp "$SCRIPTDIR/jshell-launch.sh" ./jdk-pc/bin
-
 # create zip files
-zip -9r "$BUILDDIR/jdk-ev3.zip" jdk-ev3
-zip -9r "$BUILDDIR/jre-ev3.zip" jre-ev3
-zip -9r "$BUILDDIR/jdk-pc.zip"  jdk-pc
+tar -cf - jre-ev3 | pigz -9 > "$BUILDDIR/jre-ev3.tar.gz"
+tar -cf - jdk     | pigz -9 > "$BUILDDIR/jdk-ev3.tar.gz"
+tar -cf - jmods   | pigz -9 > "$BUILDDIR/jmods.tar.gz"