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]
94 lines
3.8 KiB
Diff
94 lines
3.8 KiB
Diff
commit b38c9cdb58061d357cdf9bca4f6967d487becb82
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Wed May 4 15:37:21 2022 +0200
|
|
|
|
Linux: Define MMAP_CALL_INTERNAL
|
|
|
|
Unlike MMAP_CALL, this avoids a TCB dependency for an errno update
|
|
on failure.
|
|
|
|
<mmap_internal.h> cannot be included as is on several architectures
|
|
due to the definition of page_unit, so introduce a separate header
|
|
file for the definition of MMAP_CALL and MMAP_CALL_INTERNAL,
|
|
<mmap_call.h>.
|
|
|
|
Reviewed-by: Stefan Liebler <stli@linux.ibm.com>
|
|
(cherry picked from commit c1b68685d438373efe64e5f076f4215723004dfb)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/mmap_call.h b/sysdeps/unix/sysv/linux/mmap_call.h
|
|
new file mode 100644
|
|
index 0000000000000000..3547c99e149e5064
|
|
--- /dev/null
|
|
+++ b/sysdeps/unix/sysv/linux/mmap_call.h
|
|
@@ -0,0 +1,22 @@
|
|
+/* Generic definition of MMAP_CALL and MMAP_CALL_INTERNAL.
|
|
+ Copyright (C) 2017-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/>. */
|
|
+
|
|
+#define MMAP_CALL(__nr, __addr, __len, __prot, __flags, __fd, __offset) \
|
|
+ INLINE_SYSCALL_CALL (__nr, __addr, __len, __prot, __flags, __fd, __offset)
|
|
+#define MMAP_CALL_INTERNAL(__nr, __addr, __len, __prot, __flags, __fd, __offset) \
|
|
+ INTERNAL_SYSCALL_CALL (__nr, __addr, __len, __prot, __flags, __fd, __offset)
|
|
diff --git a/sysdeps/unix/sysv/linux/mmap_internal.h b/sysdeps/unix/sysv/linux/mmap_internal.h
|
|
index 5ca6976191137f95..989eb0c7c6b57dc1 100644
|
|
--- a/sysdeps/unix/sysv/linux/mmap_internal.h
|
|
+++ b/sysdeps/unix/sysv/linux/mmap_internal.h
|
|
@@ -40,10 +40,6 @@ static uint64_t page_unit;
|
|
/* Do not accept offset not multiple of page size. */
|
|
#define MMAP_OFF_LOW_MASK (MMAP2_PAGE_UNIT - 1)
|
|
|
|
-/* An architecture may override this. */
|
|
-#ifndef MMAP_CALL
|
|
-# define MMAP_CALL(__nr, __addr, __len, __prot, __flags, __fd, __offset) \
|
|
- INLINE_SYSCALL_CALL (__nr, __addr, __len, __prot, __flags, __fd, __offset)
|
|
-#endif
|
|
+#include <mmap_call.h>
|
|
|
|
#endif /* MMAP_INTERNAL_LINUX_H */
|
|
diff --git a/sysdeps/unix/sysv/linux/s390/mmap_internal.h b/sysdeps/unix/sysv/linux/s390/mmap_call.h
|
|
similarity index 78%
|
|
rename from sysdeps/unix/sysv/linux/s390/mmap_internal.h
|
|
rename to sysdeps/unix/sysv/linux/s390/mmap_call.h
|
|
index 46f1c3769d6b586a..bdd30cc83764c2c1 100644
|
|
--- a/sysdeps/unix/sysv/linux/s390/mmap_internal.h
|
|
+++ b/sysdeps/unix/sysv/linux/s390/mmap_call.h
|
|
@@ -16,9 +16,6 @@
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
-#ifndef MMAP_S390_INTERNAL_H
|
|
-# define MMAP_S390_INTERNAL_H
|
|
-
|
|
#define MMAP_CALL(__nr, __addr, __len, __prot, __flags, __fd, __offset) \
|
|
({ \
|
|
long int __args[6] = { (long int) (__addr), (long int) (__len), \
|
|
@@ -26,7 +23,10 @@
|
|
(long int) (__fd), (long int) (__offset) }; \
|
|
INLINE_SYSCALL_CALL (__nr, __args); \
|
|
})
|
|
-
|
|
-#include_next <mmap_internal.h>
|
|
-
|
|
-#endif
|
|
+#define MMAP_CALL_INTERNAL(__nr, __addr, __len, __prot, __flags, __fd, __offset) \
|
|
+ ({ \
|
|
+ long int __args[6] = { (long int) (__addr), (long int) (__len), \
|
|
+ (long int) (__prot), (long int) (__flags), \
|
|
+ (long int) (__fd), (long int) (__offset) }; \
|
|
+ INTERNAL_SYSCALL_CALL (__nr, __args); \
|
|
+ })
|