601650f878
* Tue May 31 2022 Arjun Shankar <arjun@redhat.com> - 2.34-35 - Sync with upstream branch release/2.34/master, commit ff450cdbdee0b8cb6b9d653d6d2fa892de29be31: - Fix deadlock when pthread_atfork handler calls pthread_atfork or dlclose - x86: Fallback {str|wcs}cmp RTM in the ncmp overflow case [BZ #29127] - string.h: fix __fortified_attr_access macro call [BZ #29162] - linux: Add a getauxval test [BZ #23293] - rtld: Use generic argv adjustment in ld.so [BZ #23293] - S390: Enable static PIE * Thu May 19 2022 Florian Weimer <fweimer@redhat.com> - 2.34-34 - Sync with upstream branch release/2.34/master, 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 - x87: 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] * Thu May 12 2022 Florian Weimer <fweimer@redhat.com> - 2.34-33 - Sync with upstream branch release/2.34/master, commit 91c2e6c3db44297bf4cb3a2e3c40236c5b6a0b23: - dlfcn: Implement the RTLD_DI_PHDR request type for dlinfo - manual: Document the dlinfo function - x86: Fix fallback for wcsncmp_avx2 in strcmp-avx2.S [BZ #28896] - x86: Fix bug in strncmp-evex and strncmp-avx2 [BZ #28895] - x86: Set .text section in memset-vec-unaligned-erms - x86-64: Optimize bzero - x86: Remove SSSE3 instruction for broadcast in memset.S (SSE2 Only) - x86: Improve vec generation in memset-vec-unaligned-erms.S - x86-64: Fix strcmp-evex.S - x86-64: Fix strcmp-avx2.S - x86: Optimize strcmp-evex.S - x86: Optimize strcmp-avx2.S - manual: Clarify that abbreviations of long options are allowed - Add HWCAP2_AFP, HWCAP2_RPRES from Linux 5.17 to AArch64 bits/hwcap.h - aarch64: Add HWCAP2_ECV from Linux 5.16 - Add SOL_MPTCP, SOL_MCTP from Linux 5.16 to bits/socket.h - Update kernel version to 5.17 in tst-mman-consts.py - Update kernel version to 5.16 in tst-mman-consts.py - Update syscall lists for Linux 5.17 - Add ARPHRD_CAN, ARPHRD_MCTP to net/if_arp.h - Update kernel version to 5.15 in tst-mman-consts.py - Add PF_MCTP, AF_MCTP from Linux 5.15 to bits/socket.h Resolves: #2091541
122 lines
5.0 KiB
Diff
122 lines
5.0 KiB
Diff
commit e7ca2a475cf2e7ffc987b8d08e1a40337840b500
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Mon May 9 18:15:16 2022 +0200
|
|
|
|
Linux: Implement a useful version of _startup_fatal
|
|
|
|
On i386 and ia64, the TCB is not available at this point.
|
|
|
|
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
(cherry picked from commit a2a6bce7d7e52c1c34369a7da62c501cc350bc31)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/i386/startup.h b/sysdeps/unix/sysv/linux/i386/startup.h
|
|
index 192c765361c17ed1..213805d7d2d459be 100644
|
|
--- a/sysdeps/unix/sysv/linux/i386/startup.h
|
|
+++ b/sysdeps/unix/sysv/linux/i386/startup.h
|
|
@@ -1,5 +1,5 @@
|
|
/* Linux/i386 definitions of functions used by static libc main startup.
|
|
- Copyright (C) 2017-2021 Free Software Foundation, Inc.
|
|
+ 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,22 +16,7 @@
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
-#if BUILD_PIE_DEFAULT
|
|
-/* Can't use "call *%gs:SYSINFO_OFFSET" during statup in static PIE. */
|
|
-# define I386_USE_SYSENTER 0
|
|
+/* Can't use "call *%gs:SYSINFO_OFFSET" during startup. */
|
|
+#define I386_USE_SYSENTER 0
|
|
|
|
-# include <sysdep.h>
|
|
-# include <abort-instr.h>
|
|
-
|
|
-__attribute__ ((__noreturn__))
|
|
-static inline void
|
|
-_startup_fatal (const char *message __attribute__ ((unused)))
|
|
-{
|
|
- /* This is only called very early during startup in static PIE.
|
|
- FIXME: How can it be improved? */
|
|
- ABORT_INSTRUCTION;
|
|
- __builtin_unreachable ();
|
|
-}
|
|
-#else
|
|
-# include_next <startup.h>
|
|
-#endif
|
|
+#include_next <startup.h>
|
|
diff --git a/sysdeps/unix/sysv/linux/ia64/startup.h b/sysdeps/unix/sysv/linux/ia64/startup.h
|
|
new file mode 100644
|
|
index 0000000000000000..77f29f15a2103ed5
|
|
--- /dev/null
|
|
+++ b/sysdeps/unix/sysv/linux/ia64/startup.h
|
|
@@ -0,0 +1,22 @@
|
|
+/* Linux/ia64 definitions of functions used by static libc main startup.
|
|
+ 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/>. */
|
|
+
|
|
+/* This code is used before the TCB is set up. */
|
|
+#define IA64_USE_NEW_STUB 0
|
|
+
|
|
+#include_next <startup.h>
|
|
diff --git a/sysdeps/unix/sysv/linux/startup.h b/sysdeps/unix/sysv/linux/startup.h
|
|
new file mode 100644
|
|
index 0000000000000000..39859b404a84798b
|
|
--- /dev/null
|
|
+++ b/sysdeps/unix/sysv/linux/startup.h
|
|
@@ -0,0 +1,39 @@
|
|
+/* Linux definitions of functions used by static libc main startup.
|
|
+ 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/>. */
|
|
+
|
|
+#ifdef SHARED
|
|
+# include_next <startup.h>
|
|
+#else
|
|
+# include <sysdep.h>
|
|
+
|
|
+/* Avoid a run-time invocation of strlen. */
|
|
+#define _startup_fatal(message) \
|
|
+ do \
|
|
+ { \
|
|
+ size_t __message_length = __builtin_strlen (message); \
|
|
+ if (! __builtin_constant_p (__message_length)) \
|
|
+ { \
|
|
+ extern void _startup_fatal_not_constant (void); \
|
|
+ _startup_fatal_not_constant (); \
|
|
+ } \
|
|
+ INTERNAL_SYSCALL_CALL (write, STDERR_FILENO, (message), \
|
|
+ __message_length); \
|
|
+ INTERNAL_SYSCALL_CALL (exit_group, 127); \
|
|
+ } \
|
|
+ while (0)
|
|
+#endif /* !SHARED */
|