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]
71 lines
2.2 KiB
Diff
71 lines
2.2 KiB
Diff
commit 08728256faf69b159b9ecd64f7f8b734f5f456e4
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Thu Feb 3 10:58:59 2022 +0100
|
|
|
|
Linux: Assume that NEED_DL_SYSINFO_DSO is always defined
|
|
|
|
The definition itself is still needed for generic code.
|
|
|
|
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
(cherry picked from commit f19fc997a5754a6c0bb9e43618f0597e878061f7)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c
|
|
index e36b3e6b63b1aa7e..1829dab4f38b560c 100644
|
|
--- a/sysdeps/unix/sysv/linux/dl-sysdep.c
|
|
+++ b/sysdeps/unix/sysv/linux/dl-sysdep.c
|
|
@@ -134,11 +134,9 @@ _dl_sysdep_start (void **start_argptr,
|
|
new_sysinfo = av->a_un.a_val;
|
|
break;
|
|
#endif
|
|
-#ifdef NEED_DL_SYSINFO_DSO
|
|
case AT_SYSINFO_EHDR:
|
|
GLRO(dl_sysinfo_dso) = (void *) av->a_un.a_val;
|
|
break;
|
|
-#endif
|
|
case AT_RANDOM:
|
|
_dl_random = (void *) av->a_un.a_val;
|
|
break;
|
|
@@ -153,10 +151,8 @@ _dl_sysdep_start (void **start_argptr,
|
|
#ifdef NEED_DL_SYSINFO
|
|
if (new_sysinfo != 0)
|
|
{
|
|
-# ifdef NEED_DL_SYSINFO_DSO
|
|
/* Only set the sysinfo value if we also have the vsyscall DSO. */
|
|
if (GLRO(dl_sysinfo_dso) != 0)
|
|
-# endif
|
|
GLRO(dl_sysinfo) = new_sysinfo;
|
|
}
|
|
#endif
|
|
@@ -309,7 +305,7 @@ int
|
|
attribute_hidden
|
|
_dl_discover_osversion (void)
|
|
{
|
|
-#if defined NEED_DL_SYSINFO_DSO && defined SHARED
|
|
+#ifdef SHARED
|
|
if (GLRO(dl_sysinfo_map) != NULL)
|
|
{
|
|
/* If the kernel-supplied DSO contains a note indicating the kernel's
|
|
@@ -340,7 +336,7 @@ _dl_discover_osversion (void)
|
|
}
|
|
}
|
|
}
|
|
-#endif
|
|
+#endif /* SHARED */
|
|
|
|
char bufmem[64];
|
|
char *buf = bufmem;
|
|
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h
|
|
index b29986339a7e6cc0..11b93f2fa0af0e71 100644
|
|
--- a/sysdeps/unix/sysv/linux/m68k/sysdep.h
|
|
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h
|
|
@@ -301,8 +301,6 @@ SYSCALL_ERROR_LABEL: \
|
|
#define PTR_MANGLE(var) (void) (var)
|
|
#define PTR_DEMANGLE(var) (void) (var)
|
|
|
|
-#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
|
|
/* M68K needs system-supplied DSO to access TLS helpers
|
|
even when statically linked. */
|
|
-# define NEED_STATIC_SYSINFO_DSO 1
|
|
-#endif
|
|
+#define NEED_STATIC_SYSINFO_DSO 1
|