forked from rpms/glibc
668eaab0c7
* Fri Jul 22 2022 Arjun Shankar <arjun@redhat.com> - 2.34-40
- Sync with upstream branch release/2.34/master,
commit b2f32e746492615a6eb3e66fac1e766e32e8deb1:
- malloc: Simplify implementation of __malloc_assert
- Update syscall-names.list for Linux 5.18
- x86: Add missing IS_IN (libc) check to strncmp-sse4_2.S
- x86: Move mem{p}{mov|cpy}_{chk_}erms to its own file
- x86: Move and slightly improve memset_erms
- x86: Add definition for __wmemset_chk AVX2 RTM in ifunc impl list
- x86: Put wcs{n}len-sse4.1 in the sse4.1 text section
- x86: Align entry for memrchr to 64-bytes.
- x86: Add BMI1/BMI2 checks for ISA_V3 check
- x86: Cleanup bounds checking in large memcpy case
- x86: Add bounds `x86_non_temporal_threshold`
- x86: Add sse42 implementation to strcmp's ifunc
- x86: Fix misordered logic for setting `rep_movsb_stop_threshold`
- x86: Align varshift table to 32-bytes
- x86: ZERO_UPPER_VEC_REGISTERS_RETURN_XTEST expect no transactions
- x86: Shrink code size of memchr-evex.S
- x86: Shrink code size of memchr-avx2.S
- x86: Optimize memrchr-avx2.S
- x86: Optimize memrchr-evex.S
- x86: Optimize memrchr-sse2.S
- x86: Add COND_VZEROUPPER that can replace vzeroupper if no `ret`
- x86: Create header for VEC classes in x86 strings library
- x86_64: Add strstr function with 512-bit EVEX
- x86-64: Ignore r_addend for R_X86_64_GLOB_DAT/R_X86_64_JUMP_SLOT
- x86_64: Implement evex512 version of strlen, strnlen, wcslen and wcsnlen
- x86_64: Remove bzero optimization
- x86_64: Remove end of line trailing spaces
- nptl: Fix ___pthread_unregister_cancel_restore asynchronous restore
- linux: Fix mq_timereceive check for 32 bit fallback code (BZ 29304)
Resolves: #2109505
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
commit f6bc52f080e4a0195c707c01f54e2eae0ff89010
|
|
Author: H.J. Lu <hjl.tools@gmail.com>
|
|
Date: Fri May 20 19:21:48 2022 -0700
|
|
|
|
x86-64: Ignore r_addend for R_X86_64_GLOB_DAT/R_X86_64_JUMP_SLOT
|
|
|
|
According to x86-64 psABI, r_addend should be ignored for R_X86_64_GLOB_DAT
|
|
and R_X86_64_JUMP_SLOT. Since linkers always set their r_addends to 0, we
|
|
can ignore their r_addends.
|
|
|
|
Reviewed-by: Fangrui Song <maskray@google.com>
|
|
(cherry picked from commit f8587a61892cbafd98ce599131bf4f103466f084)
|
|
|
|
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
|
|
index 94296719d4d9fb82..742682517179fab5 100644
|
|
--- a/sysdeps/x86_64/dl-machine.h
|
|
+++ b/sysdeps/x86_64/dl-machine.h
|
|
@@ -347,11 +347,13 @@ and creates an unsatisfiable circular dependency.\n",
|
|
# endif
|
|
/* Set to symbol size plus addend. */
|
|
value = sym->st_size;
|
|
+ *reloc_addr = value + reloc->r_addend;
|
|
+ break;
|
|
# endif
|
|
- /* Fall through. */
|
|
+
|
|
case R_X86_64_GLOB_DAT:
|
|
case R_X86_64_JUMP_SLOT:
|
|
- *reloc_addr = value + reloc->r_addend;
|
|
+ *reloc_addr = value;
|
|
break;
|
|
|
|
# ifndef RESOLVE_CONFLICT_FIND_MAP
|