From 66eb8e101aa6edb0f3b864ed85e25ef968bbb71c Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Sun, 8 Oct 2023 15:18:24 +0800 Subject: [PATCH] add loongarch64 support for system-rpm-config --- macros.java-srpm | 2 +- macros.nodejs-srpm | 2 +- rpmrc | 2 ++ system-rpm-config.spec | 6 +++++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/macros.java-srpm b/macros.java-srpm index ec9bc9a..f31d492 100644 --- a/macros.java-srpm +++ b/macros.java-srpm @@ -1,2 +1,2 @@ # Arches that OpenJDK and dependent packages run on -%java_arches aarch64 x86_64 +%java_arches aarch64 x86_64 loongarch64 diff --git a/macros.nodejs-srpm b/macros.nodejs-srpm index 2fec028..0a2e89b 100644 --- a/macros.nodejs-srpm +++ b/macros.nodejs-srpm @@ -2,5 +2,5 @@ # Enabling Node.js on other arches requires porting the V8 JavaScript JIT to # those arches. -%nodejs_arches x86_64 aarch64 +%nodejs_arches x86_64 aarch64 loongarch64 diff --git a/rpmrc b/rpmrc index 80105a3..c504d87 100644 --- a/rpmrc +++ b/rpmrc @@ -3,3 +3,5 @@ include: /usr/lib/rpm/rpmrc optflags: x86_64 %{__global_compiler_flags} -m64 %{__cflags_arch_x86_64} -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection optflags: aarch64 %{__global_compiler_flags} -mbranch-protection=standard -fasynchronous-unwind-tables %[ "%{toolchain}" == "gcc" ? "-fstack-clash-protection" : "" ] + +optflags: loongarch64 %{__global_compiler_flags} -fasynchronous-unwind-tables %[ "%{toolchain}" == "gcc" ? "-fstack-clash-protection" : "" ] diff --git a/system-rpm-config.spec b/system-rpm-config.spec index 7d378aa..ea80375 100644 --- a/system-rpm-config.spec +++ b/system-rpm-config.spec @@ -1,4 +1,4 @@ -%define anolis_release 33 +%define anolis_release 34 Summary: Anolis OS specific rpm configuration files Name: system-rpm-config @@ -211,6 +211,10 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/anolis/srpm forge.lua %license MulanPSL %changelog +* Sun Oct 8 2023 Wenlong Zhang - 1:23-34 +- add loongarch64 for nodejs and java macros +- add optflags for loongarch64 + * Sat Apr 15 2023 Funda Wang - 1:23-33 - Drop unused flags for fortran -- Gitee