Pre Merge pull request !35 from lixing.loongson.cn/a8-loongarch

This commit is contained in:
lixing.loongson.cn 2023-07-18 02:47:33 +00:00 committed by Gitee
commit 94608a8978
No known key found for this signature in database
GPG key ID: 173E9B9CA92EEF8F
3 changed files with 16624 additions and 2 deletions

16576
Add-LoongArch-support.patch Normal file

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,34 @@
From c5de7c407853b807e8d0c764e6325bb1311f39cd Mon Sep 17 00:00:00 2001
From: Xing Li <lixing@loongson.cn>
Date: Tue, 4 Jul 2023 15:10:03 +0800
Subject: [PATCH 2/2] Fix tst-cancel21.c to suit kernel struct sigcontext
change. * nptl/tst-cancel21.c
---
nptl/tst-cancel21.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nptl/tst-cancel21.c b/nptl/tst-cancel21.c
index b10fdbc1..a3653f21 100644
--- a/nptl/tst-cancel21.c
+++ b/nptl/tst-cancel21.c
@@ -217,14 +217,14 @@ static int
do_test (void)
{
stack_t ss;
- ss.ss_sp = malloc (2 * SIGSTKSZ);
+ ss.ss_sp = malloc (4 * SIGSTKSZ);
if (ss.ss_sp == NULL)
{
puts ("failed to allocate alternate stack");
return 1;
}
ss.ss_flags = 0;
- ss.ss_size = 2 * SIGSTKSZ;
+ ss.ss_size = 4 * SIGSTKSZ;
if (sigaltstack (&ss, NULL) < 0)
{
printf ("sigaltstack failed %m\n");
--
2.27.0

View file

@ -1,4 +1,4 @@
%global anolis_release .0.1 %global anolis_release .0.2
%define glibcsrcdir glibc-2.28 %define glibcsrcdir glibc-2.28
%define glibcversion 2.28 %define glibcversion 2.28
%define glibcrelease 225%{?dist} %define glibcrelease 225%{?dist}
@ -180,7 +180,6 @@ Source12: ChangeLog.old
Source13: wrap-find-debuginfo.sh Source13: wrap-find-debuginfo.sh
Excludearch: loongarch64
###################################################################### ######################################################################
# Activate the wrapper script for debuginfo generation, by rewriting # Activate the wrapper script for debuginfo generation, by rewriting
@ -1036,6 +1035,11 @@ Patch839: glibc-rh2144568.patch
Patch840: glibc-rh2154914-1.patch Patch840: glibc-rh2154914-1.patch
Patch841: glibc-rh2154914-2.patch Patch841: glibc-rh2154914-2.patch
%ifarch loongarch64
Patch842: Add-LoongArch-support.patch
Patch843: Fix-tst-cancel21.c-to-suit-kernel-struct-sigcontext-.patch
%endif
############################################################################## ##############################################################################
# Continued list of core "glibc" package information: # Continued list of core "glibc" package information:
############################################################################## ##############################################################################
@ -1715,6 +1719,11 @@ build()
%ifarch %{ix86} %ifarch %{ix86}
--disable-multi-arch \ --disable-multi-arch \
%endif %endif
%ifarch loongarch64
--enable-stackguard-randomization \
--with-selinux \
--enable-shared \
%endif
%if %{without werror} %if %{without werror}
--disable-werror \ --disable-werror \
%endif %endif
@ -2865,6 +2874,9 @@ fi
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog %changelog
* Wed Jul 5 2023 lixing <lixing@loongson.cn> - 2.28-225.0.2
- Add loongarch64 support.
* Sat Jul 1 2023 Weisson <Weisson@linux.alibaba.com> - 2.28-225.0.1 * Sat Jul 1 2023 Weisson <Weisson@linux.alibaba.com> - 2.28-225.0.1
- Remove loongarch64. - Remove loongarch64.