.gitignore

@@ -1,2 +1,2 @@
-SOURCES/shenandoah8u412-b08.tar.xz
+SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u372-b07-4curve.tar.xz
 SOURCES/tapsets-icedtea-3.15.0.tar.xz

.java-1.8.0-openjdk.metadata

@@ -1,2 +1,2 @@
-9cb6b4c557e9a433fe4c16b3996f998335cec8a5 SOURCES/shenandoah8u412-b08.tar.xz
+3f015b60e085b0e1f0fd9ea13abf775a890c2b1b SOURCES/openjdk-shenandoah-jdk8u-shenandoah-jdk8u372-b07-4curve.tar.xz
 7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz

SOURCES/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch

@@ -22,7 +22,7 @@ diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/fla
 +    # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
 +    # While waiting for a better solution, the current workaround is to use -mstackrealign
 +    # This is also required on Linux systems which use libraries compiled with SSE instructions
-+    REALIGN_CFLAG="-mincoming-stack-boundary=2 -mpreferred-stack-boundary=4"
++    REALIGN_CFLAG="-mstackrealign"
 +    FLAGS_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
 +      AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
 +    )

SOURCES/jdk8218811-perfMemory_linux.patch

@@ -0,0 +1,12 @@
+diff --git openjdk.orig/hotspot/src/os/linux/vm/perfMemory_linux.cpp openjdk/hotspot/src/os/linux/vm/perfMemory_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/perfMemory_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/perfMemory_linux.cpp
+@@ -878,7 +878,7 @@
+ 
+   // open the file
+   int result;
+-  RESTARTABLE(::open(filename, oflags), result);
++  RESTARTABLE(::open(filename, oflags, 0), result);
+   if (result == OS_ERR) {
+     if (errno == ENOENT) {
+       THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(),

SOURCES/jdk8271199-rh2175317-custom_pkcs11_provider_support.patch

@@ -0,0 +1,167 @@
+commit d41618f34f1d2f5416ec3c035f33dcb15cf5ab99
+Author: Alexey Bakhtin <abakhtin@openjdk.org>
+Date:   Tue Apr 4 10:29:11 2023 +0000
+
+    8271199: Mutual TLS handshake fails signing client certificate with custom sensitive PKCS11 key
+    
+    Reviewed-by: andrew, mbalao
+    Backport-of: f6232982b91cb2314e96ddbde3984836a810a556
+
+diff --git a/jdk/src/share/classes/sun/security/rsa/RSAPSSSignature.java b/jdk/src/share/classes/sun/security/rsa/RSAPSSSignature.java
+index a79e97d7c74..5378446b97b 100644
+--- a/jdk/src/share/classes/sun/security/rsa/RSAPSSSignature.java
++++ b/jdk/src/share/classes/sun/security/rsa/RSAPSSSignature.java
+@@ -127,12 +127,15 @@ public class RSAPSSSignature extends SignatureSpi {
+     @Override
+     protected void engineInitVerify(PublicKey publicKey)
+             throws InvalidKeyException {
+-        if (!(publicKey instanceof RSAPublicKey)) {
++        if (publicKey instanceof RSAPublicKey) {
++            RSAPublicKey rsaPubKey = (RSAPublicKey)publicKey;
++            isPublicKeyValid(rsaPubKey);
++            this.pubKey = rsaPubKey;
++            this.privKey = null;
++            resetDigest();
++        } else {
+             throw new InvalidKeyException("key must be RSAPublicKey");
+         }
+-        this.pubKey = (RSAPublicKey) isValid((RSAKey)publicKey);
+-        this.privKey = null;
+-        resetDigest();
+     }
+ 
+     // initialize for signing. See JCA doc
+@@ -146,14 +149,17 @@ public class RSAPSSSignature extends SignatureSpi {
+     @Override
+     protected void engineInitSign(PrivateKey privateKey, SecureRandom random)
+             throws InvalidKeyException {
+-        if (!(privateKey instanceof RSAPrivateKey)) {
++        if (privateKey instanceof RSAPrivateKey) {
++            RSAPrivateKey rsaPrivateKey = (RSAPrivateKey)privateKey;
++            isPrivateKeyValid(rsaPrivateKey);
++            this.privKey = rsaPrivateKey;
++            this.pubKey = null;
++            this.random =
++                    (random == null ? JCAUtil.getSecureRandom() : random);
++            resetDigest();
++        } else {
+             throw new InvalidKeyException("key must be RSAPrivateKey");
+         }
+-        this.privKey = (RSAPrivateKey) isValid((RSAKey)privateKey);
+-        this.pubKey = null;
+-        this.random =
+-            (random == null? JCAUtil.getSecureRandom() : random);
+-        resetDigest();
+     }
+ 
+     /**
+@@ -205,11 +211,57 @@ public class RSAPSSSignature extends SignatureSpi {
+         }
+     }
+ 
++    /**
++     * Validate the specified RSAPrivateKey
++     */
++    private void isPrivateKeyValid(RSAPrivateKey prKey)  throws InvalidKeyException {
++        try {
++            if (prKey instanceof RSAPrivateCrtKey) {
++                RSAPrivateCrtKey crtKey = (RSAPrivateCrtKey)prKey;
++                if (RSAPrivateCrtKeyImpl.checkComponents(crtKey)) {
++                    RSAKeyFactory.checkRSAProviderKeyLengths(
++                            crtKey.getModulus().bitLength(),
++                            crtKey.getPublicExponent());
++                } else {
++                    throw new InvalidKeyException(
++                            "Some of the CRT-specific components are not available");
++                }
++            } else {
++                RSAKeyFactory.checkRSAProviderKeyLengths(
++                        prKey.getModulus().bitLength(),
++                        null);
++            }
++        } catch (InvalidKeyException ikEx) {
++            throw ikEx;
++        } catch (Exception e) {
++            throw new InvalidKeyException(
++                    "Can not access private key components", e);
++        }
++        isValid(prKey);
++    }
++
++    /**
++     * Validate the specified RSAPublicKey
++     */
++    private void isPublicKeyValid(RSAPublicKey pKey)  throws InvalidKeyException {
++        try {
++            RSAKeyFactory.checkRSAProviderKeyLengths(
++                    pKey.getModulus().bitLength(),
++                    pKey.getPublicExponent());
++        } catch (InvalidKeyException ikEx) {
++            throw ikEx;
++        } catch (Exception e) {
++            throw new InvalidKeyException(
++                    "Can not access public key components", e);
++        }
++        isValid(pKey);
++    }
++
+     /**
+      * Validate the specified RSAKey and its associated parameters against
+      * internal signature parameters.
+      */
+-    private RSAKey isValid(RSAKey rsaKey) throws InvalidKeyException {
++    private void isValid(RSAKey rsaKey) throws InvalidKeyException {
+         try {
+             AlgorithmParameterSpec keyParams = rsaKey.getParams();
+             // validate key parameters
+@@ -227,7 +279,6 @@ public class RSAPSSSignature extends SignatureSpi {
+                 }
+                 checkKeyLength(rsaKey, hLen, this.sigParams.getSaltLength());
+             }
+-            return rsaKey;
+         } catch (SignatureException e) {
+             throw new InvalidKeyException(e);
+         }
+diff --git a/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java b/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
+index 6b219937981..b3c1fae9672 100644
+--- a/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
++++ b/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
+@@ -80,22 +80,28 @@ public final class RSAPrivateCrtKeyImpl
+         RSAPrivateCrtKeyImpl key = new RSAPrivateCrtKeyImpl(encoded);
+         // check all CRT-specific components are available, if any one
+         // missing, return a non-CRT key instead
+-        if ((key.getPublicExponent().signum() == 0) ||
+-            (key.getPrimeExponentP().signum() == 0) ||
+-            (key.getPrimeExponentQ().signum() == 0) ||
+-            (key.getPrimeP().signum() == 0) ||
+-            (key.getPrimeQ().signum() == 0) ||
+-            (key.getCrtCoefficient().signum() == 0)) {
++        if (checkComponents(key)) {
++            return key;
++        } else {
+             return new RSAPrivateKeyImpl(
+                 key.algid,
+                 key.getModulus(),
+-                key.getPrivateExponent()
+-            );
+-        } else {
+-            return key;
++                key.getPrivateExponent());
+         }
+     }
+ 
++    /**
++     * Validate if all CRT-specific components are available.
++     */
++    static boolean checkComponents(RSAPrivateCrtKey key) {
++        return !((key.getPublicExponent().signum() == 0) ||
++            (key.getPrimeExponentP().signum() == 0) ||
++            (key.getPrimeExponentQ().signum() == 0) ||
++            (key.getPrimeP().signum() == 0) ||
++            (key.getPrimeQ().signum() == 0) ||
++            (key.getCrtCoefficient().signum() == 0));
++    }
++
+     /**
+      * Generate a new key from the specified type and components.
+      * Returns a CRT key if possible and a non-CRT key otherwise.

SOURCES/pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch

@@ -7,11 +7,10 @@
 8074839: Resolve disabled warnings for libunpack and the unpack200 binary
 Reviewed-by: dholmes, ksrini
 
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
-index bdaf95a2f6a..60c5b4f2a69 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
-@@ -63,7 +63,7 @@ struct bytes {
+@@ -63,7 +63,7 @@
      bytes res;
      res.ptr = ptr + beg;
      res.len = end - beg;
@@ -20,11 +19,10 @@ index bdaf95a2f6a..60c5b4f2a69 100644
      return res;
    }
    // building C strings inside byte buffers:
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
-index 5fbc7261fb3..4c002e779d8 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
-@@ -292,7 +292,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_getUnusedInput(JNIEnv *env, jobject
+@@ -292,7 +292,7 @@
  
    if (uPtr->aborting()) {
      THROW_IOE(uPtr->get_abort_message());
@@ -33,16 +31,16 @@ index 5fbc7261fb3..4c002e779d8 100644
    }
  
    // We have fetched all the files.
-@@ -312,7 +312,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
-   // There's no need to create a new unpacker here if we don't already have one
-   // just to immediatly free it afterwards.
-   unpacker* uPtr = get_unpacker(env, pObj, /* noCreate= */ true);
+@@ -310,7 +310,7 @@
+ JNIEXPORT jlong JNICALL
+ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
+   unpacker* uPtr = get_unpacker(env, pObj, false);
 -  CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
 +  CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0);
    size_t consumed = uPtr->input_consumed();
-   // free_unpacker() will set the unpacker field on 'pObj' to null
    free_unpacker(env, pObj, uPtr);
-@@ -323,6 +323,7 @@ JNIEXPORT jboolean JNICALL
+   return consumed;
+@@ -320,6 +320,7 @@
  Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj,
                                         jstring pProp, jstring pValue) {
    unpacker*   uPtr  = get_unpacker(env, pObj);
@@ -50,11 +48,10 @@ index 5fbc7261fb3..4c002e779d8 100644
    const char* prop  = env->GetStringUTFChars(pProp, JNI_FALSE);
    CHECK_EXCEPTION_RETURN_VALUE(prop, false);
    const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
-index 6fbc43a18ae..722c8baaff0 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
-@@ -142,31 +142,28 @@ static const char* nbasename(const char* progname) {
+@@ -142,31 +142,28 @@
    return progname;
  }
  
@@ -104,11 +101,10 @@ index 6fbc43a18ae..722c8baaff0 100644
    }
  }
  
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
-index 56f391b1e87..f0a25f8cd20 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
-@@ -225,9 +225,9 @@ struct entry {
+@@ -222,9 +222,9 @@
    }
  
  #ifdef PRODUCT
@@ -120,7 +116,7 @@ index 56f391b1e87..f0a25f8cd20 100644
  #endif
  };
  
-@@ -718,13 +718,13 @@ void unpacker::read_file_header() {
+@@ -715,13 +715,13 @@
    // Now we can size the whole archive.
    // Read everything else into a mega-buffer.
    rp = hdr.rp;
@@ -138,7 +134,7 @@ index 56f391b1e87..f0a25f8cd20 100644
        abort("EOF reading fixed input buffer");
        return;
      }
-@@ -738,7 +738,7 @@ void unpacker::read_file_header() {
+@@ -735,7 +735,7 @@
        return;
      }
      input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
@@ -147,7 +143,7 @@ index 56f391b1e87..f0a25f8cd20 100644
      CHECK;
      assert(input.limit()[0] == 0);
      // Move all the bytes we read initially into the real buffer.
-@@ -961,13 +961,13 @@ void cpool::init(unpacker* u_, int counts[CONSTANT_Limit]) {
+@@ -958,13 +958,13 @@
    nentries = next_entry;
  
    // place a limit on future CP growth:
@@ -163,7 +159,7 @@ index 56f391b1e87..f0a25f8cd20 100644
  
    // Note that this CP does not include "empty" entries
    // for longs and doubles.  Those are introduced when
-@@ -985,8 +985,9 @@ void cpool::init(unpacker* u_, int counts[CONSTANT_Limit]) {
+@@ -982,8 +982,9 @@
    }
  
    // Initialize *all* our entries once
@@ -174,7 +170,7 @@ index 56f391b1e87..f0a25f8cd20 100644
  
    initGroupIndexes();
    // Initialize hashTab to a generous power-of-two size.
-@@ -3681,21 +3682,22 @@ void cpool::computeOutputIndexes() {
+@@ -3677,21 +3678,22 @@
  
  unpacker* debug_u;
  
@@ -201,7 +197,7 @@ index 56f391b1e87..f0a25f8cd20 100644
    case CONSTANT_Signature:
      if (value.b.ptr == null)
        return ref(0)->string();
-@@ -3715,26 +3717,28 @@ char* entry::string() {
+@@ -3711,26 +3713,28 @@
      break;
    default:
      if (nrefs == 0) {
@@ -239,11 +235,10 @@ index 56f391b1e87..f0a25f8cd20 100644
  }
  
  void print_cp_entries(int beg, int end) {
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
-index cec7a88b24e..ed5f3336a59 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
-@@ -209,7 +209,7 @@ struct unpacker {
+@@ -209,7 +209,7 @@
    byte*     rp;          // read pointer (< rplimit <= input.limit())
    byte*     rplimit;     // how much of the input block has been read?
    julong    bytes_read;
@@ -252,11 +247,10 @@ index cec7a88b24e..ed5f3336a59 100644
  
    // callback to read at least one byte, up to available input
    typedef jlong (*read_input_fn_t)(unpacker* self, void* buf, jlong minlen, jlong maxlen);
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
-index e5197e1a3f1..40a10055ea5 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
-@@ -81,7 +81,7 @@ void breakpoint() { }  // hook for debugger
+@@ -81,7 +81,7 @@
  int assert_failed(const char* p) {
    char message[1<<12];
    sprintf(message, "@assert failed: %s\n", p);
@@ -265,11 +259,10 @@ index e5197e1a3f1..40a10055ea5 100644
    breakpoint();
    unpack_abort(message);
    return 0;
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
-index f58c94956c0..343da3e183b 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
-@@ -84,7 +84,7 @@ void jar::init(unpacker* u_) {
+@@ -84,7 +84,7 @@
  }
  
  // Write data to the ZIP output stream.
@@ -278,7 +271,7 @@ index f58c94956c0..343da3e183b 100644
    while (len > 0) {
      int rc = (int)fwrite(buff, 1, len, jarfp);
      if (rc <= 0) {
-@@ -323,12 +323,12 @@ void jar::write_central_directory() {
+@@ -323,12 +323,12 @@
      // Total number of disks (int)
      header64[36] = (ushort)SWAP_BYTES(1);
      header64[37] = 0;
@@ -293,11 +286,10 @@ index f58c94956c0..343da3e183b 100644
  
    PRINTCR((2, "writing zip comment\n"));
    // Write the comment.
-diff --git openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-index 14ffc9d65bd..9877f6f68ca 100644
---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+diff --git openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-@@ -68,8 +68,8 @@ struct jar {
+@@ -68,8 +68,8 @@
    }
  
    // Private Methods

SOURCES/remove-intree-libraries.sh

@@ -0,0 +1,131 @@
+#!/bin/sh
+
+ZIP_SRC=openjdk/jdk/src/share/native/java/util/zip/zlib
+JPEG_SRC=openjdk/jdk/src/share/native/sun/awt/image/jpeg
+GIF_SRC=openjdk/jdk/src/share/native/sun/awt/giflib
+PNG_SRC=openjdk/jdk/src/share/native/sun/awt/libpng
+LCMS_SRC=openjdk/jdk/src/share/native/sun/java2d/cmm/lcms
+
+echo "Removing built-in libs (they will be linked)"
+
+echo "Removing zlib"
+if [ ! -d ${ZIP_SRC} ]; then
+	echo "${ZIP_SRC} does not exist. Refusing to proceed."
+	exit 1
+fi	
+rm -rvf ${ZIP_SRC}
+
+echo "Removing libjpeg"
+if [ ! -f ${JPEG_SRC}/jdhuff.c ]; then # some file that sound definitely exist
+	echo "${JPEG_SRC} does not contain jpeg sources. Refusing to proceed."
+	exit 1
+fi	
+
+rm -vf ${JPEG_SRC}/jcomapi.c
+rm -vf ${JPEG_SRC}/jdapimin.c
+rm -vf ${JPEG_SRC}/jdapistd.c
+rm -vf ${JPEG_SRC}/jdcoefct.c
+rm -vf ${JPEG_SRC}/jdcolor.c
+rm -vf ${JPEG_SRC}/jdct.h
+rm -vf ${JPEG_SRC}/jddctmgr.c
+rm -vf ${JPEG_SRC}/jdhuff.c
+rm -vf ${JPEG_SRC}/jdhuff.h
+rm -vf ${JPEG_SRC}/jdinput.c
+rm -vf ${JPEG_SRC}/jdmainct.c
+rm -vf ${JPEG_SRC}/jdmarker.c
+rm -vf ${JPEG_SRC}/jdmaster.c
+rm -vf ${JPEG_SRC}/jdmerge.c
+rm -vf ${JPEG_SRC}/jdphuff.c
+rm -vf ${JPEG_SRC}/jdpostct.c
+rm -vf ${JPEG_SRC}/jdsample.c
+rm -vf ${JPEG_SRC}/jerror.c
+rm -vf ${JPEG_SRC}/jerror.h
+rm -vf ${JPEG_SRC}/jidctflt.c
+rm -vf ${JPEG_SRC}/jidctfst.c
+rm -vf ${JPEG_SRC}/jidctint.c
+rm -vf ${JPEG_SRC}/jidctred.c
+rm -vf ${JPEG_SRC}/jinclude.h
+rm -vf ${JPEG_SRC}/jmemmgr.c
+rm -vf ${JPEG_SRC}/jmemsys.h
+rm -vf ${JPEG_SRC}/jmemnobs.c
+rm -vf ${JPEG_SRC}/jmorecfg.h
+rm -vf ${JPEG_SRC}/jpegint.h
+rm -vf ${JPEG_SRC}/jpeglib.h
+rm -vf ${JPEG_SRC}/jquant1.c
+rm -vf ${JPEG_SRC}/jquant2.c
+rm -vf ${JPEG_SRC}/jutils.c
+rm -vf ${JPEG_SRC}/jcapimin.c
+rm -vf ${JPEG_SRC}/jcapistd.c
+rm -vf ${JPEG_SRC}/jccoefct.c
+rm -vf ${JPEG_SRC}/jccolor.c
+rm -vf ${JPEG_SRC}/jcdctmgr.c
+rm -vf ${JPEG_SRC}/jchuff.c
+rm -vf ${JPEG_SRC}/jchuff.h
+rm -vf ${JPEG_SRC}/jcinit.c
+rm -vf ${JPEG_SRC}/jconfig.h
+rm -vf ${JPEG_SRC}/jcmainct.c
+rm -vf ${JPEG_SRC}/jcmarker.c
+rm -vf ${JPEG_SRC}/jcmaster.c
+rm -vf ${JPEG_SRC}/jcparam.c
+rm -vf ${JPEG_SRC}/jcphuff.c
+rm -vf ${JPEG_SRC}/jcprepct.c
+rm -vf ${JPEG_SRC}/jcsample.c
+rm -vf ${JPEG_SRC}/jctrans.c
+rm -vf ${JPEG_SRC}/jdtrans.c
+rm -vf ${JPEG_SRC}/jfdctflt.c
+rm -vf ${JPEG_SRC}/jfdctfst.c
+rm -vf ${JPEG_SRC}/jfdctint.c
+rm -vf ${JPEG_SRC}/jversion.h
+rm -vf ${JPEG_SRC}/README
+
+echo "Removing giflib"
+if [ ! -d ${GIF_SRC} ]; then
+	echo "${GIF_SRC} does not exist. Refusing to proceed."
+	exit 1
+fi	
+rm -rvf ${GIF_SRC}
+
+echo "Removing libpng"
+if [ ! -d ${PNG_SRC} ]; then
+	echo "${PNG_SRC} does not exist. Refusing to proceed."
+	exit 1
+fi	
+rm -rvf ${PNG_SRC}
+
+echo "Removing lcms"
+if [ ! -d ${LCMS_SRC} ]; then
+	echo "${LCMS_SRC} does not exist. Refusing to proceed."
+	exit 1
+fi
+# temporary change to move bundled LCMS
+if [ ! true ]; then
+rm -vf ${LCMS_SRC}/cmsalpha.c
+rm -vf ${LCMS_SRC}/cmscam02.c
+rm -vf ${LCMS_SRC}/cmscgats.c
+rm -vf ${LCMS_SRC}/cmscnvrt.c
+rm -vf ${LCMS_SRC}/cmserr.c
+rm -vf ${LCMS_SRC}/cmsgamma.c
+rm -vf ${LCMS_SRC}/cmsgmt.c
+rm -vf ${LCMS_SRC}/cmshalf.c
+rm -vf ${LCMS_SRC}/cmsintrp.c
+rm -vf ${LCMS_SRC}/cmsio0.c
+rm -vf ${LCMS_SRC}/cmsio1.c
+rm -vf ${LCMS_SRC}/cmslut.c
+rm -vf ${LCMS_SRC}/cmsmd5.c
+rm -vf ${LCMS_SRC}/cmsmtrx.c
+rm -vf ${LCMS_SRC}/cmsnamed.c
+rm -vf ${LCMS_SRC}/cmsopt.c
+rm -vf ${LCMS_SRC}/cmspack.c
+rm -vf ${LCMS_SRC}/cmspcs.c
+rm -vf ${LCMS_SRC}/cmsplugin.c
+rm -vf ${LCMS_SRC}/cmsps2.c
+rm -vf ${LCMS_SRC}/cmssamp.c
+rm -vf ${LCMS_SRC}/cmssm.c
+rm -vf ${LCMS_SRC}/cmstypes.c
+rm -vf ${LCMS_SRC}/cmsvirt.c
+rm -vf ${LCMS_SRC}/cmswtpnt.c
+rm -vf ${LCMS_SRC}/cmsxform.c
+rm -vf ${LCMS_SRC}/lcms2.h
+rm -vf ${LCMS_SRC}/lcms2_internal.h
+rm -vf ${LCMS_SRC}/lcms2_plugin.h
+fi

SOURCES/s390-8214206_fix.patch

@@ -16,7 +16,7 @@ diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenan
    Atomic::add(val, &_sum);
  
 -  int mag = log2_intptr(val) + 1;
-+  int mag = log2_long(val) + 1;
++  int mag = log2_intptr((uintptr_t)val) + 1;
  
    // Defensively saturate for product bits:
    if (mag < 0) {