94eca17094
Upstream commit: ede8d94d154157d269b18f3601440ac576c1f96a
- csu: Implement and use _dl_early_allocate during static startup
- Linux: Introduce __brk_call for invoking the brk system call
- Linux: Implement a useful version of _startup_fatal
- ia64: Always define IA64_USE_NEW_STUB as a flag macro
- Linux: Define MMAP_CALL_INTERNAL
- i386: Honor I386_USE_SYSENTER for 6-argument Linux system calls
- i386: Remove OPTIMIZE_FOR_GCC_5 from Linux libc-do-syscall.S
- elf: Remove __libc_init_secure
- Linux: Consolidate auxiliary vector parsing (redo)
- Linux: Include <dl-auxv.h> in dl-sysdep.c only for SHARED
- Revert "Linux: Consolidate auxiliary vector parsing"
- Linux: Consolidate auxiliary vector parsing
- Linux: Assume that NEED_DL_SYSINFO_DSO is always defined
- Linux: Remove DL_FIND_ARG_COMPONENTS
- Linux: Remove HAVE_AUX_SECURE, HAVE_AUX_XID, HAVE_AUX_PAGESIZE
- elf: Merge dl-sysdep.c into the Linux version
- elf: Remove unused NEED_DL_BASE_ADDR and _dl_base_addr
- x86: Optimize {str|wcs}rchr-evex
- x86: Optimize {str|wcs}rchr-avx2
- x86: Optimize {str|wcs}rchr-sse2
- x86: Cleanup page cross code in memcmp-avx2-movbe.S
- x86: Remove memcmp-sse4.S
- x86: Small improvements for wcslen
- x86: Remove AVX str{n}casecmp
- x86: Add EVEX optimized str{n}casecmp
- x86: Add AVX2 optimized str{n}casecmp
- x86: Optimize str{n}casecmp TOLOWER logic in strcmp-sse42.S
- x86: Optimize str{n}casecmp TOLOWER logic in strcmp.S
- x86: Remove strspn-sse2.S and use the generic implementation
- x86: Remove strpbrk-sse2.S and use the generic implementation
- x86: Remove strcspn-sse2.S and use the generic implementation
- x86: Optimize strspn in strspn-c.c
- x86: Optimize strcspn and strpbrk in strcspn-c.c
- x86: Code cleanup in strchr-evex and comment justifying branch
- x86: Code cleanup in strchr-avx2 and comment justifying branch
- x86_64: Remove bcopy optimizations
- x86-64: Remove bzero weak alias in SS2 memset
- x86_64/multiarch: Sort sysdep_routines and put one entry per line
- x86: Improve L to support L(XXX_SYMBOL (YYY, ZZZ))
- fortify: Ensure that __glibc_fortify condition is a constant [BZ #29141]
151 lines
5.1 KiB
Diff
151 lines
5.1 KiB
Diff
commit 43d77ef9b87533221890423e491eed1b8ca81f0c
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Mon May 16 18:41:43 2022 +0200
|
|
|
|
Linux: Introduce __brk_call for invoking the brk system call
|
|
|
|
Alpha and sparc can now use the generic implementation.
|
|
|
|
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
(cherry picked from commit b57ab258c1140bc45464b4b9908713e3e0ee35aa)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/alpha/brk_call.h b/sysdeps/unix/sysv/linux/alpha/brk_call.h
|
|
new file mode 100644
|
|
index 0000000000000000..b8088cf13f938c88
|
|
--- /dev/null
|
|
+++ b/sysdeps/unix/sysv/linux/alpha/brk_call.h
|
|
@@ -0,0 +1,28 @@
|
|
+/* Invoke the brk system call. Alpha version.
|
|
+ Copyright (C) 2022 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/>. */
|
|
+
|
|
+static inline void *
|
|
+__brk_call (void *addr)
|
|
+{
|
|
+ unsigned long int result = INTERNAL_SYSCALL_CALL (brk, addr);
|
|
+ if (result == -ENOMEM)
|
|
+ /* Mimic the default error reporting behavior. */
|
|
+ return addr;
|
|
+ else
|
|
+ return (void *) result;
|
|
+}
|
|
diff --git a/sysdeps/unix/sysv/linux/brk.c b/sysdeps/unix/sysv/linux/brk.c
|
|
index 2d70d824fc72d32d..20b11c15caae148d 100644
|
|
--- a/sysdeps/unix/sysv/linux/brk.c
|
|
+++ b/sysdeps/unix/sysv/linux/brk.c
|
|
@@ -19,6 +19,7 @@
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
#include <sysdep.h>
|
|
+#include <brk_call.h>
|
|
|
|
/* This must be initialized data because commons can't have aliases. */
|
|
void *__curbrk = 0;
|
|
@@ -33,7 +34,7 @@ weak_alias (__curbrk, ___brk_addr)
|
|
int
|
|
__brk (void *addr)
|
|
{
|
|
- __curbrk = (void *) INTERNAL_SYSCALL_CALL (brk, addr);
|
|
+ __curbrk = __brk_call (addr);
|
|
if (__curbrk < addr)
|
|
{
|
|
__set_errno (ENOMEM);
|
|
diff --git a/sysdeps/unix/sysv/linux/brk_call.h b/sysdeps/unix/sysv/linux/brk_call.h
|
|
new file mode 100644
|
|
index 0000000000000000..72370c25d785a9ab
|
|
--- /dev/null
|
|
+++ b/sysdeps/unix/sysv/linux/brk_call.h
|
|
@@ -0,0 +1,25 @@
|
|
+/* Invoke the brk system call. Generic Linux version.
|
|
+ Copyright (C) 2022 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/>. */
|
|
+
|
|
+static inline void *
|
|
+__brk_call (void *addr)
|
|
+{
|
|
+ /* The default implementation reports errors through an unchanged
|
|
+ break. */
|
|
+ return (void *) INTERNAL_SYSCALL_CALL (brk, addr);
|
|
+}
|
|
diff --git a/sysdeps/unix/sysv/linux/alpha/brk.c b/sysdeps/unix/sysv/linux/sparc/brk_call.h
|
|
similarity index 61%
|
|
rename from sysdeps/unix/sysv/linux/alpha/brk.c
|
|
rename to sysdeps/unix/sysv/linux/sparc/brk_call.h
|
|
index 074c47e054bfeb11..59ce5216601143fb 100644
|
|
--- a/sysdeps/unix/sysv/linux/alpha/brk.c
|
|
+++ b/sysdeps/unix/sysv/linux/sparc/brk_call.h
|
|
@@ -1,5 +1,5 @@
|
|
-/* Change data segment size. Linux/Alpha.
|
|
- Copyright (C) 2020-2021 Free Software Foundation, Inc.
|
|
+/* Invoke the brk system call. Sparc version.
|
|
+ Copyright (C) 2022 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
|
|
@@ -16,23 +16,20 @@
|
|
License along with the GNU C Library. If not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
-#include <errno.h>
|
|
-#include <unistd.h>
|
|
-#include <sysdep.h>
|
|
+#ifdef __arch64__
|
|
+# define SYSCALL_NUM "0x6d"
|
|
+#else
|
|
+# define SYSCALL_NUM "0x10"
|
|
+#endif
|
|
|
|
-void *__curbrk = 0;
|
|
-
|
|
-int
|
|
-__brk (void *addr)
|
|
+static inline void *
|
|
+__brk_call (void *addr)
|
|
{
|
|
- /* Alpha brk returns -ENOMEM in case of failure. */
|
|
- __curbrk = (void *) INTERNAL_SYSCALL_CALL (brk, addr);
|
|
- if ((unsigned long) __curbrk == -ENOMEM)
|
|
- {
|
|
- __set_errno (ENOMEM);
|
|
- return -1;
|
|
- }
|
|
-
|
|
- return 0;
|
|
+ register long int g1 asm ("g1") = __NR_brk;
|
|
+ register long int o0 asm ("o0") = (long int) addr;
|
|
+ asm volatile ("ta " SYSCALL_NUM
|
|
+ : "=r"(o0)
|
|
+ : "r"(g1), "0"(o0)
|
|
+ : "cc");
|
|
+ return (void *) o0;
|
|
}
|
|
-weak_alias (__brk, brk)
|