登录
注册
开源
企业版
高校版
搜索
帮助中心
使用条款
关于我们
开源
企业版
高校版
私有云
模力方舟
登录
注册
9月20日，Gitee × 模力方舟来成都了！聚焦 AI 应用在开发范式、算力架构、交互设计、硬件选型等跨场景创新实践，点击立即报名~
代码拉取完成，页面将自动刷新
捐赠
捐赠前请先登录
取消
前往登录
扫描微信二维码支付
取消
支付完成
支付提示
将跳转至支付宝完成支付
确定
取消
Watch
不关注
关注所有动态
仅关注版本发行动态
关注但不提醒动态
18
Star
3
Fork
36
src-openEuler
/
openjdk-17
代码
Issues
2
Pull Requests
2
Wiki
统计
流水线
服务
JavaDoc
PHPDoc
质量分析
Jenkins for Gitee
腾讯云托管
腾讯云 Serverless
悬镜安全
阿里云 SAE
Codeblitz
SBOM
我知道了，不再自动展开
150
fix LoongArch64 support patch apply error
已合并
宋立洋:master
src-openEuler:master
宋立洋
创建于 2025-02-21 15:32
克隆/下载
HTTPS
SSH
复制
下载 Email Patch
下载 Diff 文件
修复龙芯架构补丁应用失败的问题 报错内容： ``` + echo 'Patch #2000 (LoongArch64-support.patch):' Patch #2000 (LoongArch64-support.patch): + /usr/bin/patch --no-backup-if-mismatch -f -p1 --fuzz=0 can't find file to patch at input line 38 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |commit 98016d6f75ec4b8b58ad30ae75609a47f93fc54a |Merge: 789ba0f24a3 c5c90ffa45d |Author: aoqi <aoqi@loongson.cn> |Date: Sat Feb 8 17:20:42 2025 +0800 | | Merge | | |commit 789ba0f24a3fcaf64609eaa065845861c8de83d8 |Merge: 06f00bc81c7 bdc07d202a9 |Author: aoqi <aoqi@loongson.cn> |Date: Sat Feb 8 17:18:33 2025 +0800 | | Merge | | |commit 06f00bc81c7d0dc3e83363fd2b00dd6b03f4d62a |Merge: 15f5afd71be eed263c8077 |Author: aoqi <aoqi@loongson.cn> |Date: Thu Oct 17 10:41:06 2024 +0800 | | Merge | | |commit 15f5afd71be34dd61b9044dff02e004eb2bb34b6 |Author: loongson-jvm <jvm@loongson.cn> |Date: Thu Oct 17 10:27:02 2024 +0800 | | Update (2024.10.17) | | 11541: Prevent load reorder of VarHandle::getOpaque | 34943: 8338748: [17u,21u] Test Disconnect.java compile error: cannot find symbol after JDK-8299813 | |diff --git a/src/hotspot/cpu/loongarch/loongarch_64.ad b/src/hotspot/cpu/loongarch/loongarch_64.ad |index 0c6516fc1d5..7e01822e0e9 100644 |--- a/src/hotspot/cpu/loongarch/loongarch_64.ad |+++ b/src/hotspot/cpu/loongarch/loongarch_64.ad -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file src/hotspot/share/adlc/formssel.cpp patching file src/hotspot/share/gc/shared/c2/barrierSetC2.cpp patching file src/hotspot/share/opto/classes.hpp patching file src/hotspot/share/opto/compile.cpp patching file src/hotspot/share/opto/memnode.cpp patching file src/hotspot/share/opto/memnode.hpp patching file src/hotspot/share/runtime/vmStructs.cpp patching file test/jdk/java/nio/channels/DatagramChannel/Disconnect.java Hunk #1 FAILED at 52. Hunk #2 FAILED at 62. ... 省略以下8000多行 ``` 修复方式：由于当前版本补丁的报错内容过多，无法一一修正，因此使用上个版本java-17-openjdk-17.0.13.11-8的LoongArch64-support.patch，修复其中补丁冲突的地方 功能验证：龙芯架构电脑上编译构建通过，安装、功能验证正常 ``` 正在执行(%license)：/bin/sh -e /var/tmp/rpm-tmp.euWJ0i + umask 022 + cd /root/rpmbuild/BUILD + cd java-17-openjdk-17.0.14.7-1.ky11.loongarch64 + LICENSEDIR=/root/rpmbuild/BUILDROOT/java-17-openjdk-17.0.14.7-1.ky11.loongarch64/usr/share/licenses/java-17-openjdk-javadoc-zip + export LC_ALL=C + LC_ALL=C + export LICENSEDIR + /usr/bin/mkdir -p /root/rpmbuild/BUILDROOT/java-17-openjdk-17.0.14.7-1.ky11.loongarch64/usr/share/licenses/java-17-openjdk-javadoc-zip + cp -pr openjdk/build/images/jdk/legal /root/rpmbuild/BUILDROOT/java-17-openjdk-17.0.14.7-1.ky11.loongarch64/usr/share/licenses/java-17-openjdk-javadoc-zip + RPM_EC=0 ++ jobs -p + exit 0 Provides: java-17-javadoc = 1:17.0.14.7-1.ky11 java-17-openjdk-javadoc = 1:17.0.14.7-1.ky11 java-17-openjdk-javadoc-zip = 1:17.0.14.7-1.ky11 java-17-openjdk-javadoc-zip(loongarch-64) = 1:17.0.14.7-1.ky11 Requires(interp): /bin/sh /bin/sh Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 Requires(post): /bin/sh /usr/sbin/alternatives Requires(postun): /bin/sh /usr/sbin/alternatives Obsoletes: javadoc-zip-slowdebug < 1:13.0.0.33-1.rolling OrderWithRequires: java-17-openjdk-headless(loongarch-64) = 1:17.0.14.7-1.ky11 处理文件：java-17-openjdk-debuginfo-17.0.14.7-1.ky11.loongarch64 Provides: java-17-openjdk-debuginfo = 1:17.0.14.7-1.ky11 java-17-openjdk-debuginfo(loongarch-64) = 1:17.0.14.7-1.ky11 libsyslookup.so-17.0.14.7-1.ky11.loongarch64.debug()(64bit) Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 Recommends: java-17-openjdk-debugsource(loongarch-64) = 1:17.0.14.7-1.ky11 处理文件：java-17-openjdk-debugsource-17.0.14.7-1.ky11.loongarch64 Provides: java-17-openjdk-debugsource = 1:17.0.14.7-1.ky11 java-17-openjdk-debugsource(loongarch-64) = 1:17.0.14.7-1.ky11 Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 检查未打包文件：/usr/lib/rpm/check-files /root/rpmbuild/BUILDROOT/java-17-openjdk-17.0.14.7-1.ky11.loongarch64 已写至：/root/rpmbuild/SRPMS/java-17-openjdk-17.0.14.7-1.ky11.src.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-slowdebug-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-devel-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-demo-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-demo-slowdebug-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-devel-slowdebug-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-debugsource-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-javadoc-zip-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-javadoc-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-src-slowdebug-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-src-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-headless-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-headless-slowdebug-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-jmods-slowdebug-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-jmods-17.0.14.7-1.ky11.loongarch64.rpm 已写至：/root/rpmbuild/RPMS/loongarch64/java-17-openjdk-debuginfo-17.0.14.7-1.ky11.loongarch64.rpm 正在执行(%clean)：/bin/sh -e /var/tmp/rpm-tmp.r7JFmJ + umask 022 + cd /root/rpmbuild/BUILD + cd java-17-openjdk-17.0.14.7-1.ky11.loongarch64 + /usr/bin/rm -rf /root/rpmbuild/BUILDROOT/java-17-openjdk-17.0.14.7-1.ky11.loongarch64 + RPM_EC=0 ++ jobs -p + exit 0 正在执行(rmbuild)：/bin/sh -e /var/tmp/rpm-tmp.DdUfSG + umask 022 + cd /root/rpmbuild/BUILD + rm -rf java-17-openjdk-17.0.14.7-1.ky11.loongarch64 java-17-openjdk-17.0.14.7-1.ky11.loongarch64.gemspec + RPM_EC=0 ++ jobs -p + exit 0 ```
怎样手动合并此 Pull Request
git checkout master
git pull https://gitee.com/sworn/openjdk-17.git master
git push origin master
评论
12
提交
1
文件
2
检查
代码问题
0
批量操作
展开设置
折叠设置
审查
Code Owner
审查人员
eastb233
eastb233
kuen
kuenking111_admin
Noah
jvmboy
guoge
jdkboy
cf-zhao
cf-zhao
编译小伙
li-yancheng
周磊
alexanderbill
jiangfeilong
jiangfeilong1003
stubCode
stubCode
jianhai_feng
nanxt
douyiwang
douyiwang
DXwangg
DXwangg
dongxfeng
dongxfeng
guojje
guojje
xiezhaokun
xiezhaokun
chenzheng1030
chenzheng1030
未设置
最少人数
0
测试
eastb233
eastb233
kuen
kuenking111_admin
Noah
jvmboy
guoge
jdkboy
cf-zhao
cf-zhao
编译小伙
li-yancheng
周磊
alexanderbill
jiangfeilong
jiangfeilong1003
stubCode
stubCode
jianhai_feng
nanxt
douyiwang
douyiwang
DXwangg
DXwangg
dongxfeng
dongxfeng
guojje
guojje
xiezhaokun
xiezhaokun
chenzheng1030
chenzheng1030
未设置
最少人数
0
优先级
不指定
严重
主要
次要
不重要
标签
openeuler-cla/yes
lgtm
approved
ci_successful
sig/Compiler
关联 Issue
未关联
Pull Request 合并后将关闭上述关联 Issue
里程碑
未关联里程碑
参与者
（4）
Cherry-pick 提交
Cherry-pick 可以将
特定提交（Commit）
从某个分支挑选并应用到另一个分支，实现快速集成特定更改，而无需合并整个分支。
请选择应用 Cherry-pick 提交 (Commit) 的目标分支
新建分支
当前账号不存在 Fork 仓库，建议 cherry-pick 到 Fork 仓库。
Fork 仓库
提交列表
Commit SHA
Commit Message
基于 Cherry-pick 后的分支发起 Pull Request
取消
Cherry-pick
1
https://gitee.com/src-openeuler/openjdk-17.git
git@gitee.com:src-openeuler/openjdk-17.git
src-openeuler
openjdk-17
openjdk-17
点此查找更多帮助
搜索帮助
Git 命令在线学习
如何在 Gitee 导入 GitHub 仓库
Git 仓库基础操作
企业版和社区版功能对比
SSH 公钥设置
如何处理代码冲突
仓库体积过大，如何减小？
如何找回被删除的仓库数据
Gitee 产品配额说明
GitHub仓库快速导入Gitee及同步更新
什么是 Release（发行版）
将 PHP 项目自动发布到 packagist.org
仓库举报
回到顶部
登录提示
该操作需登录 Gitee 帐号，请先登录后再操作。
立即登录
没有帐号，去注册
