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]
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
commit 28bdb03b1b2bdb2d2dc62a9beeaa7d9bd2b10679
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Fri Feb 11 19:03:04 2022 +0100
|
|
|
|
Linux: Include <dl-auxv.h> in dl-sysdep.c only for SHARED
|
|
|
|
Otherwise, <dl-auxv.h> on POWER ends up being included twice,
|
|
once in dl-sysdep.c, once in dl-support.c. That leads to a linker
|
|
failure due to multiple definitions of _dl_cache_line_size.
|
|
|
|
Fixes commit d96d2995c1121d3310102afda2deb1f35761b5e6
|
|
("Revert "Linux: Consolidate auxiliary vector parsing").
|
|
|
|
(cherry picked from commit 098c795e85fbd05c5ef59c2d0ce59529331bea27)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c
|
|
index facaaba3b9d091b3..3487976b06ad7f58 100644
|
|
--- a/sysdeps/unix/sysv/linux/dl-sysdep.c
|
|
+++ b/sysdeps/unix/sysv/linux/dl-sysdep.c
|
|
@@ -18,7 +18,6 @@
|
|
|
|
#include <_itoa.h>
|
|
#include <assert.h>
|
|
-#include <dl-auxv.h>
|
|
#include <dl-hwcap-check.h>
|
|
#include <dl-osinfo.h>
|
|
#include <dl-procinfo.h>
|
|
@@ -46,6 +45,8 @@
|
|
#include <dl-machine.h>
|
|
|
|
#ifdef SHARED
|
|
+# include <dl-auxv.h>
|
|
+
|
|
extern char **_environ attribute_hidden;
|
|
extern char _end[] attribute_hidden;
|
|
|