diff --git a/8210473-JEP-345-NUMA-Aware-Memory-Allocation-for-G1.patch b/8210473-JEP-345-NUMA-Aware-Memory-Allocation-for-G1.patch
index cd864670c626c2efe9c2069f65169c5009e19891..778e1ee201e2819dbe07e77f7d745ed1eb6616b3 100644
--- a/8210473-JEP-345-NUMA-Aware-Memory-Allocation-for-G1.patch
+++ b/8210473-JEP-345-NUMA-Aware-Memory-Allocation-for-G1.patch
@@ -235,9 +235,9 @@ index 721a3b649..3c42c23e1 100644
 +  };
 +  static NumaAllocationPolicy _current_numa_policy;
 +
-  public:
-   static int sched_getcpu()  { return _sched_getcpu != NULL ? _sched_getcpu() : -1; }
-   static int numa_node_to_cpus(int node, unsigned long *buffer, int bufferlen) {
+
+ #ifdef __GLIBC__
+   struct glibc_mallinfo {
 @@ -290,6 +309,24 @@ class Linux {
    static int numa_tonode_memory(void *start, size_t size, int node) {
      return _numa_tonode_memory != NULL ? _numa_tonode_memory(start, size, node) : -1;
diff --git a/8225648-TESTBUG-java-lang-annotation-loaderLeak-Main.patch b/8225648-TESTBUG-java-lang-annotation-loaderLeak-Main.patch
index 8f9fbacb14c4e888fd2fda943d39b266a8d9cc2e..7645eaec0d8a17d4941f6c6132fb4652e0b6e7e5 100644
--- a/8225648-TESTBUG-java-lang-annotation-loaderLeak-Main.patch
+++ b/8225648-TESTBUG-java-lang-annotation-loaderLeak-Main.patch
@@ -11,7 +11,7 @@ Bug url: https://bugs.openjdk.java.net/browse/JDK-8225648
  1 file changed, 1 insertion(+)
 
 diff --git a/test/jdk/java/lang/annotation/loaderLeak/Main.java b/test/jdk/java/lang/annotation/loaderLeak/Main.java
-index 7e249ebc1..4245008f8 100644
+index 58bd63b..aedbc2e 100644
 --- a/test/jdk/java/lang/annotation/loaderLeak/Main.java
 +++ b/test/jdk/java/lang/annotation/loaderLeak/Main.java
 @@ -54,6 +54,7 @@ public class Main {
diff --git a/8231441-3-AArch64-Initial-SVE-backend-support.patch b/8231441-3-AArch64-Initial-SVE-backend-support.patch
index b6bbacb1e4cdbd447bbaeb86811a1774dfb5556c..3691f9dfefabf92ff666d4b6d844072bd2500fab 100755
--- a/8231441-3-AArch64-Initial-SVE-backend-support.patch
+++ b/8231441-3-AArch64-Initial-SVE-backend-support.patch
@@ -5852,7 +5852,7 @@ index 265cd0888..590fd8662 100644
 -  int step = (save_vectors ? 8 : 4) * wordSize;
 +void MacroAssembler::push_CPU_state(bool save_vectors, bool use_sve,
 +                                         int sve_vector_size_in_bytes) {
-   push(0x3fffffff, sp);         // integer registers except lr & sp
+   push(RegSet::range(r0, r29), sp);         // integer registers except lr & sp
 -  mov(rscratch1, -step);
 -  sub(sp, sp, step);
 -  for (int i = 28; i >= 4; i -= 4) {
@@ -5894,9 +5894,9 @@ index 265cd0888..590fd8662 100644
 +      ld1(as_FloatRegister(i), as_FloatRegister(i+1), as_FloatRegister(i+2),
 +          as_FloatRegister(i+3), restore_vectors ? T2D : T1D, Address(post(sp, step)));
 +  }
-   pop(0x3fffffff, sp);         // integer registers except lr & sp
- }
- 
+
+   // integer registers except lr & sp
+   pop(RegSet::range(r0, r17), sp);
 @@ -2703,6 +2757,21 @@ Address MacroAssembler::spill_address(int size, int offset, Register tmp)
    return Address(base, offset);
  }
diff --git a/Add-KAE-implementation.patch b/Add-KAE-implementation.patch
index 77e1ca751623cf89e7098a8818a89ed0f10158da..f364cbe80c79af8d3dfa68fdd1ead2e744e474ae 100755
--- a/Add-KAE-implementation.patch
+++ b/Add-KAE-implementation.patch
@@ -14,7 +14,7 @@ Bug url: NA
  make/autoconf/spec.gmk.in                     |   1 +
  make/common/Modules.gmk                       |  13 +
  make/copy/Copy-jdk.crypto.kaeprovider.gmk     |  46 +
- make/lib/Lib-jdk.crypto.kaeprovider.gmk       |  51 ++
+ make/lib/Lib-jdk.crypto.kaeprovider.gmk       |  45 ++
  make/nb_native/nbproject/configurations.xml   | 104 +++
  src/java.base/share/classes/module-info.java  |  10 +-
  .../share/lib/security/default.policy         |   5 +
@@ -82,7 +82,7 @@ Bug url: NA
  .../openssl/RSASignatureBenchmark.java        |  90 ++
  .../bench/security/openssl/SM3Benchmark.java  |  98 +++
  .../bench/security/openssl/SM4Benchmark.java  | 157 ++++
- 74 files changed, 10539 insertions(+), 4 deletions(-)
+ 74 files changed, 10533 insertions(+), 4 deletions(-)
  create mode 100644 make/copy/Copy-jdk.crypto.kaeprovider.gmk
  create mode 100644 make/lib/Lib-jdk.crypto.kaeprovider.gmk
  create mode 100644 src/jdk.crypto.kaeprovider/linux/classes/module-info.java
@@ -298,7 +298,7 @@ new file mode 100644
 index 000000000..516a957d0
 --- /dev/null
 +++ b/make/lib/Lib-jdk.crypto.kaeprovider.gmk
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,45 @@
 +#
 +# Copyright (c) 2021, Huawei Technologies Co., Ltd. All rights reserved.
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -326,11 +326,6 @@ index 000000000..516a957d0
 +
 +include LibCommon.gmk
 +
-+LIBMEMCPY_FILES += \
-+        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
-+                memcpy.cpp \
-+        )
-+
 +################################################################################
 +
 +ifeq ($(ENABLE_KAE), true)
@@ -338,7 +333,6 @@ index 000000000..516a957d0
 +    $(eval $(call SetupJdkLibrary, BUILD_LIBJ2KAE, \
 +        NAME := j2kae, \
 +        OPTIMIZATION := LOW, \
-+        EXTRA_FILES := $(LIBMEMCPY_FILES), \
 +        CFLAGS := $(CFLAGS_JDKLIB), \
 +        LDFLAGS := $(LDFLAGS_JDKLIB) \
 +            $(call SET_SHARED_LIBRARY_ORIGIN), \
diff --git a/Fix-the-memcpy-symbol-issue-during-JDK11-x64-build.patch b/Fix-the-memcpy-symbol-issue-during-JDK11-x64-build.patch
deleted file mode 100755
index b6ac2b6766e52ef1d40a186168cb70e5333f8d22..0000000000000000000000000000000000000000
--- a/Fix-the-memcpy-symbol-issue-during-JDK11-x64-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ae703c0e86c278359f1bddcf35ccba87b556d901 Mon Sep 17 00:00:00 2001
-Date: Thu, 18 Mar 2021 12:37:11 +0000
-Subject: [PATCH 4/4] Fix the memcpy symbol issue during JDK11 x64 build
-
----
- make/lib/Awt2dLibraries.gmk | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
-index 207a459ae..7b0441507 100644
---- a/make/lib/Awt2dLibraries.gmk
-+++ b/make/lib/Awt2dLibraries.gmk
-@@ -597,6 +597,7 @@ else
-   $(eval $(call SetupJdkLibrary, BUILD_LIBHARFBUZZ, \
-       NAME := harfbuzz, \
-       EXCLUDE_FILES := $(LIBHARFBUZZ_EXCLUDE_FILES), \
-+      EXTRA_FILES := $(LIBMEMCPY_FILES), \
-       TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-       CFLAGS := $(CFLAGS_JDKLIB) $(LIBHARFBUZZ_CFLAGS), \
-       CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBHARFBUZZ_CFLAGS), \
--- 
-2.19.0
-
diff --git a/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch b/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch
index 2fba5977dc211812b2b35f9d5d51986a4e1c42a2..539f2e807dbe061d2013f9b6b7caff67da4cddb3 100755
--- a/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch
+++ b/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch
@@ -367,4 +367,4 @@ index 000000000..85b49171c
 --- /dev/null
 +++ b/version.txt
 @@ -0,0 +1 @@
-+11.0.10.0.13
++11.0.15.0.13
diff --git a/delete_expired_certificates.patch b/delete_expired_certificates.patch
index acf3dcde59d770e782436e2f53d7c86a1172dec9..2f9cd73af0c69bcff2de77fda6efc027b38ff729 100644
--- a/delete_expired_certificates.patch
+++ b/delete_expired_certificates.patch
@@ -1,78 +1,35 @@
-diff --git a/make/data/cacerts/addtrustexternalca b/make/data/cacerts/addtrustexternalca
+diff --git a/make/data/cacerts/geotrustglobalca b/make/data/cacerts/geotrustglobalca
 deleted file mode 100644
-index ad84cad96..000000000
---- a/make/data/cacerts/addtrustexternalca
+index 7f8bf9a66..000000000
+--- a/make/data/cacerts/geotrustglobalca
 +++ /dev/null
-@@ -1,32 +0,0 @@
--Owner: CN=AddTrust External CA Root, OU=AddTrust External TTP Network, O=AddTrust AB, C=SE
--Issuer: CN=AddTrust External CA Root, OU=AddTrust External TTP Network, O=AddTrust AB, C=SE
--Serial number: 1
--Valid from: Tue May 30 10:48:38 GMT 2000 until: Sat May 30 10:48:38 GMT 2020
+@@ -1,27 +0,0 @@
+-Owner: CN=GeoTrust Global CA, O=GeoTrust Inc., C=US
+-Issuer: CN=GeoTrust Global CA, O=GeoTrust Inc., C=US
+-Serial number: 23456
+-Valid from: Tue May 21 04:00:00 GMT 2002 until: Sat May 21 04:00:00 GMT 2022
 -Signature algorithm name: SHA1withRSA
 -Subject Public Key Algorithm: 2048-bit RSA key
 -Version: 3
 ------BEGIN CERTIFICATE-----
--MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
--MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
--IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
--MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
--FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
--bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
--dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
--H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
--uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
--mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
--a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
--E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
--WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
--VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
--Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
--cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
--IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
--AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
--YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
--6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
--Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
--c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
--mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
-------END CERTIFICATE-----
-diff --git a/make/data/cacerts/addtrustqualifiedca b/make/data/cacerts/addtrustqualifiedca
-deleted file mode 100644
-index 0c62d44c7..000000000
---- a/make/data/cacerts/addtrustqualifiedca
-+++ /dev/null
-@@ -1,32 +0,0 @@
--Owner: CN=AddTrust Qualified CA Root, OU=AddTrust TTP Network, O=AddTrust AB, C=SE
--Issuer: CN=AddTrust Qualified CA Root, OU=AddTrust TTP Network, O=AddTrust AB, C=SE
--Serial number: 1
--Valid from: Tue May 30 10:44:50 GMT 2000 until: Sat May 30 10:44:50 GMT 2020
--Signature algorithm name: SHA1withRSA
--Subject Public Key Algorithm: 2048-bit RSA key
--Version: 3
-------BEGIN CERTIFICATE-----
--MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU
--MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
--b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1
--MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK
--EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh
--BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B
--AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq
--xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G
--87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i
--2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U
--WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1
--0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G
--A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T
--AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr
--pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL
--ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm
--aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv
--hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm
--hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
--dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3
--P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y
--iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no
--xqE=
+-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
+-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+-YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
+-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
+-R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
+-9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
+-fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
+-iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
+-1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
+-bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
+-MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
+-ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
+-uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
+-Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
+-tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
+-PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
+-hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
+-5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
 ------END CERTIFICATE-----
 diff --git a/make/data/cacerts/luxtrustglobalrootca b/make/data/cacerts/luxtrustglobalrootca
 deleted file mode 100644
@@ -155,47 +112,8 @@ index 0c195ff51..000000000
 -xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
 -SnQ2+Q==
 ------END CERTIFICATE-----
-diff --git a/make/data/cacerts/utnuserfirstobjectca b/make/data/cacerts/utnuserfirstobjectca
-deleted file mode 100644
-index 80a0b5c23..000000000
---- a/make/data/cacerts/utnuserfirstobjectca
-+++ /dev/null
-@@ -1,33 +0,0 @@
--Owner: CN=UTN-USERFirst-Object, OU=http://www.usertrust.com, O=The USERTRUST Network, L=Salt Lake City, ST=UT, C=US
--Issuer: CN=UTN-USERFirst-Object, OU=http://www.usertrust.com, O=The USERTRUST Network, L=Salt Lake City, ST=UT, C=US
--Serial number: 44be0c8b500024b411d3362de0b35f1b
--Valid from: Fri Jul 09 18:31:20 GMT 1999 until: Tue Jul 09 18:40:36 GMT 2019
--Signature algorithm name: SHA1withRSA
--Subject Public Key Algorithm: 2048-bit RSA key
--Version: 3
-------BEGIN CERTIFICATE-----
--MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCB
--lTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
--Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
--dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAbBgNVBAMTFFVUTi1VU0VSRmlyc3Qt
--T2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAzNlowgZUxCzAJBgNV
--BAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAc
--BgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3
--dy51c2VydHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCC
--ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicP
--HxzfOpuCaDDASmEd8S8O+r5596Uj71VRloTN2+O5bj4x2AogZ8f02b+U60cEPgLO
--KqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQw5ujm9M89RKZd7G3CeBo
--5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vulBe3/IW+
--pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehb
--kkj7RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUC
--AwEAAaOBrzCBrDALBgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
--FgQU2u1kdBScFDyr3ZmpvVsoTYs8ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDov
--L2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmlyc3QtT2JqZWN0LmNybDApBgNV
--HSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQwDQYJKoZIhvcN
--AQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw
--NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXB
--mMiKVl0+7kNOPmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU
--4U3GDZlDAQ0Slox4nb9QorFEqmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK5
--81OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCGhU3IfdeLA/5u1fedFqySLKAj5ZyR
--Uh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g=
-------END CERTIFICATE-----
 diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
-index 91d78e8fe..68f85e215 100644
+index 122a01901..c131bd493 100644
 --- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
 +++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
 @@ -53,12 +53,12 @@ public class VerifyCACerts {
@@ -203,30 +121,26 @@ index 91d78e8fe..68f85e215 100644
  
      // The numbers of certs now.
 -    private static final int COUNT = 89;
-+    private static final int COUNT = 84;
++    private static final int COUNT = 86;
  
      // SHA-256 of cacerts, can be generated with
      // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
      private static final String CHECKSUM
 -            = "CC:AD:BB:49:70:97:3F:42:AD:73:91:A0:A2:C4:B8:AA:D1:95:59:F3:B3:22:09:2A:1F:2C:AB:04:47:08:EF:AA";
-+            = "D3:05:21:64:FA:D7:CD:29:E8:CB:57:E7:47:ED:79:9B:47:D8:0E:75:2D:CA:83:BB:86:AF:D9:43:FD:3E:17:85";
++            = "89:78:5A:96:F4:B2:68:4C:91:C0:32:2C:ED:2D:6B:3B:26:B8:37:C3:07:DD:9E:50:87:53:53:7A:24:98:97:E0";
  
      // map of cert alias to SHA-256 fingerprint
      @SuppressWarnings("serial")
-@@ -92,12 +92,6 @@ public class VerifyCACerts {
-                     "E7:93:C9:B0:2F:D8:AA:13:E2:1C:31:22:8A:CC:B0:81:19:64:3B:74:9C:89:89:64:B1:74:6D:46:C3:D4:CB:D2");
-             put("usertrusteccca [jdk]",
-                     "4F:F4:60:D5:4B:9C:86:DA:BF:BC:FC:57:12:E0:40:0D:2B:ED:3F:BC:4D:4F:BD:AA:86:E0:6A:DC:D2:A9:AD:7A");
--            put("utnuserfirstobjectca [jdk]",
--                    "6F:FF:78:E4:00:A7:0C:11:01:1C:D8:59:77:C4:59:FB:5A:F9:6A:3D:F0:54:08:20:D0:F4:B8:60:78:75:E5:8F");
--            put("addtrustexternalca [jdk]",
--                    "68:7F:A4:51:38:22:78:FF:F0:C8:B1:1F:8D:43:D5:76:67:1C:6E:B2:BC:EA:B4:13:FB:83:D9:65:D0:6D:2F:F2");
--            put("addtrustqualifiedca [jdk]",
--                    "80:95:21:08:05:DB:4B:BC:35:5E:44:28:D8:FD:6E:C2:CD:E3:AB:5F:B9:7A:99:42:98:8E:B8:F4:DC:D0:60:16");
-             put("baltimorecybertrustca [jdk]",
-                     "16:AF:57:A9:F6:76:B0:AB:12:60:95:AA:5E:BA:DE:F2:2A:B3:11:19:D6:44:AC:95:CD:4B:93:DB:F3:F2:6A:EB");
-             put("digicertglobalrootca [jdk]",
-@@ -150,10 +144,6 @@ public class VerifyCACerts {
+@@ -116,8 +116,6 @@ public class VerifyCACerts {
+                     "7E:37:CB:8B:4C:47:09:0C:AB:36:55:1B:A6:F4:5D:B8:40:68:0F:BA:16:6A:95:2D:B1:00:71:7F:43:05:3F:C2");
+             put("digicerthighassuranceevrootca [jdk]",
+                     "74:31:E5:F4:C3:C1:CE:46:90:77:4F:0B:61:E0:54:40:88:3B:A9:A0:1E:D0:0B:A6:AB:D7:80:6E:D3:B1:18:CF");
+-            put("geotrustglobalca [jdk]",
+-                    "FF:85:6A:2D:25:1D:CD:88:D3:66:56:F4:50:12:67:98:CF:AB:AA:DE:40:79:9C:72:2D:E4:D2:B5:DB:36:A7:3A");
+             put("geotrustprimaryca [jdk]",
+                     "37:D5:10:06:C5:12:EA:AB:62:64:21:F1:EC:8C:92:01:3F:C5:F8:2A:E9:8E:E5:33:EB:46:19:B8:DE:B4:D0:6C");
+             put("geotrustprimarycag2 [jdk]",
+@@ -150,10 +148,6 @@ public class VerifyCACerts {
                      "5D:56:49:9B:E4:D2:E0:8B:CF:CA:D0:8A:3E:38:72:3D:50:50:3B:DE:70:69:48:E4:2F:55:60:30:19:E5:28:AE");
              put("letsencryptisrgx1 [jdk]",
                      "96:BC:EC:06:26:49:76:F3:74:60:77:9A:CF:28:C5:A7:CF:E8:A3:C0:AA:E1:1A:8F:FC:EE:05:C0:BD:DF:08:C6");
@@ -237,24 +151,16 @@ index 91d78e8fe..68f85e215 100644
              put("quovadisrootca1g3 [jdk]",
                      "8A:86:6F:D1:B2:76:B5:7E:57:8E:92:1C:65:82:8A:2B:ED:58:E9:F2:F2:88:05:41:34:B7:F1:F4:BF:C9:CC:74");
              put("quovadisrootca2 [jdk]",
-@@ -250,16 +240,14 @@ public class VerifyCACerts {
-     @SuppressWarnings("serial")
-     private static final HashSet<String> EXPIRY_EXC_ENTRIES = new HashSet<>() {
-         {
--            // Valid until: Tue Jul 09 14:40:36 EDT 2019
--            add("utnuserfirstobjectca [jdk]");
--            // Valid until: Sat May 30 10:38:31 GMT 2020
--            add("addtrustexternalca [jdk]");
--            // Valid until: Sat May 30 10:44:50 GMT 2020
--            add("addtrustqualifiedca [jdk]");
-             // Valid until: Wed Mar 17 02:51:37 PDT 2021
-             add("luxtrustglobalrootca [jdk]");
-             // Valid until: Wed Mar 17 11:33:33 PDT 2021
-             add("quovadisrootca [jdk]");
-+	    // Valid until: Wed Dec 15 08:00:00 UTC 2021
-+	    add("globalsignr2ca [jdk]");
-+	    // Valid until: Thu Sep 30 14:01:15 UTC 2021
-+	    add("identrustdstx3 [jdk]");
+@@ -256,12 +250,6 @@ public class VerifyCACerts {
+             add("addtrustexternalca [jdk]");
+             // Valid until: Sat May 30 10:44:50 GMT 2020
+             add("addtrustqualifiedca [jdk]");
+-            // Valid until: Wed Mar 17 02:51:37 PDT 2021
+-            add("luxtrustglobalrootca [jdk]");
+-            // Valid until: Wed Mar 17 11:33:33 PDT 2021
+-            add("quovadisrootca [jdk]");
+-            // Valid until: Sat May 21 04:00:00 GMT 2022
+-            add("geotrustglobalca [jdk]");
          }
      };
  
diff --git a/downgrade-the-symver-of-memcpy-GLIBC_2.14-on-x86.patch b/downgrade-the-symver-of-memcpy-GLIBC_2.14-on-x86.patch
new file mode 100644
index 0000000000000000000000000000000000000000..198bac418cd4d70894cc1cc77613b31fcaf66c18
--- /dev/null
+++ b/downgrade-the-symver-of-memcpy-GLIBC_2.14-on-x86.patch
@@ -0,0 +1,80 @@
+From cb846e5c0f8063054d4188b2aa833e20bce72530 Mon Sep 17 00:00:00 2001
+From: zhangyipeng <zhangyipeng7@huawei.com>
+Date: Fri, 18 Mar 2022 16:55:46 +0800
+Subject: [PATCH] [Huawei]downgrade the symver of memcpy@GLIBC_2.14 on x64
+
+Signed-off-by: Sun Jianye <sunjianye@huawei.com>
+---
+ make/common/NativeCompilation.gmk    |  9 +++++++++
+ make/hotspot/lib/CompileJvm.gmk      |  7 +++++++
+ src/hotspot/share/runtime/memcpy.cpp | 20 ++++++++++++++++++++
+ 3 files changed, 36 insertions(+)
+ create mode 100644 src/hotspot/share/runtime/memcpy.cpp
+
+diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
+index 490a7f4..6a9209d 100644
+--- a/make/common/NativeCompilation.gmk
++++ b/make/common/NativeCompilation.gmk
+@@ -1132,6 +1132,15 @@ define SetupNativeCompilationBody
+       endif
+     endif
+ 
++    # if ldflags contain --wrap=memcpy, add memcpy.o to OBJS
++    ifneq ($$(findstring wrap=memcpy, $$($1_LDFLAGS)$$($1_EXTRA_LDFLAGS)),)
++      ifeq ($$(findstring memcpy$(OBJ_SUFFIX), $$($1_ALL_OBJS)),)
++        $$($1_BUILD_INFO):
++	    $(ECHO) 'Adding $(SUPPORT_OUTPUTDIR)/memcpy/memcpy$(OBJ_SUFFIX) to $1_ALL_OBJS'
++        $1_ALL_OBJS += $(SUPPORT_OUTPUTDIR)/memcpy/memcpy$(OBJ_SUFFIX)
++      endif
++    endif
++
+     $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \
+         $$(GLOBAL_LIBS) $$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_MT) \
+         $$($1_CREATE_DEBUGINFO_CMDS) $$($1_MANIFEST_VERSION) \
+diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
+index 5942540..0e7f42f 100644
+--- a/make/hotspot/lib/CompileJvm.gmk
++++ b/make/hotspot/lib/CompileJvm.gmk
+@@ -179,6 +179,13 @@ $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \
+     PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
+ ))
+ 
++MEMCPY_OBJECT_FILE := $(JVM_OUTPUTDIR)/objs/memcpy$(OBJ_SUFFIX)
++$(eval $(call SetupCopyFiles, COPY_MEMCPY_OBJECT_FILE, \
++          DEST := $(SUPPORT_OUTPUTDIR)/memcpy, \
++          FILES :=$(MEMCPY_OBJECT_FILE), \
++))
++TARGETS += $(COPY_MEMCPY_OBJECT_FILE)
++
+ # Always recompile abstract_vm_version.cpp if libjvm needs to be relinked. This ensures
+ # that the internal vm version is updated as it relies on __DATE__ and __TIME__
+ # macros.
+diff --git a/src/hotspot/share/runtime/memcpy.cpp b/src/hotspot/share/runtime/memcpy.cpp
+new file mode 100644
+index 0000000..0fe4fa3
+--- /dev/null
++++ b/src/hotspot/share/runtime/memcpy.cpp
+@@ -0,0 +1,20 @@
++/*
++ * Copyright (c) Huawei Technologies Co., Ltd. 2018-2021. All rights reserved.
++ */
++
++#if defined( __GNUC__ ) && \
++(__GNUC__ >= 5  ||  (__GNUC__ == 4  &&  __GNUC_MINOR__ >= 7)) 
++#include <string.h>
++
++#if (defined AMD64) || (defined amd64)
++/* some systems do not have newest memcpy@@GLIBC_2.14 - stay with old good one */
++asm (".symver memcpy, memcpy@GLIBC_2.2.5");
++
++extern "C"{
++  void *__wrap_memcpy(void *dest, const void *src, size_t n)
++  {
++    return memcpy(dest, src, n);
++  }
++}
++#endif
++#endif
+-- 
+1.8.3.1
+
diff --git a/fix-memcpy-compile-warning-when-building-on-linux-x86.patch b/fix-memcpy-compile-warning-when-building-on-linux-x86.patch
deleted file mode 100755
index f3a962a89fc3bbaf7febaa37b458ccf64eb37af0..0000000000000000000000000000000000000000
--- a/fix-memcpy-compile-warning-when-building-on-linux-x86.patch
+++ /dev/null
@@ -1,550 +0,0 @@
-From 7a3481adb5e52f1fadb6c8a1e16093d9c1082868 Mon Sep 17 00:00:00 2001
-From: s00478819 <sunjianye@huawei.com>
-Date: Thu, 28 Oct 2021 11:54:21 +0800
-Subject: [PATCH 2/3] fix memcpy compile warning when building on linux x86
-
----
- make/hotspot/lib/CompileJvm.gmk         |  7 +++++++
- make/launcher/Launcher-java.base.gmk    |  9 ++-------
- make/launcher/Launcher-jdk.pack.gmk     |  7 +------
- make/lib/Awt2dLibraries.gmk             | 17 ++++++++---------
- make/lib/CoreLibraries.gmk              | 17 ++++++-----------
- make/lib/Lib-java.base.gmk              |  7 +------
- make/lib/Lib-java.desktop.gmk           |  7 +------
- make/lib/Lib-java.instrument.gmk        |  7 +------
- make/lib/Lib-jdk.crypto.cryptoki.gmk    |  7 +------
- make/lib/Lib-jdk.crypto.ec.gmk          |  7 +------
- make/lib/Lib-jdk.crypto.kaeprovider.gmk |  7 +------
- make/lib/Lib-jdk.hotspot.agent.gmk      |  7 +------
- make/lib/Lib-jdk.jdwp.agent.gmk         |  7 +------
- make/lib/Lib-jdk.pack.gmk               |  7 +------
- make/lib/Lib-jdk.sctp.gmk               |  7 +------
- src/hotspot/share/runtime/memcpy.cpp    |  2 +-
- 16 files changed, 35 insertions(+), 94 deletions(-)
-
-diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
-index 594254014..fdb228c3f 100644
---- a/make/hotspot/lib/CompileJvm.gmk
-+++ b/make/hotspot/lib/CompileJvm.gmk
-@@ -179,6 +179,13 @@ $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \
-     PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
- ))
- 
-+MEMCPY_OBJECT_FILE := $(JVM_OUTPUTDIR)/objs/memcpy$(OBJ_SUFFIX)
-+$(eval $(call SetupCopyFiles, COPY_MEMCPY_OBJECT_FILE, \
-+          DEST := $(SUPPORT_OUTPUTDIR), \
-+          FILES :=$(MEMCPY_OBJECT_FILE), \
-+))
-+TARGETS += $(COPY_MEMCPY_OBJECT_FILE)
-+
- # Always recompile abstract_vm_version.cpp if libjvm needs to be relinked. This ensures
- # that the internal vm version is updated as it relies on __DATE__ and __TIME__
- # macros.
-diff --git a/make/launcher/Launcher-java.base.gmk b/make/launcher/Launcher-java.base.gmk
-index d511c0be5..e7f6b04d8 100644
---- a/make/launcher/Launcher-java.base.gmk
-+++ b/make/launcher/Launcher-java.base.gmk
-@@ -30,11 +30,6 @@ $(eval $(call IncludeCustomExtension, launcher/Launcher-java.base.gmk))
- JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/common
- JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
- 
--LIBMEMCPY_FILES += \
--        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
--                memcpy.cpp \
--        )
--
- ################################################################################
- 
- $(eval $(call SetupBuildLauncher, java, \
-@@ -84,10 +79,10 @@ ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix linux), )
-   $(eval $(call SetupJdkExecutable, BUILD_JSPAWNHELPER, \
-       NAME := jspawnhelper, \
-       SRC := $(TOPDIR)/src/$(MODULE)/unix/native/jspawnhelper, \
--      EXTRA_FILES := $(LIBMEMCPY_FILES), \
-       OPTIMIZATION := LOW, \
-       CFLAGS := $(CFLAGS_JDKEXE) -I$(TOPDIR)/src/$(MODULE)/unix/native/libjava, \
--      EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc.o, \
-+      EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc.o \
-+                            $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-       LDFLAGS := $(LDFLAGS_JDKEXE), \
-       OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
-   ))
-diff --git a/make/launcher/Launcher-jdk.pack.gmk b/make/launcher/Launcher-jdk.pack.gmk
-index 2e0bc7a5b..0f4b47174 100644
---- a/make/launcher/Launcher-jdk.pack.gmk
-+++ b/make/launcher/Launcher-jdk.pack.gmk
-@@ -30,11 +30,6 @@ $(eval $(call SetupBuildLauncher, pack200, \
-     MAIN_CLASS := com.sun.java.util.jar.pack.Driver, \
- ))
- 
--LIBMEMCPY_FILES += \
--        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
--                memcpy.cpp \
--        )
--
- ################################################################################
- # The order of the object files on the link command line affects the size of the resulting
- # binary (at least on linux) which causes the size to differ between old and new build.
-@@ -86,7 +81,6 @@ $(eval $(call SetupJdkExecutable, BUILD_UNPACKEXE, \
-     SRC := $(UNPACKEXE_SRC), \
-     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-     OPTIMIZATION := LOW, \
--    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE) -DFULL, \
-     CFLAGS_release := -DPRODUCT, \
-     CFLAGS_linux := -fPIC, \
-@@ -99,6 +93,7 @@ $(eval $(call SetupJdkExecutable, BUILD_UNPACKEXE, \
-     MANIFEST := $(TOPDIR)/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest, \
-     MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
-     EXTRA_OBJECT_FILES := $(UNPACKEXE_ZIPOBJS) \
-+                          $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX) \
- ))
- 
- TARGETS += $(BUILD_UNPACKEXE)
-diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
-index ff4dead2a..f66cd6617 100644
---- a/make/lib/Awt2dLibraries.gmk
-+++ b/make/lib/Awt2dLibraries.gmk
-@@ -35,11 +35,6 @@ LIBAWT_DEFAULT_HEADER_DIRS := \
-     libawt/java2d/pipe \
-     #
- 
--LIBMEMCPY_FILES += \
--        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
--                memcpy.cpp \
--        )
--
- ################################################################################
- 
- # We must not include java.desktop/unix/native/libmlib_image, which is only
-@@ -55,8 +50,8 @@ endif
- $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \
-     NAME := mlib_image, \
-     EXTRA_SRC := common/awt/medialib, \
--    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     EXCLUDE_SRC_PATTERNS := $(BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS), \
-     OPTIMIZATION := HIGHEST, \
-     CFLAGS := $(CFLAGS_JDKLIB) \
-@@ -225,12 +220,12 @@ endif
- $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
-     NAME := awt, \
-     EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \
--    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     EXCLUDES := $(LIBAWT_EXCLUDES), \
-     EXCLUDE_FILES := $(LIBAWT_EXFILES), \
-     OPTIMIZATION := LOW, \
-     CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
-     EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \
-         format-nonliteral parentheses, \
-     DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \
-@@ -334,6 +329,7 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx), )
-         EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \
-         EXTRA_HEADER_DIRS := $(LIBAWT_XAWT_EXTRA_HEADER_DIRS), \
-         EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \
-+        EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-         OPTIMIZATION := LOW, \
-         CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
-             $(X_CFLAGS), \
-@@ -396,6 +392,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
-         common/awt/debug \
-         libawt/java2d, \
-     HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation stringop-truncation, \
-     DISABLED_WARNINGS_clang := tautological-compare, \
-     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
-@@ -437,7 +434,7 @@ endif
- $(eval $(call SetupJdkLibrary, BUILD_LIBJAVAJPEG, \
-     NAME := javajpeg, \
-     INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
--    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     OPTIMIZATION := HIGHEST, \
-     CFLAGS := $(CFLAGS_JDKLIB), \
-     HEADERS_FROM_SRC := $(LIBJPEG_HEADERS_FROM_SRC), \
-@@ -528,6 +525,7 @@ else
-       OPTIMIZATION := HIGHEST, \
-       CFLAGS := $(CFLAGS_JDKLIB) \
-           $(BUILD_LIBFREETYPE_CFLAGS), \
-+      EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-       EXTRA_HEADER_DIRS := $(BUILD_LIBFREETYPE_HEADER_DIRS), \
-       DISABLED_WARNINGS_solstudio := \
-          E_STATEMENT_NOT_REACHED \
-@@ -642,6 +640,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
-     OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
-     CFLAGS_windows = -DCC_NOEX, \
-     EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     EXTRA_SRC := $(LIBFONTMANAGER_EXTRA_SRC), \
-     WARNINGS_AS_ERRORS_xlc := false, \
-     DISABLED_WARNINGS_gcc := sign-compare unused-function int-to-pointer-cast $(HARFBUZZ_DISABLED_WARNINGS_gcc), \
-@@ -867,10 +866,10 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
-       NAME := splashscreen, \
-       EXTRA_SRC := $(LIBSPLASHSCREEN_EXTRA_SRC), \
-       EXCLUDE_SRC_PATTERNS := $(LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS), \
--      EXTRA_FILES := $(LIBMEMCPY_FILES), \
-       EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
-       EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
-       OPTIMIZATION := LOW, \
-+      EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-       CFLAGS := $(CFLAGS_JDKLIB) $(LIBSPLASHSCREEN_CFLAGS) \
-           $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
-       EXTRA_HEADER_DIRS := $(LIBSPLASHSCREEN_HEADER_DIRS), \
-diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk
-index f180a28c3..2f2f46240 100644
---- a/make/lib/CoreLibraries.gmk
-+++ b/make/lib/CoreLibraries.gmk
-@@ -28,11 +28,6 @@ WIN_VERIFY_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify/verify.lib
- # Hook to include the corresponding custom file, if present.
- $(eval $(call IncludeCustomExtension, lib/CoreLibraries.gmk))
- 
--LIBMEMCPY_FILES += \
--        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
--                memcpy.cpp \
--        )
--
- 
- ##########################################################################################
- # libfdlibm is statically linked with libjava below and not delivered into the
-@@ -80,8 +75,8 @@ endif
- 
- $(eval $(call SetupJdkLibrary, BUILD_LIBVERIFY, \
-     NAME := verify, \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
--    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(CFLAGS_JDKLIB), \
-     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
-     DISABLED_WARNINGS_microsoft := 4244 4267, \
-@@ -102,16 +97,15 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
-   BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
- endif
- 
--
- $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
-     NAME := java, \
-     OPTIMIZATION := HIGH, \
--    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(CFLAGS_JDKLIB) \
-         $(LIBJAVA_CFLAGS), \
-     System.c_CFLAGS := $(VERSION_CFLAGS), \
-     jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \
-     EXTRA_HEADER_DIRS := libfdlibm, \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     WARNINGS_AS_ERRORS_xlc := false, \
-     DISABLED_WARNINGS_gcc := unused-result, \
-     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
-@@ -152,8 +146,8 @@ endif
- $(eval $(call SetupJdkLibrary, BUILD_LIBZIP, \
-     NAME := zip, \
-     OPTIMIZATION := LOW, \
--    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     EXCLUDES := $(LIBZIP_EXCLUDES), \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     CFLAGS := $(CFLAGS_JDKLIB) \
-         $(LIBZ_CFLAGS), \
-     CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
-@@ -173,8 +167,8 @@ TARGETS += $(BUILD_LIBZIP)
- $(eval $(call SetupJdkLibrary, BUILD_LIBJIMAGE, \
-     NAME := jimage, \
-     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     OPTIMIZATION := LOW, \
--    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(CFLAGS_JDKLIB), \
-     CXXFLAGS := $(CXXFLAGS_JDKLIB), \
-     CFLAGS_unix := -UDEBUG, \
-@@ -246,7 +240,8 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
-     NAME := jli, \
-     OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
-     EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
--    EXTRA_FILES := $(LIBJLI_EXTRA_FILES) $(LIBMEMCPY_FILES), \
-+    EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     OPTIMIZATION := HIGH, \
-     CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
-     DISABLED_WARNINGS_gcc := unused-function implicit-fallthrough, \
-diff --git a/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk
-index 0c888b65c..6f21969d0 100644
---- a/make/lib/Lib-java.base.gmk
-+++ b/make/lib/Lib-java.base.gmk
-@@ -36,18 +36,13 @@ $(call FillFindCache, $(wildcard $(TOPDIR)/src/java.base/*/native))
- 
- include CoreLibraries.gmk
- 
--LIBMEMCPY_FILES += \
--        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
--                memcpy.cpp \
--        )
--
- ################################################################################
- # Create the network library
- 
- $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \
-     NAME := net, \
-     OPTIMIZATION := LOW, \
--    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     CFLAGS := $(CFLAGS_JDKLIB), \
-     DISABLED_WARNINGS_gcc := format-nonliteral, \
-     DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand, \
-diff --git a/make/lib/Lib-java.desktop.gmk b/make/lib/Lib-java.desktop.gmk
-index 932e0b3e8..e7f8d9208 100644
---- a/make/lib/Lib-java.desktop.gmk
-+++ b/make/lib/Lib-java.desktop.gmk
-@@ -36,11 +36,6 @@ $(call FillFindCache, $(wildcard $(TOPDIR)/src/java.desktop/*/native))
- 
- include Awt2dLibraries.gmk
- 
--LIBMEMCPY_FILES += \
--        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
--                memcpy.cpp \
--        )
--
- ################################################################################
- # Create the libjsound library
- 
-@@ -68,7 +63,7 @@ ifneq ($(OPENJDK_TARGET_OS), aix)
-       NAME := jsound, \
-       TOOLCHAIN := $(LIBJSOUND_TOOLCHAIN), \
-       OPTIMIZATION := LOW, \
--      EXTRA_FILES := $(LIBMEMCPY_FILES), \
-+      EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-       CFLAGS := $(CFLAGS_JDKLIB) \
-           $(LIBJSOUND_CFLAGS), \
-       CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
-diff --git a/make/lib/Lib-java.instrument.gmk b/make/lib/Lib-java.instrument.gmk
-index 6e679b500..012893a11 100644
---- a/make/lib/Lib-java.instrument.gmk
-+++ b/make/lib/Lib-java.instrument.gmk
-@@ -36,19 +36,14 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
-   WINDOWS_JLI_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib
- endif
- 
--LIBMEMCPY_FILES += \
--        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
--                memcpy.cpp \
--        )
--
- $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \
-     NAME := instrument, \
-     OPTIMIZATION := LOW, \
--    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(CFLAGS_JDKLIB) $(LIBINSTRUMENT_CFLAGS), \
-     CFLAGS_debug := -DJPLIS_LOGGING, \
-     CFLAGS_release := -DNO_JPLIS_LOGGING, \
-     EXTRA_HEADER_DIRS := java.base:libjli, \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     LDFLAGS := $(LDFLAGS_JDKLIB) \
-         $(call SET_SHARED_LIBRARY_ORIGIN) \
-         $(LIBINSTRUMENT_LDFLAGS), \
-diff --git a/make/lib/Lib-jdk.crypto.cryptoki.gmk b/make/lib/Lib-jdk.crypto.cryptoki.gmk
-index 6c23857e1..e37b2632e 100644
---- a/make/lib/Lib-jdk.crypto.cryptoki.gmk
-+++ b/make/lib/Lib-jdk.crypto.cryptoki.gmk
-@@ -25,17 +25,12 @@
- 
- include LibCommon.gmk
- 
--LIBMEMCPY_FILES += \
--        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
--                memcpy.cpp \
--        )
--
- ################################################################################
- 
- $(eval $(call SetupJdkLibrary, BUILD_LIBJ2PKCS11, \
-     NAME := j2pkcs11, \
-     OPTIMIZATION := LOW, \
--    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     CFLAGS := $(CFLAGS_JDKLIB), \
-     LDFLAGS := $(LDFLAGS_JDKLIB) \
-         $(call SET_SHARED_LIBRARY_ORIGIN), \
-diff --git a/make/lib/Lib-jdk.crypto.ec.gmk b/make/lib/Lib-jdk.crypto.ec.gmk
-index 4137a371d..50eede676 100644
---- a/make/lib/Lib-jdk.crypto.ec.gmk
-+++ b/make/lib/Lib-jdk.crypto.ec.gmk
-@@ -25,11 +25,6 @@
- 
- include LibCommon.gmk
- 
--LIBMEMCPY_FILES += \
--        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
--                memcpy.cpp \
--        )
--
- ################################################################################
- 
- ifeq ($(ENABLE_INTREE_EC), true)
-@@ -47,7 +42,7 @@ ifeq ($(ENABLE_INTREE_EC), true)
-       NAME := sunec, \
-       TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-       OPTIMIZATION := LOW, \
--      EXTRA_FILES := $(LIBMEMCPY_FILES), \
-+      EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-       CFLAGS := $(BUILD_LIBSUNEC_CFLAGS_JDKLIB) \
-           -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \
-       CXXFLAGS := $(BUILD_LIBSUNEC_CXXFLAGS_JDKLIB), \
-diff --git a/make/lib/Lib-jdk.crypto.kaeprovider.gmk b/make/lib/Lib-jdk.crypto.kaeprovider.gmk
-index 516a957d0..627149944 100644
---- a/make/lib/Lib-jdk.crypto.kaeprovider.gmk
-+++ b/make/lib/Lib-jdk.crypto.kaeprovider.gmk
-@@ -25,11 +25,6 @@
- 
- include LibCommon.gmk
- 
--LIBMEMCPY_FILES += \
--        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
--                memcpy.cpp \
--        )
--
- ################################################################################
- 
- ifeq ($(ENABLE_KAE), true)
-@@ -37,7 +32,7 @@ ifeq ($(ENABLE_KAE), true)
-     $(eval $(call SetupJdkLibrary, BUILD_LIBJ2KAE, \
-         NAME := j2kae, \
-         OPTIMIZATION := LOW, \
--        EXTRA_FILES := $(LIBMEMCPY_FILES), \
-+        EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-         CFLAGS := $(CFLAGS_JDKLIB), \
-         LDFLAGS := $(LDFLAGS_JDKLIB) \
-             $(call SET_SHARED_LIBRARY_ORIGIN), \
-diff --git a/make/lib/Lib-jdk.hotspot.agent.gmk b/make/lib/Lib-jdk.hotspot.agent.gmk
-index 64fb999a9..e0b21ec4f 100644
---- a/make/lib/Lib-jdk.hotspot.agent.gmk
-+++ b/make/lib/Lib-jdk.hotspot.agent.gmk
-@@ -27,11 +27,6 @@ include LibCommon.gmk
- 
- $(eval $(call IncludeCustomExtension, hotspot/lib/Lib-jdk.hotspot.agent.gmk))
- 
--LIBMEMCPY_FILES += \
--        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
--                memcpy.cpp \
--        )
--
- ################################################################################
- 
- ifeq ($(OPENJDK_TARGET_OS), linux)
-@@ -63,13 +58,13 @@ endif
- $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
-     NAME := saproc, \
-     OPTIMIZATION := HIGH, \
--    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     DISABLED_WARNINGS_microsoft := 4267, \
-     DISABLED_WARNINGS_gcc := sign-compare, \
-     DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \
-     CFLAGS := $(CFLAGS_JDKLIB) $(SA_CFLAGS), \
-     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(SA_CFLAGS) $(SA_CXXFLAGS), \
-     EXTRA_SRC := $(LIBSA_EXTRA_SRC), \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_LDFLAGS), \
-     LIBS_linux := $(LIBDL), \
-     LIBS_solaris := -ldl -ldemangle -lthread -lproc, \
-diff --git a/make/lib/Lib-jdk.jdwp.agent.gmk b/make/lib/Lib-jdk.jdwp.agent.gmk
-index 1081b1f30..eb5d22142 100644
---- a/make/lib/Lib-jdk.jdwp.agent.gmk
-+++ b/make/lib/Lib-jdk.jdwp.agent.gmk
-@@ -25,11 +25,6 @@
- 
- include LibCommon.gmk
- 
--LIBMEMCPY_FILES += \
--        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
--                memcpy.cpp \
--        )
--
- ################################################################################
- 
- $(eval $(call SetupJdkLibrary, BUILD_LIBDT_SOCKET, \
-@@ -58,11 +53,11 @@ TARGETS += $(BUILD_LIBDT_SOCKET)
- $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
-     NAME := jdwp, \
-     OPTIMIZATION := LOW, \
--    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING, \
-     EXTRA_HEADER_DIRS := \
-       include \
-       libjdwp/export, \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     LDFLAGS := $(LDFLAGS_JDKLIB) \
-         $(call SET_SHARED_LIBRARY_ORIGIN), \
-     LIBS := $(JDKLIB_LIBS), \
-diff --git a/make/lib/Lib-jdk.pack.gmk b/make/lib/Lib-jdk.pack.gmk
-index 23c87a07d..bfe362b4a 100644
---- a/make/lib/Lib-jdk.pack.gmk
-+++ b/make/lib/Lib-jdk.pack.gmk
-@@ -25,11 +25,6 @@
- 
- include LibCommon.gmk
- 
--LIBMEMCPY_FILES += \
--        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
--                memcpy.cpp \
--        )
--
- ################################################################################
- 
- $(eval $(call SetupJdkLibrary, BUILD_LIBUNPACK, \
-@@ -37,11 +32,11 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBUNPACK, \
-     EXTRA_SRC := common-unpack, \
-     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-     OPTIMIZATION := LOW, \
--    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(CXXFLAGS_JDKLIB) \
-         -DNO_ZLIB -DUNPACK_JNI -DFULL, \
-     CFLAGS_release := -DPRODUCT, \
-     EXTRA_HEADER_DIRS := $(call GetJavaHeaderDir, java.base), \
-+    EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
-     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
-         $(call SET_SHARED_LIBRARY_ORIGIN), \
-diff --git a/make/lib/Lib-jdk.sctp.gmk b/make/lib/Lib-jdk.sctp.gmk
-index f2c1dc0b9..28ae5c463 100644
---- a/make/lib/Lib-jdk.sctp.gmk
-+++ b/make/lib/Lib-jdk.sctp.gmk
-@@ -25,11 +25,6 @@
- 
- include LibCommon.gmk
- 
--LIBMEMCPY_FILES += \
--        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
--                memcpy.cpp \
--        )
--
- ################################################################################
- 
- ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
-@@ -38,12 +33,12 @@ ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
-     $(eval $(call SetupJdkLibrary, BUILD_LIBSCTP, \
-         NAME := sctp, \
-         OPTIMIZATION := LOW, \
--        EXTRA_FILES := $(LIBMEMCPY_FILES), \
-         CFLAGS := $(CFLAGS_JDKLIB), \
-         EXTRA_HEADER_DIRS := \
-             $(call GetJavaHeaderDir, java.base) \
-             java.base:libnet \
-             java.base:libnio/ch, \
-+        EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/memcpy$(OBJ_SUFFIX), \
-         LDFLAGS := $(LDFLAGS_JDKLIB) \
-             $(call SET_SHARED_LIBRARY_ORIGIN), \
-         LIBS_unix := -lnio -lnet -ljava -ljvm, \
-diff --git a/src/hotspot/share/runtime/memcpy.cpp b/src/hotspot/share/runtime/memcpy.cpp
-index ed8330679..0fe4fa3f3 100644
---- a/src/hotspot/share/runtime/memcpy.cpp
-+++ b/src/hotspot/share/runtime/memcpy.cpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved.
-+ * Copyright (c) Huawei Technologies Co., Ltd. 2018-2021. All rights reserved.
-  */
- 
- #if defined( __GNUC__ ) && \
--- 
-2.22.0
-
diff --git a/fix_X509TrustManagerImpl_symantec_distrust.patch b/fix_X509TrustManagerImpl_symantec_distrust.patch
new file mode 100644
index 0000000000000000000000000000000000000000..570e0666d66509e55e529bd7fe86ea0ef06311c3
--- /dev/null
+++ b/fix_X509TrustManagerImpl_symantec_distrust.patch
@@ -0,0 +1,72 @@
+diff --git a/make/data/cacerts/geotrustglobalca b/make/data/cacerts/geotrustglobalca
+new file mode 100644
+index 000000000..7f8bf9a66
+--- /dev/null
++++ b/make/data/cacerts/geotrustglobalca
+@@ -0,0 +1,27 @@
++Owner: CN=GeoTrust Global CA, O=GeoTrust Inc., C=US
++Issuer: CN=GeoTrust Global CA, O=GeoTrust Inc., C=US
++Serial number: 23456
++Valid from: Tue May 21 04:00:00 GMT 2002 until: Sat May 21 04:00:00 GMT 2022
++Signature algorithm name: SHA1withRSA
++Subject Public Key Algorithm: 2048-bit RSA key
++Version: 3
++-----BEGIN CERTIFICATE-----
++MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
++MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
++YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
++EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
++R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
++9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
++fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
++iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
++1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
++bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
++MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
++ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
++uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
++Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
++tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
++PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
++hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
++5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
++-----END CERTIFICATE-----
+diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
+index c131bd493..478cc7235 100644
+--- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
++++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
+@@ -53,12 +53,12 @@ public class VerifyCACerts {
+             + File.separator + "security" + File.separator + "cacerts";
+ 
+     // The numbers of certs now.
+-    private static final int COUNT = 86;
++    private static final int COUNT = 87;
+ 
+     // SHA-256 of cacerts, can be generated with
+     // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
+     private static final String CHECKSUM
+-            = "89:78:5A:96:F4:B2:68:4C:91:C0:32:2C:ED:2D:6B:3B:26:B8:37:C3:07:DD:9E:50:87:53:53:7A:24:98:97:E0";
++            = "63:C4:11:7D:BF:C5:05:2B:BF:C2:B4:5A:2C:B6:26:C4:57:76:FB:D4:48:3B:E7:4C:62:B0:A1:7B:4F:07:B1:0C";
+ 
+     // map of cert alias to SHA-256 fingerprint
+     @SuppressWarnings("serial")
+@@ -116,7 +116,9 @@ public class VerifyCACerts {
+                     "7E:37:CB:8B:4C:47:09:0C:AB:36:55:1B:A6:F4:5D:B8:40:68:0F:BA:16:6A:95:2D:B1:00:71:7F:43:05:3F:C2");
+             put("digicerthighassuranceevrootca [jdk]",
+                     "74:31:E5:F4:C3:C1:CE:46:90:77:4F:0B:61:E0:54:40:88:3B:A9:A0:1E:D0:0B:A6:AB:D7:80:6E:D3:B1:18:CF");
+-            put("geotrustprimaryca [jdk]",
++	    put("geotrustglobalca [jdk]",
++                    "FF:85:6A:2D:25:1D:CD:88:D3:66:56:F4:50:12:67:98:CF:AB:AA:DE:40:79:9C:72:2D:E4:D2:B5:DB:36:A7:3A");
++	    put("geotrustprimaryca [jdk]",
+                     "37:D5:10:06:C5:12:EA:AB:62:64:21:F1:EC:8C:92:01:3F:C5:F8:2A:E9:8E:E5:33:EB:46:19:B8:DE:B4:D0:6C");
+             put("geotrustprimarycag2 [jdk]",
+                     "5E:DB:7A:C4:3B:82:A0:6A:87:61:E8:D7:BE:49:79:EB:F2:61:1F:7D:D7:9B:F9:1C:1C:6B:56:6A:21:9E:D7:66");
+@@ -250,6 +252,8 @@ public class VerifyCACerts {
+             add("addtrustexternalca [jdk]");
+             // Valid until: Sat May 30 10:44:50 GMT 2020
+             add("addtrustqualifiedca [jdk]");
++	    // Valid until: Sat May 21 04:00:00 GMT 2022
++            add("geotrustglobalca [jdk]");
+         }
+     };
+ 
diff --git a/jdk-updates-jdk11u-jdk-11.0.14-ga.tar.xz b/jdk-updates-jdk11u-jdk-11.0.15-ga.tar.xz
similarity index 84%
rename from jdk-updates-jdk11u-jdk-11.0.14-ga.tar.xz
rename to jdk-updates-jdk11u-jdk-11.0.15-ga.tar.xz
index 6296a450788e93a7d91cd37b6058f59b35379cf6..710643c36877a56db6f8c5c9882a0c3ebf541eb6 100644
Binary files a/jdk-updates-jdk11u-jdk-11.0.14-ga.tar.xz and b/jdk-updates-jdk11u-jdk-11.0.15-ga.tar.xz differ
diff --git a/openjdk-11.spec b/openjdk-11.spec
index 292ade583e2cc0476f890c4627c76efa4be20bde..99b2b1847907cece9e89066206d02f24f38c248d 100644
--- a/openjdk-11.spec
+++ b/openjdk-11.spec
@@ -1,4 +1,4 @@
-# RPM conditionals so as to be able to dynamically producef
+# RPM conditionals so as to be able to dynamically produce
 
 # slowdebug/release builds. See:
 # http://rpm.org/user_doc/conditional_builds.html
@@ -114,7 +114,7 @@
 
 # New Version-String scheme-style defines
 %global majorver 11
-%global securityver 14
+%global securityver 15
 # buildjdkver is usually same as %%{majorver},
 # but in time of bootstrap of next jdk, it is majorver-1,
 # and this it is better to change it here, on single place
@@ -130,12 +130,12 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        9
+%global buildver        10
 %global patchver	0
 
 %global project		jdk-updates
 %global repo		jdk11u
-%global revision	jdk-11.0.14-ga
+%global revision	jdk-11.0.15-ga
 %global full_revision %{project}-%{repo}-%{revision}
 # priority must be 7 digits in total
 # setting to 1, so debug ones can have 0
@@ -651,7 +651,7 @@ Requires: lksctp-tools%{?_isa}
 # tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it,
 # not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be
 # considered as regression
-Requires: copy-jdk-configs >= 3.3
+Requires: copy-jdk-configs >= 3.9
 OrderWithRequires: copy-jdk-configs
 # for printing support
 Requires: cups-libs
@@ -866,12 +866,16 @@ Patch82: PS-introduce-UsePSRelaxedForwardee-to-enable-using-r.patch
 
 # 11.0.13
 Patch83: 8273111-Default-timezone-should-return-zone-ID-if-locatiome-is-valid-but-not-canonicalization-on-linux.patch
-Patch84: fix-memcpy-compile-warning-when-building-on-linux-x86.patch
 Patch85: 8239017-cmp-baseline-fails-because-of-differences-in-TimeZoneNames_kea.patch
 # 11.0.14
 Patch86: 8252103-support-Jmap-parallel-heap-inspection.patch
 Patch87: fix_macroAssembler_missing_matcher_header_file_causing_build_failure.patch
 Patch88: fix-error-in-build-core-variants.patch
+Patch89: downgrade-the-symver-of-memcpy-GLIBC_2.14-on-x86.patch
+
+# 11.0.15
+Patch90: fix_X509TrustManagerImpl_symantec_distrust.patch
+
 
 BuildRequires: autoconf
 BuildRequires: alsa-lib-devel
@@ -1155,11 +1159,12 @@ pushd %{top_level_dir_name}
 %patch80 -p1
 %patch82 -p1
 %patch83 -p1
-%patch84 -p1
 %patch85 -p1
 %patch86 -p1
 %patch87 -p1
 %patch88 -p1
+%patch89 -p1
+%patch90 -p1
 popd # openjdk
 
 # %patch1000
@@ -1507,7 +1512,13 @@ done
 -- whether copy-jdk-configs is installed or not. If so, then configs are copied
 -- (copy_jdk_configs from %%{_libexecdir} used) or not copied at all
 local posix = require "posix"
-local debug = false
+
+if (os.getenv("debug") == "true") then
+  debug = true;
+  print("cjc: in spec debug is on")
+else
+  debug = false;
+end
 
 SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua"
 SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua"
@@ -1536,8 +1547,9 @@ else
   end
 end
 -- run content of included file with fake args
+cjc = require "copy_jdk_configs.lua"
 arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
-require "copy_jdk_configs.lua"
+cjc.mainProgram(arg)
 
 %post
 %{post_script %{nil}}
@@ -1662,6 +1674,21 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Thu Apr 28 2022 kuenking111 <wangkun49@huawei.com> - 1:11.0.15.10-1
+- add fix_X509TrustManagerImpl_symantec_distrust.patch
+
+* Tue Apr 26 2022 kuenking111 <wangkun49@huawei.com> - 1:11.0.15.10-0
+- modified 8231441-3-AArch64-Initial-SVE-backend-support.patch
+- modified 8210473-JEP-345-NUMA-Aware-Memory-Allocation-for-G1.patch
+- modified delete_expired_certificates.patch
+- modified G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch
+
+* Sat May 26 2022 eapen <zhangyipeng7@huawei.com> - 1:11.0.14.9-3
+- reconstruct applying of memcpy.o used by lib compilations
+
+* Fri May 25 2022 eapen <zhangyipeng7@huawei.com> - 1:11.0.14.9-2
+- adapted to newst cjc to fix issue with rpm 4.17
+
 * Wed Feb 9 2022 kuenking111 <wangkun49@huawei.com> - 1:11.0.14.9-1
 - add fix-error-in-build-core-variants.patch
 
diff --git a/src-openeuler-openjdk-11-resolve-code-inconsistencies.patch b/src-openeuler-openjdk-11-resolve-code-inconsistencies.patch
index 65015d65cd7c67967dc2c696d816c801f2063037..e6f5993f880479766802e0acd3d412b8c5060c66 100644
--- a/src-openeuler-openjdk-11-resolve-code-inconsistencies.patch
+++ b/src-openeuler-openjdk-11-resolve-code-inconsistencies.patch
@@ -1,369 +1,3 @@
-diff --git a/make/launcher/Launcher-java.base.gmk b/make/launcher/Launcher-java.base.gmk
-index f6d4aa28f..d511c0be5 100644
---- a/make/launcher/Launcher-java.base.gmk
-+++ b/make/launcher/Launcher-java.base.gmk
-@@ -30,6 +30,11 @@ $(eval $(call IncludeCustomExtension, launcher/Launcher-java.base.gmk))
- JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/common
- JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
- 
-+LIBMEMCPY_FILES += \
-+        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
-+                memcpy.cpp \
-+        )
-+
- ################################################################################
- 
- $(eval $(call SetupBuildLauncher, java, \
-@@ -79,6 +84,7 @@ ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix linux), )
-   $(eval $(call SetupJdkExecutable, BUILD_JSPAWNHELPER, \
-       NAME := jspawnhelper, \
-       SRC := $(TOPDIR)/src/$(MODULE)/unix/native/jspawnhelper, \
-+      EXTRA_FILES := $(LIBMEMCPY_FILES), \
-       OPTIMIZATION := LOW, \
-       CFLAGS := $(CFLAGS_JDKEXE) -I$(TOPDIR)/src/$(MODULE)/unix/native/libjava, \
-       EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc.o, \
-diff --git a/make/launcher/Launcher-jdk.pack.gmk b/make/launcher/Launcher-jdk.pack.gmk
-index a93fd2a90..2e0bc7a5b 100644
---- a/make/launcher/Launcher-jdk.pack.gmk
-+++ b/make/launcher/Launcher-jdk.pack.gmk
-@@ -30,6 +30,11 @@ $(eval $(call SetupBuildLauncher, pack200, \
-     MAIN_CLASS := com.sun.java.util.jar.pack.Driver, \
- ))
- 
-+LIBMEMCPY_FILES += \
-+        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
-+                memcpy.cpp \
-+        )
-+
- ################################################################################
- # The order of the object files on the link command line affects the size of the resulting
- # binary (at least on linux) which causes the size to differ between old and new build.
-@@ -81,6 +86,7 @@ $(eval $(call SetupJdkExecutable, BUILD_UNPACKEXE, \
-     SRC := $(UNPACKEXE_SRC), \
-     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-     OPTIMIZATION := LOW, \
-+    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE) -DFULL, \
-     CFLAGS_release := -DPRODUCT, \
-     CFLAGS_linux := -fPIC, \
-diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
-index e8c27e902..9ebb93dcb 100644
---- a/make/lib/Awt2dLibraries.gmk
-+++ b/make/lib/Awt2dLibraries.gmk
-@@ -35,6 +35,11 @@ LIBAWT_DEFAULT_HEADER_DIRS := \
-     libawt/java2d/pipe \
-     #
- 
-+LIBMEMCPY_FILES += \
-+        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
-+                memcpy.cpp \
-+        )
-+
- ################################################################################
- 
- # We must not include java.desktop/unix/native/libmlib_image, which is only
-@@ -50,6 +55,7 @@ endif
- $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \
-     NAME := mlib_image, \
-     EXTRA_SRC := common/awt/medialib, \
-+    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     EXCLUDE_FILES := mlib_c_ImageBlendTable.c, \
-     EXCLUDE_SRC_PATTERNS := $(BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS), \
-     OPTIMIZATION := HIGHEST, \
-@@ -219,6 +225,7 @@ endif
- $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
-     NAME := awt, \
-     EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \
-+    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     EXCLUDES := $(LIBAWT_EXCLUDES), \
-     EXCLUDE_FILES := $(LIBAWT_EXFILES), \
-     OPTIMIZATION := LOW, \
-@@ -430,6 +437,7 @@ endif
- $(eval $(call SetupJdkLibrary, BUILD_LIBJAVAJPEG, \
-     NAME := javajpeg, \
-     INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
-+    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     OPTIMIZATION := HIGHEST, \
-     CFLAGS := $(CFLAGS_JDKLIB), \
-     HEADERS_FROM_SRC := $(LIBJPEG_HEADERS_FROM_SRC), \
-@@ -919,6 +927,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
-       NAME := splashscreen, \
-       EXTRA_SRC := $(LIBSPLASHSCREEN_EXTRA_SRC), \
-       EXCLUDE_SRC_PATTERNS := $(LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS), \
-+      EXTRA_FILES := $(LIBMEMCPY_FILES), \
-       EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
-       EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
-       OPTIMIZATION := LOW, \
-diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk
-index 226e20892..f180a28c3 100644
---- a/make/lib/CoreLibraries.gmk
-+++ b/make/lib/CoreLibraries.gmk
-@@ -28,6 +28,11 @@ WIN_VERIFY_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify/verify.lib
- # Hook to include the corresponding custom file, if present.
- $(eval $(call IncludeCustomExtension, lib/CoreLibraries.gmk))
- 
-+LIBMEMCPY_FILES += \
-+        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
-+                memcpy.cpp \
-+        )
-+
- 
- ##########################################################################################
- # libfdlibm is statically linked with libjava below and not delivered into the
-@@ -76,6 +81,7 @@ endif
- $(eval $(call SetupJdkLibrary, BUILD_LIBVERIFY, \
-     NAME := verify, \
-     OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
-+    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(CFLAGS_JDKLIB), \
-     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
-     DISABLED_WARNINGS_microsoft := 4244 4267, \
-@@ -96,9 +102,11 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
-   BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
- endif
- 
-+
- $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
-     NAME := java, \
-     OPTIMIZATION := HIGH, \
-+    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(CFLAGS_JDKLIB) \
-         $(LIBJAVA_CFLAGS), \
-     System.c_CFLAGS := $(VERSION_CFLAGS), \
-@@ -144,6 +152,7 @@ endif
- $(eval $(call SetupJdkLibrary, BUILD_LIBZIP, \
-     NAME := zip, \
-     OPTIMIZATION := LOW, \
-+    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     EXCLUDES := $(LIBZIP_EXCLUDES), \
-     CFLAGS := $(CFLAGS_JDKLIB) \
-         $(LIBZ_CFLAGS), \
-@@ -165,6 +174,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJIMAGE, \
-     NAME := jimage, \
-     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-     OPTIMIZATION := LOW, \
-+    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(CFLAGS_JDKLIB), \
-     CXXFLAGS := $(CXXFLAGS_JDKLIB), \
-     CFLAGS_unix := -UDEBUG, \
-@@ -236,7 +246,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
-     NAME := jli, \
-     OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
-     EXCLUDE_FILES := $(LIBJLI_EXCLUDE_FILES), \
--    EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
-+    EXTRA_FILES := $(LIBJLI_EXTRA_FILES) $(LIBMEMCPY_FILES), \
-     OPTIMIZATION := HIGH, \
-     CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
-     DISABLED_WARNINGS_gcc := unused-function implicit-fallthrough, \
-diff --git a/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk
-index a529768f3..0c888b65c 100644
---- a/make/lib/Lib-java.base.gmk
-+++ b/make/lib/Lib-java.base.gmk
-@@ -36,12 +36,18 @@ $(call FillFindCache, $(wildcard $(TOPDIR)/src/java.base/*/native))
- 
- include CoreLibraries.gmk
- 
-+LIBMEMCPY_FILES += \
-+        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
-+                memcpy.cpp \
-+        )
-+
- ################################################################################
- # Create the network library
- 
- $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \
-     NAME := net, \
-     OPTIMIZATION := LOW, \
-+    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(CFLAGS_JDKLIB), \
-     DISABLED_WARNINGS_gcc := format-nonliteral, \
-     DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand, \
-diff --git a/make/lib/Lib-java.desktop.gmk b/make/lib/Lib-java.desktop.gmk
-index 274df2b8e..932e0b3e8 100644
---- a/make/lib/Lib-java.desktop.gmk
-+++ b/make/lib/Lib-java.desktop.gmk
-@@ -36,6 +36,11 @@ $(call FillFindCache, $(wildcard $(TOPDIR)/src/java.desktop/*/native))
- 
- include Awt2dLibraries.gmk
- 
-+LIBMEMCPY_FILES += \
-+        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
-+                memcpy.cpp \
-+        )
-+
- ################################################################################
- # Create the libjsound library
- 
-@@ -63,6 +68,7 @@ ifneq ($(OPENJDK_TARGET_OS), aix)
-       NAME := jsound, \
-       TOOLCHAIN := $(LIBJSOUND_TOOLCHAIN), \
-       OPTIMIZATION := LOW, \
-+      EXTRA_FILES := $(LIBMEMCPY_FILES), \
-       CFLAGS := $(CFLAGS_JDKLIB) \
-           $(LIBJSOUND_CFLAGS), \
-       CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
-diff --git a/make/lib/Lib-java.instrument.gmk b/make/lib/Lib-java.instrument.gmk
-index 9acde85ff..6e679b500 100644
---- a/make/lib/Lib-java.instrument.gmk
-+++ b/make/lib/Lib-java.instrument.gmk
-@@ -36,9 +36,15 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
-   WINDOWS_JLI_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib
- endif
- 
-+LIBMEMCPY_FILES += \
-+        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
-+                memcpy.cpp \
-+        )
-+
- $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \
-     NAME := instrument, \
-     OPTIMIZATION := LOW, \
-+    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(CFLAGS_JDKLIB) $(LIBINSTRUMENT_CFLAGS), \
-     CFLAGS_debug := -DJPLIS_LOGGING, \
-     CFLAGS_release := -DNO_JPLIS_LOGGING, \
-diff --git a/make/lib/Lib-jdk.crypto.cryptoki.gmk b/make/lib/Lib-jdk.crypto.cryptoki.gmk
-index 3f25d7c04..6c23857e1 100644
---- a/make/lib/Lib-jdk.crypto.cryptoki.gmk
-+++ b/make/lib/Lib-jdk.crypto.cryptoki.gmk
-@@ -25,11 +25,17 @@
- 
- include LibCommon.gmk
- 
-+LIBMEMCPY_FILES += \
-+        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
-+                memcpy.cpp \
-+        )
-+
- ################################################################################
- 
- $(eval $(call SetupJdkLibrary, BUILD_LIBJ2PKCS11, \
-     NAME := j2pkcs11, \
-     OPTIMIZATION := LOW, \
-+    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(CFLAGS_JDKLIB), \
-     LDFLAGS := $(LDFLAGS_JDKLIB) \
-         $(call SET_SHARED_LIBRARY_ORIGIN), \
-diff --git a/make/lib/Lib-jdk.crypto.ec.gmk b/make/lib/Lib-jdk.crypto.ec.gmk
-index dfecc1d3c..4137a371d 100644
---- a/make/lib/Lib-jdk.crypto.ec.gmk
-+++ b/make/lib/Lib-jdk.crypto.ec.gmk
-@@ -25,6 +25,11 @@
- 
- include LibCommon.gmk
- 
-+LIBMEMCPY_FILES += \
-+        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
-+                memcpy.cpp \
-+        )
-+
- ################################################################################
- 
- ifeq ($(ENABLE_INTREE_EC), true)
-@@ -42,6 +47,7 @@ ifeq ($(ENABLE_INTREE_EC), true)
-       NAME := sunec, \
-       TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-       OPTIMIZATION := LOW, \
-+      EXTRA_FILES := $(LIBMEMCPY_FILES), \
-       CFLAGS := $(BUILD_LIBSUNEC_CFLAGS_JDKLIB) \
-           -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \
-       CXXFLAGS := $(BUILD_LIBSUNEC_CXXFLAGS_JDKLIB), \
-diff --git a/make/lib/Lib-jdk.hotspot.agent.gmk b/make/lib/Lib-jdk.hotspot.agent.gmk
-index 2d0c36a47..ad3075f00 100644
---- a/make/lib/Lib-jdk.hotspot.agent.gmk
-+++ b/make/lib/Lib-jdk.hotspot.agent.gmk
-@@ -27,6 +27,11 @@ include LibCommon.gmk
- 
- $(eval $(call IncludeCustomExtension, hotspot/lib/Lib-jdk.hotspot.agent.gmk))
- 
-+LIBMEMCPY_FILES += \
-+        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
-+                memcpy.cpp \
-+        )
-+
- ################################################################################
- 
- ifeq ($(OPENJDK_TARGET_OS), linux)
-@@ -58,6 +63,7 @@ endif
- $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
-     NAME := saproc, \
-     OPTIMIZATION := HIGH, \
-+    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     DISABLED_WARNINGS_microsoft := 4267, \
-     DISABLED_WARNINGS_gcc := sign-compare, \
-     DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \
-diff --git a/make/lib/Lib-jdk.jdwp.agent.gmk b/make/lib/Lib-jdk.jdwp.agent.gmk
-index f00f0760f..1081b1f30 100644
---- a/make/lib/Lib-jdk.jdwp.agent.gmk
-+++ b/make/lib/Lib-jdk.jdwp.agent.gmk
-@@ -25,6 +25,11 @@
- 
- include LibCommon.gmk
- 
-+LIBMEMCPY_FILES += \
-+        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
-+                memcpy.cpp \
-+        )
-+
- ################################################################################
- 
- $(eval $(call SetupJdkLibrary, BUILD_LIBDT_SOCKET, \
-@@ -53,6 +58,7 @@ TARGETS += $(BUILD_LIBDT_SOCKET)
- $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
-     NAME := jdwp, \
-     OPTIMIZATION := LOW, \
-+    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING, \
-     EXTRA_HEADER_DIRS := \
-       include \
-diff --git a/make/lib/Lib-jdk.pack.gmk b/make/lib/Lib-jdk.pack.gmk
-index f401e03e7..23c87a07d 100644
---- a/make/lib/Lib-jdk.pack.gmk
-+++ b/make/lib/Lib-jdk.pack.gmk
-@@ -25,6 +25,11 @@
- 
- include LibCommon.gmk
- 
-+LIBMEMCPY_FILES += \
-+        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
-+                memcpy.cpp \
-+        )
-+
- ################################################################################
- 
- $(eval $(call SetupJdkLibrary, BUILD_LIBUNPACK, \
-@@ -32,6 +37,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBUNPACK, \
-     EXTRA_SRC := common-unpack, \
-     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-     OPTIMIZATION := LOW, \
-+    EXTRA_FILES := $(LIBMEMCPY_FILES), \
-     CFLAGS := $(CXXFLAGS_JDKLIB) \
-         -DNO_ZLIB -DUNPACK_JNI -DFULL, \
-     CFLAGS_release := -DPRODUCT, \
-diff --git a/make/lib/Lib-jdk.sctp.gmk b/make/lib/Lib-jdk.sctp.gmk
-index 267610202..f2c1dc0b9 100644
---- a/make/lib/Lib-jdk.sctp.gmk
-+++ b/make/lib/Lib-jdk.sctp.gmk
-@@ -25,6 +25,11 @@
- 
- include LibCommon.gmk
- 
-+LIBMEMCPY_FILES += \
-+        $(addprefix $(TOPDIR)/src/hotspot/share/runtime/, \
-+                memcpy.cpp \
-+        )
-+
- ################################################################################
- 
- ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
-@@ -33,6 +38,7 @@ ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
-     $(eval $(call SetupJdkLibrary, BUILD_LIBSCTP, \
-         NAME := sctp, \
-         OPTIMIZATION := LOW, \
-+        EXTRA_FILES := $(LIBMEMCPY_FILES), \
-         CFLAGS := $(CFLAGS_JDKLIB), \
-         EXTRA_HEADER_DIRS := \
-             $(call GetJavaHeaderDir, java.base) \
 diff --git a/src/hotspot/share/c1/c1_GraphBuilder.cpp b/src/hotspot/share/c1/c1_GraphBuilder.cpp
 index 211c2acda..86cc0108b 100644
 --- a/src/hotspot/share/c1/c1_GraphBuilder.cpp
@@ -614,32 +248,6 @@ index 74aab91f9..6cf2d2a6d 100644
    }
  
    // Verify that verify_me made the same decisions as a fresh run.
-diff --git a/src/hotspot/share/runtime/memcpy.cpp b/src/hotspot/share/runtime/memcpy.cpp
-new file mode 100644
-index 000000000..ed8330679
---- /dev/null
-+++ b/src/hotspot/share/runtime/memcpy.cpp
-@@ -0,0 +1,20 @@
-+/*
-+ * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved.
-+ */
-+
-+#if defined( __GNUC__ ) && \
-+(__GNUC__ >= 5  ||  (__GNUC__ == 4  &&  __GNUC_MINOR__ >= 7)) 
-+#include <string.h>
-+
-+#if (defined AMD64) || (defined amd64)
-+/* some systems do not have newest memcpy@@GLIBC_2.14 - stay with old good one */
-+asm (".symver memcpy, memcpy@GLIBC_2.2.5");
-+
-+extern "C"{
-+  void *__wrap_memcpy(void *dest, const void *src, size_t n)
-+  {
-+    return memcpy(dest, src, n);
-+  }
-+}
-+#endif
-+#endif
 diff --git a/src/hotspot/share/runtime/stackValue.cpp b/src/hotspot/share/runtime/stackValue.cpp
 index cab1de79a..6a67574ad 100644
 --- a/src/hotspot/share/runtime/stackValue.cpp