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

Fix-tst-cancel21.c-to-suit-kernel-struct-sigcontext-.patch

@@ -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
+

glibc.spec

@@ -1,4 +1,4 @@
-%global anolis_release .0.2
+%global anolis_release .0.3
 %define glibcsrcdir glibc-2.28
 %define glibcversion 2.28
 %define glibcrelease 225%{anolis_release}%{?dist}
@@ -180,8 +180,6 @@ Source12: ChangeLog.old
 Source13: wrap-find-debuginfo.sh
 
 
-Excludearch: loongarch64
-
 ######################################################################
 # Activate the wrapper script for debuginfo generation, by rewriting
 # the definition of __debug_install_post.
@@ -1043,6 +1041,9 @@ Patch845: glibc-elf-Align-argument-of-__munmap-to-page-size-BZ-28676-3.patch
 Patch846: glibc-Support-target-specific-ALIGN-for-variable-alignment-4.patch
 Patch847: glibc-elf-Fix-tst-align3.patch
 
+Patch848: glibc-Sync-to-lnd-35-for-LoongArch.patch
+Patch849: Fix-tst-cancel21.c-to-suit-kernel-struct-sigcontext-.patch
+
 ##############################################################################
 # Continued list of core "glibc" package information:
 ##############################################################################
@@ -1722,6 +1723,11 @@ build()
 %ifarch %{ix86}
 		--disable-multi-arch \
 %endif
+%ifarch loongarch64
+                --enable-stackguard-randomization \
+                --with-selinux \
+                --enable-shared \
+%endif
 %if %{without werror}
 		--disable-werror \
 %endif
@@ -2872,6 +2878,9 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Mon Jul  31 2023 lixing <lixing@loongson.cn> - 2.28-225.0.3
+- Sync loongarch64 code to lnd.35.
+
 * Wed Jul 19 2023 Rongwei Wang <rongwei.wang@linux.alibaba.com> - 2.28-225.0.2
 - elf: Properly align PT_LOAD segments