LoongArch: Force SHMLBA the same as kernel

The shmlba.h file related to the LoongArch architecture was introduced
in commit 3eed5f3a1ee to address the mismatch in the SHMLBA definition
between glibc and the kernel.

Signed-off-by: Peng Fan <fanpeng@loongson.cn>
(cherry picked from commit 3b53810c70dfea943576a3f2774d62275bb2a851)
This commit is contained in:
Peng Fan 2025-01-02 19:12:09 +08:00 committed by openeuler-sync-bot
parent 59136599ea
commit aaa20272be
2 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,43 @@
From 24be95c79df4a535d352ae8f62716921e379e0b0 Mon Sep 17 00:00:00 2001
From: Xing Li <lixing@loongson.cn>
Date: Thu, 2 Jan 2025 04:01:21 +0000
Subject: [PATCH] LoongArch: Force SHMLBA the same as kernel
---
.../unix/sysv/linux/loongarch/bits/shmlba.h | 24 -------------------
1 file changed, 24 deletions(-)
delete mode 100644 sysdeps/unix/sysv/linux/loongarch/bits/shmlba.h
diff --git a/sysdeps/unix/sysv/linux/loongarch/bits/shmlba.h b/sysdeps/unix/sysv/linux/loongarch/bits/shmlba.h
deleted file mode 100644
index 3c171ef7..00000000
--- a/sysdeps/unix/sysv/linux/loongarch/bits/shmlba.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Define SHMLBA. LoongArch version.
- Copyright (C) 2023 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <https://www.gnu.org/licenses/>. */
-
-#ifndef _SYS_SHM_H
-# error "Never use <bits/shmlba.h> directly; include <sys/shm.h> instead."
-#endif
-
-/* Segment low boundary address multiple. */
-#define SHMLBA 0x10000
--
2.41.0

View File

@ -67,7 +67,7 @@
##############################################################################
Name: glibc
Version: 2.38
Release: 49
Release: 50
Summary: The GNU libc libraries
License: %{all_license}
URL: http://www.gnu.org/software/glibc/
@ -251,6 +251,7 @@ Patch161: backport-elf-Switch-to-main-malloc-after-final-ld.so-self-rel.patch
Patch162: nptl-initialize-rseq-area-prior-to-registration.patch
Patch163: nptl-initialize-cpu_id_start-prior-to-rseq-registrat.patch
Patch164: x86-Avoid-integer-truncation-with-large-cache-sizes-.patch
Patch165: LoongArch-Force-SHMLBA-the-same-as-kernel.patch
#openEuler patch list
Patch9000: turn-default-value-of-x86_rep_stosb_threshold_form_2K_to_1M.patch
@ -1466,6 +1467,9 @@ fi
%endif
%changelog
* Tue Jan 07 2025 Peng Fan <fanpeng@loongson.cn> - 2.38-50
- LoongArch: Force SHMLBA the same as kernel
* Sat Jan 4 2025 Qingqing Li <liqingqing3@huawei.com> - 2.38-49
- x86: Avoid integer truncation with large cache sizes (bug 32470)