diff --git a/change-jprofilecache-copyright.patch b/change-jprofilecache-copyright.patch new file mode 100644 index 0000000000000000000000000000000000000000..56224d9c9aca28b71ed4df650758db9e19570a65 --- /dev/null +++ b/change-jprofilecache-copyright.patch @@ -0,0 +1,301 @@ +From f9379fc09434609a93fcf78050f2dee9f7daa95b Mon Sep 17 00:00:00 2001 +Date: Mon, 4 Aug 2025 15:15:47 +0800 +Subject: [PATCH] change jprofilecache copyright + +--- + .../vm/jprofilecache/jitProfileCache.cpp | 3 ++- + .../vm/jprofilecache/jitProfileCache.hpp | 17 +++++++++++- + .../vm/jprofilecache/jitProfileCacheDcmds.cpp | 26 ++++++++++++++++--- + .../vm/jprofilecache/jitProfileCacheDcmds.hpp | 4 ++- + .../vm/jprofilecache/jitProfileCacheLog.cpp | 3 ++- + .../vm/jprofilecache/jitProfileCacheLog.hpp | 3 ++- + .../jitProfileCacheLogParser.cpp | 3 ++- + .../jitProfileCacheLogParser.hpp | 4 ++- + .../jprofilecache/jitProfileCacheThread.cpp | 4 ++- + .../jprofilecache/jitProfileCacheThread.hpp | 4 ++- + .../vm/jprofilecache/jitProfileRecord.cpp | 24 +++++++++++++++-- + .../vm/jprofilecache/jitProfileRecord.hpp | 22 +++++++++++++++- + .../huawei/jprofilecache/JProfileCache.java | 3 ++- + 13 files changed, 104 insertions(+), 16 deletions(-) + +diff --git a/hotspot/src/share/vm/jprofilecache/jitProfileCache.cpp b/hotspot/src/share/vm/jprofilecache/jitProfileCache.cpp +index d4a472d1d..89eb5799f 100644 +--- a/hotspot/src/share/vm/jprofilecache/jitProfileCache.cpp ++++ b/hotspot/src/share/vm/jprofilecache/jitProfileCache.cpp +@@ -1,5 +1,6 @@ + /* +-* Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2019 Alibaba Group Holding Limited. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +diff --git a/hotspot/src/share/vm/jprofilecache/jitProfileCache.hpp b/hotspot/src/share/vm/jprofilecache/jitProfileCache.hpp +index eb250da03..ca6aa0d73 100644 +--- a/hotspot/src/share/vm/jprofilecache/jitProfileCache.hpp ++++ b/hotspot/src/share/vm/jprofilecache/jitProfileCache.hpp +@@ -1,11 +1,26 @@ + /* +-* Copyright (c) 2025, Huawei and/or its affiliates. All rights reserved. ++ * Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2019 Alibaba Group Holding Limited. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ * + */ + + #ifndef SHARED_VM_JPROFILECACHE_JITPROFILECACHE_HPP +diff --git a/hotspot/src/share/vm/jprofilecache/jitProfileCacheDcmds.cpp b/hotspot/src/share/vm/jprofilecache/jitProfileCacheDcmds.cpp +index d5015df5c..a8c7ed505 100644 +--- a/hotspot/src/share/vm/jprofilecache/jitProfileCacheDcmds.cpp ++++ b/hotspot/src/share/vm/jprofilecache/jitProfileCacheDcmds.cpp +@@ -1,7 +1,27 @@ + /* +-* Copyright (c) Huawei Technologies Co., Ltd. 2025. All rights reserved. +-* +-*/ ++ * Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2019 Alibaba Group Holding Limited. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ * ++ */ + + #include "precompiled.hpp" + #include "classfile/javaClasses.hpp" +diff --git a/hotspot/src/share/vm/jprofilecache/jitProfileCacheDcmds.hpp b/hotspot/src/share/vm/jprofilecache/jitProfileCacheDcmds.hpp +index 14d1d7012..8c8b46dc0 100644 +--- a/hotspot/src/share/vm/jprofilecache/jitProfileCacheDcmds.hpp ++++ b/hotspot/src/share/vm/jprofilecache/jitProfileCacheDcmds.hpp +@@ -1,5 +1,6 @@ + /* +-* Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2019 Alibaba Group Holding Limited. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -19,6 +20,7 @@ + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. ++ * + */ + + #ifndef SHARE_JPROFILECACHE_JITPROFILECACHEDCMDS_HPP +diff --git a/hotspot/src/share/vm/jprofilecache/jitProfileCacheLog.cpp b/hotspot/src/share/vm/jprofilecache/jitProfileCacheLog.cpp +index e86d63e74..a2adf1551 100644 +--- a/hotspot/src/share/vm/jprofilecache/jitProfileCacheLog.cpp ++++ b/hotspot/src/share/vm/jprofilecache/jitProfileCacheLog.cpp +@@ -1,5 +1,5 @@ + /* +-* Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -19,6 +19,7 @@ + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. ++ * + */ + + #include "jprofilecache/jitProfileCacheLog.hpp" +diff --git a/hotspot/src/share/vm/jprofilecache/jitProfileCacheLog.hpp b/hotspot/src/share/vm/jprofilecache/jitProfileCacheLog.hpp +index 174e996b6..dc366760b 100644 +--- a/hotspot/src/share/vm/jprofilecache/jitProfileCacheLog.hpp ++++ b/hotspot/src/share/vm/jprofilecache/jitProfileCacheLog.hpp +@@ -1,5 +1,6 @@ + /* +-* Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2019 Alibaba Group Holding Limited. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +diff --git a/hotspot/src/share/vm/jprofilecache/jitProfileCacheLogParser.cpp b/hotspot/src/share/vm/jprofilecache/jitProfileCacheLogParser.cpp +index 72e6801c6..491671288 100644 +--- a/hotspot/src/share/vm/jprofilecache/jitProfileCacheLogParser.cpp ++++ b/hotspot/src/share/vm/jprofilecache/jitProfileCacheLogParser.cpp +@@ -1,5 +1,6 @@ + /* +-* Copyright (c) 2025, Huawei and/or its affiliates. All rights reserved. ++ * Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2019 Alibaba Group Holding Limited. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +diff --git a/hotspot/src/share/vm/jprofilecache/jitProfileCacheLogParser.hpp b/hotspot/src/share/vm/jprofilecache/jitProfileCacheLogParser.hpp +index c7315d5bd..bd0170616 100644 +--- a/hotspot/src/share/vm/jprofilecache/jitProfileCacheLogParser.hpp ++++ b/hotspot/src/share/vm/jprofilecache/jitProfileCacheLogParser.hpp +@@ -1,5 +1,6 @@ + /* +-* Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2019 Alibaba Group Holding Limited. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -19,6 +20,7 @@ + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. ++ * + */ + + #ifndef LINUX_AARCH64_NORMAL_SERVER_FASTDEBUG_JITPROFILECACHELOGPARSER_H +diff --git a/hotspot/src/share/vm/jprofilecache/jitProfileCacheThread.cpp b/hotspot/src/share/vm/jprofilecache/jitProfileCacheThread.cpp +index 3ee3aa89f..4a2843023 100644 +--- a/hotspot/src/share/vm/jprofilecache/jitProfileCacheThread.cpp ++++ b/hotspot/src/share/vm/jprofilecache/jitProfileCacheThread.cpp +@@ -1,5 +1,6 @@ + /* +-* Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2019 Alibaba Group Holding Limited. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -19,6 +20,7 @@ + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. ++ * + */ + + #include "precompiled.hpp" +diff --git a/hotspot/src/share/vm/jprofilecache/jitProfileCacheThread.hpp b/hotspot/src/share/vm/jprofilecache/jitProfileCacheThread.hpp +index 4291e23d8..9984775dd 100644 +--- a/hotspot/src/share/vm/jprofilecache/jitProfileCacheThread.hpp ++++ b/hotspot/src/share/vm/jprofilecache/jitProfileCacheThread.hpp +@@ -1,5 +1,6 @@ + /* +-* Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2019 Alibaba Group Holding Limited. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -19,6 +20,7 @@ + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. ++ * + */ + + #ifndef SHARE_VM_JPROFILECACHE_JITPROFILECACHETHREAD_HPP +diff --git a/hotspot/src/share/vm/jprofilecache/jitProfileRecord.cpp b/hotspot/src/share/vm/jprofilecache/jitProfileRecord.cpp +index d92192ec8..b2dc599e6 100644 +--- a/hotspot/src/share/vm/jprofilecache/jitProfileRecord.cpp ++++ b/hotspot/src/share/vm/jprofilecache/jitProfileRecord.cpp +@@ -1,6 +1,26 @@ + /* +-* Copyright (c) Huawei Technologies Co., Ltd. 2025. All rights reserved. +-* ++ * Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2019 Alibaba Group Holding Limited. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ * + */ + + #include "jprofilecache/jitProfileRecord.hpp" +diff --git a/hotspot/src/share/vm/jprofilecache/jitProfileRecord.hpp b/hotspot/src/share/vm/jprofilecache/jitProfileRecord.hpp +index 66f107dc5..6e254a518 100644 +--- a/hotspot/src/share/vm/jprofilecache/jitProfileRecord.hpp ++++ b/hotspot/src/share/vm/jprofilecache/jitProfileRecord.hpp +@@ -1,5 +1,25 @@ + /* +- * Copyright (c) Huawei Technologies Co., Ltd. 2025. All rights reserved. ++ * Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2019 Alibaba Group Holding Limited. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. + * + */ + +diff --git a/jdk/src/share/classes/com/huawei/jprofilecache/JProfileCache.java b/jdk/src/share/classes/com/huawei/jprofilecache/JProfileCache.java +index 4ec7ef5b5..704fb9a30 100644 +--- a/jdk/src/share/classes/com/huawei/jprofilecache/JProfileCache.java ++++ b/jdk/src/share/classes/com/huawei/jprofilecache/JProfileCache.java +@@ -1,5 +1,6 @@ + /* +-* Copyright (c) 2025, Huawei and/or its affiliates. Ltd. All rights reserved. ++ * Copyright (c) 2025, Huawei Technologies Co., Ltd. All rights reserved. ++ * Copyright (c) 2019 Alibaba Group Holding Limited. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +-- +2.49.0 + diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index a09665b98095dd3e8ba8f3c38c8901fc122e3137..c1fe85f1d42eaafa0bec8795c738d896c59a204e 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -953,7 +953,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 3 +Release: 4 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1383,6 +1383,7 @@ Patch470: Backport-8296924-C2-assert-is_valid_AArch64_address-dest.targ.patch #462 Patch471: Fix-tests-for-OS-with-64k-page-size.patch Patch472: Add-testcase-for-jdk.Deoptimization-and-bug-fixes-fo.patch +Patch473: change-jprofilecache-copyright.patch ############################################# # @@ -2070,6 +2071,7 @@ pushd %{top_level_dir_name} %patch470 -p1 %patch471 -p1 %patch472 -p1 +%patch473 -p1 %endif %ifarch loongarch64 @@ -3054,6 +3056,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %endif %changelog +* Wed Aug 6 2025 huangjie -1:1.8.0.462.b08-4 +- add change-jprofilecache-copyright.patch + * Wed Jul 30 2025 neu-mobi -1:1.8.0.462.b08-3 - add Add-testcase-for-jdk.Deoptimization-and-bug-fixes-fo.patch