!133 [sync] PR-131: add sw_64 support

From: @openeuler-sync-bot 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl
This commit is contained in:
openeuler-ci-bot 2025-03-13 06:14:52 +00:00 committed by Gitee
commit 20087d728b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 58 additions and 2 deletions

View File

@ -0,0 +1,52 @@
From 8fe8fef3274d006bd01900b8aee838c229e81cbd Mon Sep 17 00:00:00 2001
From: mahailiang <mahailiang@uniontech.com>
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 <sys/exec_ecoff.h>
+# 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

View File

@ -8,7 +8,7 @@
Name: emacs Name: emacs
Epoch: 1 Epoch: 1
Version: 29.1 Version: 29.1
Release: 4 Release: 5
Summary: An extensible GNU text editor Summary: An extensible GNU text editor
License: GPLv3+ and CC0-1.0 License: GPLv3+ and CC0-1.0
URL: http://www.gnu.org/software/emacs URL: http://www.gnu.org/software/emacs
@ -35,6 +35,7 @@ Patch6008: backport-CVE-2024-39331.patch
Patch6009: backport-CVE-2025-1244.patch Patch6009: backport-CVE-2025-1244.patch
Patch9000: emacs-deal-taboo-words.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: 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 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 ln -s ../../%{name}/%{version}/etc/NEWS doc
%build %build
%ifarch loongarch64 %ifarch loongarch64 sw_64
%_update_config_guess %_update_config_guess
%_update_config_sub %_update_config_sub
%endif %endif
@ -417,6 +418,9 @@ fi
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Wed Mar 12 2025 mahailiang <mahailiang@uniontech.com> - 1:29.1-5
- add sw_64 support
* Thu Feb 13 2025 zhangpan <zhangpan103@h-partners.com> - 1:29.1-4 * Thu Feb 13 2025 zhangpan <zhangpan103@h-partners.com> - 1:29.1-4
- fix CVE-2025-1244 - fix CVE-2025-1244