From aafcdc4975fdccce5260ebdc2f64da3075e6002a Mon Sep 17 00:00:00 2001 From: Hailiang Date: Wed, 12 Mar 2025 15:37:28 +0800 Subject: [PATCH 1/2] add sw_64 support (cherry picked from commit 24976793faf51fb6d7514c65e967739910af029c) --- emacs-add-sw64-support.patch | 52 ++++++++++++++++++++++++++++++++++++ emacs.spec | 8 ++++-- 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 emacs-add-sw64-support.patch diff --git a/emacs-add-sw64-support.patch b/emacs-add-sw64-support.patch new file mode 100644 index 0000000..bb95b12 --- /dev/null +++ b/emacs-add-sw64-support.patch @@ -0,0 +1,52 @@ +From 8fe8fef3274d006bd01900b8aee838c229e81cbd Mon Sep 17 00:00:00 2001 +From: mahailiang +Date: Thu, 7 Nov 2024 09:46:14 +0800 +Subject: [PATCH] add sw64 support + +--- + configure.ac | 2 +- + src/unexelf.c | 8 +++++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ad1068a..dce63ff 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -740,7 +740,7 @@ case "${canonical}" in + *-apple-darwin* ) + case "${canonical}" in + *-apple-darwin[0-9].*) unported=yes ;; +- i[3456]86-* | x86_64-* | arm-* | aarch64-* ) ;; ++ i[3456]86-* | x86_64-* | arm-* | sw_64-* | aarch64-* ) ;; + * ) unported=yes ;; + esac + opsys=darwin +diff --git a/src/unexelf.c b/src/unexelf.c +index 607ac0c..da5cbd6 100644 +--- a/src/unexelf.c ++++ b/src/unexelf.c +@@ -120,7 +120,7 @@ typedef struct { + /* + * NetBSD does not have normal-looking user-land ELF support. + */ +-# if defined __alpha__ || defined __sparc_v9__ || defined _LP64 ++# if defined __alpha__ || defined __sparc_v9__ || defined _LP64 || defined __sw_64__ + # define ELFSIZE 64 + # else + # define ELFSIZE 32 +@@ -150,6 +150,12 @@ typedef struct { + # define pHDRR HDRR * + # endif /* __alpha__ */ + ++# ifdef __sw_64__ ++# include ++# define HDRR struct ecoff_symhdr ++# define pHDRR HDRR * ++# endif /* __sw_64__ */ ++ + #ifdef __mips__ /* was in pkgsrc patches for 20.7 */ + # define SHT_MIPS_DEBUG DT_MIPS_FLAGS + # define HDRR struct Elf_Shdr +-- +2.39.3 + diff --git a/emacs.spec b/emacs.spec index 2b90880..f920ef4 100644 --- a/emacs.spec +++ b/emacs.spec @@ -8,7 +8,7 @@ Name: emacs Epoch: 1 Version: 29.1 -Release: 4 +Release: 5 Summary: An extensible GNU text editor License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs @@ -35,6 +35,7 @@ Patch6008: backport-CVE-2024-39331.patch Patch6009: backport-CVE-2025-1244.patch Patch9000: emacs-deal-taboo-words.patch +Patch9001: emacs-add-sw64-support.patch BuildRequires: gcc atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel BuildRequires: glibc-devel zlib-devel gnutls-devel libselinux-devel GConf2-devel alsa-lib-devel @@ -166,7 +167,7 @@ ln -s ../../%{name}/%{version}/etc/COPYING doc ln -s ../../%{name}/%{version}/etc/NEWS doc %build -%ifarch loongarch64 +%ifarch loongarch64 sw_64 %_update_config_guess %_update_config_sub %endif @@ -417,6 +418,9 @@ fi %{_mandir}/*/* %changelog +* Wed Mar 12 2025 mahailiang - 1:29.1-5 +- add sw_64 support + * Thu Feb 13 2025 zhangpan - 1:29.1-4 - fix CVE-2025-1244 -- Gitee From 08ff4fbe823e1ca93a6988c47dcd7261c8272f90 Mon Sep 17 00:00:00 2001 From: Hailiang Date: Wed, 12 Mar 2025 07:38:37 +0000 Subject: [PATCH 2/2] update emacs.spec. Signed-off-by: Hailiang (cherry picked from commit e470d16f18baa6d1e714a661c40e39ba880ad4d4) --- emacs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs.spec b/emacs.spec index f920ef4..0b82c88 100644 --- a/emacs.spec +++ b/emacs.spec @@ -35,7 +35,7 @@ Patch6008: backport-CVE-2024-39331.patch Patch6009: backport-CVE-2025-1244.patch Patch9000: emacs-deal-taboo-words.patch -Patch9001: emacs-add-sw64-support.patch +Patch9001: emacs-add-sw64-support.patch BuildRequires: gcc atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel BuildRequires: glibc-devel zlib-devel gnutls-devel libselinux-devel GConf2-devel alsa-lib-devel -- Gitee