已合并
Fix build error on riscv64 due to JDK-8354941 #460
Dingli Zhang创建于 4月14日
Fix build error on riscv64 due to JDK-8354941 #460
已合并
共 2 个文件变更+9-5
| @@ -3690,7 +3690,7 @@ index 0000000000..9e7d271860 | |||
| 3690 | + static const unsigned long branch_range = 1 * M; | 3690 | + static const unsigned long branch_range = 1 * M; |
| 3691 | + | 3691 | + |
| 3692 | + static bool reachable_from_branch_at(address branch, address target) { | 3692 | + static bool reachable_from_branch_at(address branch, address target) { |
| 3693 | -+ return uabs(target - branch) < branch_range; | 3693 | ++ return g_uabs(target - branch) < branch_range; |
| 3694 | + } | 3694 | + } |
| 3695 | + | 3695 | + |
| 3696 | + virtual ~Assembler() {} | 3696 | + virtual ~Assembler() {} |
| @@ -41838,7 +41838,7 @@ index 0000000000..9970229c5c | |||
| 41838 | + * goto copy_8_bytes; | 41838 | + * goto copy_8_bytes; |
| 41839 | + * } | 41839 | + * } |
| 41840 | + * bool is_backwards = step < 0; | 41840 | + * bool is_backwards = step < 0; |
| 41841 | -+ * int granularity = uabs(step); | 41841 | ++ * int granularity = g_uabs(step); |
| 41842 | + * count = count * granularity; * count bytes | 41842 | + * count = count * granularity; * count bytes |
| 41843 | + * | 41843 | + * |
| 41844 | + * if (is_backwards) { | 41844 | + * if (is_backwards) { |
| @@ -41865,7 +41865,7 @@ index 0000000000..9970229c5c | |||
| 41865 | + | 41865 | + |
| 41866 | + void copy_memory_v(Register s, Register d, Register count, Register tmp, int step) { | 41866 | + void copy_memory_v(Register s, Register d, Register count, Register tmp, int step) { |
| 41867 | + bool is_backward = step < 0; | 41867 | + bool is_backward = step < 0; |
| 41868 | -+ int granularity = uabs(step); | 41868 | ++ int granularity = g_uabs(step); |
| 41869 | + | 41869 | + |
| 41870 | + const Register src = x30, dst = x31, vl = x14, cnt = x15, tmp1 = x16, tmp2 = x17; | 41870 | + const Register src = x30, dst = x31, vl = x14, cnt = x15, tmp1 = x16, tmp2 = x17; |
| 41871 | + assert_different_registers(s, d, cnt, vl, tmp, tmp1, tmp2); | 41871 | + assert_different_registers(s, d, cnt, vl, tmp, tmp1, tmp2); |
| @@ -41914,7 +41914,7 @@ index 0000000000..9970229c5c | |||
| 41914 | + } | 41914 | + } |
| 41915 | + | 41915 | + |
| 41916 | + bool is_backwards = step < 0; | 41916 | + bool is_backwards = step < 0; |
| 41917 | -+ int granularity = uabs(step); | 41917 | ++ int granularity = g_uabs(step); |
| 41918 | + | 41918 | + |
| 41919 | + const Register src = x30, dst = x31, cnt = x15, tmp3 = x16, tmp4 = x17; | 41919 | + const Register src = x30, dst = x31, cnt = x15, tmp3 = x16, tmp4 = x17; |
| 41920 | + | 41920 | + |
| @@ -773,7 +773,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} | |||
| 773 | 773 | ||
| 774 | Name: java-%{javaver}-%{origin} | 774 | Name: java-%{javaver}-%{origin} |
| 775 | Version: %{newjavaver}.%{buildver} | 775 | Version: %{newjavaver}.%{buildver} |
| 776 | -Release: 7 | 776 | +Release: 8 |
| 777 | # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons | 777 | # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons |
| 778 | # and this change was brought into RHEL-4. java-1.5.0-ibm packages | 778 | # and this change was brought into RHEL-4. java-1.5.0-ibm packages |
| 779 | # also included the epoch in their virtual provides. This created a | 779 | # also included the epoch in their virtual provides. This created a |
| @@ -1800,6 +1800,10 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect | |||
| 1800 | 1800 | ||
| 1801 | 1801 | ||
| 1802 | %changelog | 1802 | %changelog |
| 1803 | +* Tue Apr 14 2026 Dingli Zhang <dingli@iscas.ac.cn> - 1:11.0.30.7-8 | ||
| 1804 | +- Fix build error on riscv64 due to JDK-8354941 | ||
| 1805 | +- Remove useless source file | ||
| 1806 | + | ||
| 1803 | * Wed Apr 8 2026 douyiwang <douyiwang@huawei.com> -1:11.0.30.7-7 | 1807 | * Wed Apr 8 2026 douyiwang <douyiwang@huawei.com> -1:11.0.30.7-7 |
| 1804 | - remove tzdata-java dependencies | 1808 | - remove tzdata-java dependencies |
| 1805 | 1809 | ||